MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8,554 commits 1 branch 0 tags 51 MiB
Commit graph

137 commits

Author SHA1 Message Date
Anders Jenbo
bba73ea20f ✨ Handle mixed item origins in multiplayer 2021-04-01 14:52:44 +02:00
Anders Jenbo
31467cc949 ♻️ Remove all usage of basic WIN32 types 
Note that several WinAPI types are still in use (misc.h)
 2021-03-20 20:39:28 +01:00
Anders Jenbo
17803d5923 ♻️ Apply proper types to PlayerStruct 2021-03-14 15:38:23 +01:00
Anders Jenbo
fdf5d514b6 Remove redundant code from CastSpell 2021-01-23 22:21:12 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
e609e170d0 Merge a large chunk of Hellfire the code paths 2021-01-06 08:07:20 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
Anders Jenbo
504bd44abc Simplify ClearReadiedSpell 
Setting force_redraw twice has no negative side and saves us a bool check later.
 2020-12-04 19:29:23 +01:00
Juliano Goncalves
00f3b753ee Extract valid readied spell logic 2020-12-04 19:29:23 +01:00
qndel
7f7ae623df
 		Goe (#2163) 
* proper random_ comparisons
* proper mienemy comparisons
* add mienemy/micaster enum
* GOE enum
 2020-12-04 19:16:58 +01:00
Anders Jenbo
e073422ce7 Unify executable for Spawn and Retail 
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
 2020-10-20 19:42:01 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo
1d3f0aa103 Correct Firebolt manacost 
This partially reverts 4b74890489

Thanks to @Orthotope for pointing this out
 2020-10-07 19:32:52 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo
1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo
f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
3f11876aba Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 10:48:11 +02:00
qndel
5191237f42
 		enums and stuff (#2024) 2020-04-06 08:04:14 +02:00
Anders Jenbo
b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo
25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Anders Jenbo
20621a0642
 		add all.h and use in place of diablo.h (#2005) 
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
 2020-02-14 13:12:54 +01:00
Anders Jenbo
9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo
5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
Anders Jenbo
85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
Anders Jenbo
4b74890489 GetManaAmount prevent shift of negative value 
Also make GetManaAmount more readable
Thanks to @glebm for finding the issue
 2019-11-17 23:08:52 +01:00
Anders Jenbo
b6695fe26b Merge branch 'master' of github.com:diasurgical/devilution 2019-11-04 21:33:38 +01:00
galaxyhaxz
3bd28cc0c1 Fix function order [spells+pack.cpp] 2019-11-03 14:45:32 +01:00
Anders Jenbo
4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Robin Eklind
e155a9423e rename random to random_ to avoid collision with random in stdlib.h 
Fixes #1813.
 2019-10-21 09:56:36 +02:00
qndel
13eb926575 [hellfire] GetManaAmount bin exact 2019-10-08 00:05:56 +02:00
Robin Eklind
f4034b5023
 		Merge pull request #1735 from qndel/DoHealOther2 
[hellfire] DoHealOther bin exact
 2019-10-07 22:49:40 +02:00
Anders Jenbo
fae2be813a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-28 04:31:04 +02:00
qndel
25cb639e17 [hellfire] CastSpell bin exact 2019-09-27 03:42:57 +02:00
qndel
1516ad57ac GetManaAmount cleanup (#1737) 2019-09-27 03:16:26 +02:00
Anders Jenbo
3f037ce76c Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-27 03:11:18 +02:00
qndel
449b9fd2dc CastSpell cleanup 2019-09-27 02:46:00 +02:00
qndel
f7c90653bd [hellfire] DoHealOther bin exact 2019-09-27 02:34:21 +02:00
qndel
07233d060d [hellfire] DoResurrect bin exact (#1629) 
* [hellfire] DoResurrect bin exact

* split into two ifndefs
 2019-09-15 22:20:44 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel
7ab48ad756 UseMana clean up 2019-08-31 07:46:40 +02:00
qndel
a17e34c4bf applied enums to _pmode and untangled ifs 2019-08-31 06:23:35 +02:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Robin Eklind
f59439a8ff Make _pInvincible into a boolean. 
_pInvincible is only ever used in boolean contexts.
 2019-07-17 12:14:16 +02:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
32a51d17ca Align function signatures with PSX symbols 
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
 2019-07-08 04:12:12 +02:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #92
 2019-05-05 00:27:08 +02:00