qndel
ab9911064f
unify checks for single and multiplayer
2021-02-18 22:32:01 +01:00
Anders Jenbo
9cd6bd96a9
[hellfire] Fix monster eating logic
...
- Nolonger drop health when not on normal difficulty
- Uniques will nolonger drop health
- All monsters heal at the same rate
2021-01-17 19:52:31 +01:00
Anders Jenbo
8c261d0966
Merge remaning clean Hellfire code paths
2021-01-09 19:04:31 +01:00
Anders Jenbo
01590d3757
Merge a section of the Hellfire item and quest code
2021-01-07 02:29:06 +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
38dbcf7641
Format source
2020-12-02 00:52:38 +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
13258db968
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-13 23:51:12 +02:00
Anders Jenbo
3157885502
Correct shareware ifdefs
2020-10-13 07:42:35 +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
f1a193e1e2
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-11 07:01:25 +02:00
pionere
92646a8950
townwarps count has nothing to do with MAX_PLRS
2020-10-11 06:41:11 +02:00
Anders Jenbo
893efd51ea
Merge branch 'master' of github.com:diasurgical/devilution
2020-09-27 03:34:42 +02:00
Anders Jenbo
c1b4d3d8b5
Copy documentation from sanctuary/notes
2020-07-06 05:43:25 +02:00
Anders Jenbo
1ba96a6777
Add doxygen description to remaining engine files
2020-07-06 05:43:25 +02:00
Anders Jenbo
659dc41aa5
Merge branch 'master' of github.com:diasurgical/devilution into hellfire
2020-04-26 22:10:34 +02:00
Anders Jenbo
3227fea5c0
Merge branch 'master' of github.com:diasurgical/devilution
2020-04-26 21:44:34 +02:00
Anders Jenbo
7e45f8bcc8
More cleanups
2020-04-26 21:33:56 +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
cc0f92d45b
Merge branch 'master' of github.com:diasurgical/devilution into hellfire
2020-04-06 06:09:30 +02:00
Anders Jenbo
f217b14e3e
Order variables logically
2020-04-06 05:43:20 +02:00
Anders Jenbo
8f635b779c
Correct style of checks
2020-04-06 05:43:20 +02:00
Anders Jenbo
10febf7e15
Decompose a few numbers
2020-04-06 05:43:20 +02:00
Anders Jenbo
cab3ebddf5
Avoid some arrays being of predefined size
...
This makes it easier to change the array size via content
2020-04-06 05:43:20 +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
776ab10476
Merge branch 'master' of github.com:diasurgical/devilution
2020-03-29 23:40:05 +02:00
galaxyhaxz and Robin Eklind
71565b9c02
Several updates [enums+names] ( #2002 )
...
* Several updates
* Correct msg_get_next_packet
* Update enums.h
Co-Authored-By: Robin Eklind <[email protected] [email protected]
2020-03-11 21:27:40 -05: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
da03bae69d
Merge branch 'master' of github.com:diasurgical/devilution
2019-12-25 20:38:25 +01:00
Anders Jenbo
7369deba1b
Merge branch 'master' of github.com:diasurgical/devilution into hellfire
2019-12-25 20:25:56 +01:00
Anders Jenbo
0c90ad0527
Set bool values TRUE/FALSE
2019-12-22 23:57:10 +01:00
Anders Jenbo
9a704ff2f0
Merge branch 'master' of github.com:diasurgical/devilution
2019-12-19 01:05:01 +01:00
Anders Jenbo
36e8cd5bec
Merge branch 'master' of github.com:diasurgical/devilution into hellfire
2019-12-15 07:13:24 +01:00
Anders Jenbo
5fa0c5781b
Backport cleanups from Hellfire branch
2019-12-15 06:14:57 +01:00
Anders Jenbo
e24574897c
[controller] Target portals
...
This will target portals and stairs found within 2 steps if no other
targets are found.
This is naive and doesn't prefer portals propperly.
2019-12-07 02:35:47 +01:00
Anders Jenbo
fae2be813a
Merge branch 'master' of github.com:diasurgical/devilution
2019-09-28 04:31:04 +02:00
Anders Jenbo
0bdd819ca9
Merge branch 'master' of github.com:diasurgical/devilution into hellfire
2019-09-18 01:00:24 +02:00
qndel
13c957a445
Freeupstairs cleanup
2019-09-18 00:46:00 +02:00
galaxyhaxz
d0d6a8d051
Cleanup trigs.cpp
2019-09-17 01:32:28 +02:00
Anders Jenbo
98ab9b9600
Merge branch 'master' of github.com:diasurgical/devilution
2019-08-18 08:07:33 +02:00
Anders Jenbo
68d51e7d27
Implementing Spawned Shareware version
2019-08-12 16:04:20 +02:00
Anders Jenbo
2fcf8dab70
Merge branch 'master' of github.com:diasurgical/devilution
2019-07-21 19:39:17 +02:00
Anders Jenbo
aa50489569
Clean up generated comments
2019-07-21 00:57:53 +02:00
Anders Jenbo
60ee365dff
Merge branch 'master' of github.com:diasurgical/devilution
2019-07-20 19:52:50 +02:00
qndel