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

260 commits

Author SHA1 Message Date
Anders Jenbo
c3b4b5193f Unify a chunk of Hellfire code 2021-01-18 03:25:52 +01:00
Anders Jenbo
00e3ff08ae Unify majorty of monster.cpp 2021-01-17 03:55:23 +01:00
Anders Jenbo
f9aacc8704 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-09 19:36:09 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
ba484f5a7e Deduplicate GoldAutoPlace 2021-01-09 16:48:32 +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
a2a3729491 Enable loading hellfire games form main menu 2021-01-02 07:40:05 +01:00
Anders Jenbo
d20eddf48e Unifcy a chunk of Hellfire's code pathts 2020-12-28 01:11:25 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
Anders Jenbo
a8857130b5 [hellfire] CheckInvPaste 2020-12-11 09:15:07 +01:00
Juliano Goncalves
56a2bde9eb Remove duplicated readied spell validation 
The logic is already performed inside 'CalcPlrScrolls', which is
called in both places.
 2020-12-04 19:29:23 +01:00
Juliano Goncalves
00f3b753ee Extract valid readied spell logic 2020-12-04 19:29:23 +01:00
Juliano Goncalves
c2ed83eb5e Ensure consistent types for '_pScrlSpells' and '_pISpells' operations 2020-12-04 19:29:23 +01:00
qndel
c4c2e0420c
 		spell defines and macros (#2162) 2020-12-04 19:18:22 +01:00
Anders Jenbo
38dbcf7641 Format source 2020-12-02 00:52:38 +01:00
qndel
a2dc735f6b some cleanup 2020-11-23 17:04:50 +01:00
qndel
73dce4fa39 minor cleanup 2020-11-12 15:13:01 +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