Commit Graph
243 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 5b48394689 WIP CheckInvPaste 2020-11-09 01:57:38 +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 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
qndel b81d2eb831 some cleanups (#2099) 2020-10-12 00:42:02 +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 92cc9d589c Apply another bunch defines 2020-10-11 06:42:13 +02:00
pionere d3fd97705f invitem 2020-10-11 06:41:36 +02:00
pionere 146d4114f9 slots 2020-10-11 06:41:24 +02:00
pionere f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Anders Jenbo 56eae4c277 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-06 17:27:03 +02:00
Juliano Goncalves cf53a03585 Use 'MAXBELTITEMS' in belt traversal logic. 2020-10-01 03:29:43 +02:00
Anders Jenbo c53ca1a62a Adjust resolution to monitor default on startup 2020-09-28 07:03:22 +02:00
Truth abbf69ce56 adjust right hand background 1px 2020-09-28 04:29:46 +02:00
Truth 00a761fa2d align inventory cell backgrounds with sprite 2020-09-28 04:29:46 +02:00
Anders Jenbo f5647c4788 Merge branch 'master' of github.com:diasurgical/devilution 2020-09-28 02:11:28 +02:00
pionere 4c02613cd0 maxitems 2020-09-28 01:54:59 +02:00
Anders Jenbo 145ab3c48e Apply more defines to replace magic numbers 2020-09-27 05:33:00 +02:00
Anders Jenbo efa445731a Apply NUM_XY_SLOTS 2020-09-27 04:21:49 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
qndel 2cc494581f Add enum for icreateinfo 2020-09-01 07:02:38 +02:00
Anders Jenbo 31ac716c3d 99 lines of documentation (#2058) 2020-07-07 19:36:18 +02:00
Anders Jenbo 18bec27121 Hellfire clean ups 2020-04-26 22:34:30 +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 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo 46224337d8 Fix bin diff 2020-04-14 12:52:44 +02:00
Anders Jenbo 3b8bcf98bf Enable assertions 2020-04-11 15:22:40 +02:00
Anders Jenbo 350646fe95 Correct signatures 2020-04-11 15:22:40 +02:00
Anders Jenbo d008af43b0 Semantic code style cleanups 2020-04-11 15:22:40 +02:00
Anders Jenbo 30f4f1d71b Add struct for CornerStone 2020-04-10 10:08:55 +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 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 187a021b30 More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02: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
Troy Bronzan 1ee9eee711 Fixed dupe bug as per the information found on this topic: https://www.reddit.com/r/Diablo/comments/4kdh3u/diablo_1_deserves_some_love_introducing/d3eel0k/ 2020-03-11 23:05:20 +01:00
Anders Jenbo 0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +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