Commit Graph
365 Commits
Author SHA1 Message Date
Juliano Goncalves c2ed83eb5e Ensure consistent types for '_pScrlSpells' and '_pISpells' operations 2020-12-04 19:29:23 +01:00
Anders Jenbo d4976f70ac Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 06:36:10 +01:00
Anders Jenbo f7290182fd Reorder player.cpp 2020-11-09 03:24:05 +01:00
Anders Jenbo 72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy ec329e645c Fix all "no-write-strings" warnings 2020-10-25 15:37:51 +01:00
Anders Jenbo e90f84dd03 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-22 22:14:49 +02:00
qndel 36dba1cc1c cleanup (#2127) 2020-10-22 17:26:24 +02: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 57f0f5f4c7 Handle hellfire save game differences 2020-10-13 05:12:20 +02:00
Anders Jenbo b8fa918f53 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-13 03:29:37 +02:00
Anders Jenbo 43f9e71acb Unify player structures
Since they are being usered there reserved status can be said to have
changed. Clearly naming them makes it easier to understand what meaning
they have and this doesn't affect bin exact.
2020-10-13 03:08:00 +02:00
Anders Jenbo b62b3375bd Merge branch 'master' of github.com:diasurgical/devilution 2020-10-13 02:05:36 +02:00
Anders Jenbo 3797fca554 Implement player class data 2020-10-12 15:36:03 +02:00
Anders Jenbo 2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel b81d2eb831 some cleanups (#2099) 2020-10-12 00:42:02 +02:00
qndel d16bdd02ac CheckNewPath cleanup 2020-10-12 00:05:10 +02:00
qndel 3e7e9b4012 PlrHitPlr cleanup 2020-10-12 00:03:18 +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 ba1f473e34 NUM_CLASSES 2020-10-11 06:41:46 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo 81d5728699 Add monk, bard, & barbarian base block from Jarulf 2020-09-17 13:28:11 +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 8c2fb7605e Use defines for tile and screen related magic numbers 2020-05-11 23:21:27 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo 2ec7c78eae Format source 2020-04-08 22:28:53 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +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 f7de4c46a7 Strip eflag logic now that it is fixed in the render 2020-04-06 22:51:32 +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
qndel 92c4824820 [hellfire] CalcPlrItemVals 2020-04-06 07:42:34 +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 31181b77c4 Bool comparisons 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 f89204e7dd Fix function/var names (effects/sound) 2020-03-24 00:22:36 -05:00
galaxyhaxz c632e2d1d0 Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
galaxyhaxzandRobin Eklind 71565b9c02 Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <[email protected]>

Co-authored-by: Robin Eklind <[email protected]>
2020-03-11 21:27:40 -05:00
Anders Jenbo 0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01:00
Anders Jenbo d6f70c56ce Format files 2020-03-01 22:48:17 +01:00
Anders Jenbo 3c276a3cd3 Add documentation
- Add file documentation to about 1/4 of the files in Source
- Copy over a lot of the documentation from the sanctuary/notes repo
- Standardise all the existing documentation
- Create a configuration for Doxygen
- Add more documentation (engine.cpp is now fully documented)
2020-03-01 22:18:00 +01:00
Anders Jenbo 58e3192ef9 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #620
2020-02-29 18:18:45 +01:00
galaxyhaxz 81ff8e6287 Metallic hydrogen neural array 2020-02-28 16:35:57 -06:00
Anders Jenbo 25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00