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

295 commits

Author SHA1 Message Date
Juliano Leal Goncalves
3de338e5b6 ♻️ Pass item referece on SpecialAutoPlace 
This simplifies and decouples the logic for determining the size of the
item from ambient variables and makes the function easier to use.
 2021-02-28 02:22:33 +01:00
Juliano Leal Goncalves
c81a1efb55
 		Standardize colon alignment on text (#816) 2021-02-27 23:03:41 +01:00
Andi
df7ed584fd
 		biggest commit ever (#1060) 
fixes leaving pepin
 2021-02-26 18:52:40 +01:00
Anders Jenbo
f8f454c61d [diablo] Automatiacally recive healing from Pepin 2021-02-25 05:50:24 +01:00
Anders Jenbo
36a196389b Fix remaning basic compiler errors and warnings 2021-02-22 13:51:42 +01:00
pionere
f5c1079d6f eliminate unused code 2021-02-19 22:04:11 +01:00
pionere
d5a0fa8e85 get rid of a few warnings 2021-02-19 22:04:11 +01:00
qndel
ab9911064f unify checks for single and multiplayer 2021-02-18 22:32:01 +01:00
Anders Jenbo
c08a10e44b Unify calculation of gold icon 2021-02-18 20:52:07 +01:00
Juliano Goncalves
a6eb92c185 Remove item persistence from 'inv.SpecialAutoPlace' 
The 'saveFlag' argument used for persisting the changes into the
inventory is never leveraged on this function: all existing consumers
provide 'FALSE'. It was probably a copy-paste leftover from the
standard 'AutoPlace'.
 2021-02-17 19:12:51 +01:00
Anders Jenbo
8742249ac7 Correct rounding erros in repair costs calculation 
Fixes #997
 2021-02-12 20:29:29 +01:00
Juliano Goncalves
5d2af51d01 Preserve cursor position when using stores 2021-02-03 20:48:47 +01:00
qndel
c0f5749728 Fix RNG diverging during level generation depending on the code path 
The consequences has mostly mitigated after wards, but this will make things make more sens when analysing the state of the code.
 2021-02-01 06:44:16 +01:00
Anders Jenbo
c3b4b5193f Unify a chunk of Hellfire code 2021-01-18 03:25:52 +01:00
Anders Jenbo
f9aacc8704 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-09 19:36:09 +01:00
Anders Jenbo
be917d43c2 Make diablo vegan frindly 2021-01-09 16:48:32 +01:00
Anders Jenbo
0c96e32f19 Unify all defines, enums and structs 2021-01-08 20:53:06 +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
5bdbf18902 Merge branch 'master' of github.com:diasurgical/devilution 2021-01-05 22:44:11 +01:00
Anders Jenbo
7aa7ee738d Clean up witchitem init 2021-01-02 23:05:11 +01:00
Anders Jenbo
e2a98b75fe Clean up some magic values 2021-01-02 22:34:32 +01:00
Anders Jenbo
c1a126868b Merge branch 'master' of github.com:diasurgical/devilution 2020-12-28 01:06:38 +01:00
Anders Jenbo
cc420a43a6 [hellfire] WitchSellOk 2020-12-27 23:40:28 +01:00
Anders Jenbo
6468b1e6e8 Clean up PrintSString 2020-12-27 23:40:18 +01:00
Anders Jenbo
b880bf0160 [hellfire] WitchRechargeOk 2020-12-27 23:40:10 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
Anders Jenbo
719bc95a82 [hellfire] implement SmithSellOk 2020-12-05 19:53:19 +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
e3ef222c4a Reorder stores.cpp 2020-11-09 04:36:59 +01:00
Anders Jenbo
330074e840 Clean up menu animation code 2020-10-31 21:41:06 +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
Anders Jenbo
9150cb71a6 Clean up WitchBuyItem 2020-10-22 18:40:18 +02:00
Anders Jenbo
804071652b Clean up HealerBuyItem 2020-10-22 18:17:17 +02:00
Anders Jenbo
ce1cc24e04 [hellfire] S_HealerEnter 2020-10-22 18:03:10 +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
57326c6c7f Merge branch 'master' of github.com:diasurgical/devilution 2020-10-14 11:02:48 +02:00
Anders Jenbo
34e526d4a9
 		Fix OOB in stores (#2123) 2020-10-14 08:56:21 +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
f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Anders Jenbo
567a086ce1 Fix game speed affecting menu animations 
Fixes #525
 2020-09-28 07:03:22 +02:00
Anders Jenbo
e0a94686b0 Add game speed to multiplayer 
Speed can only be set on game creation
 2020-09-28 07:03:22 +02:00
Tyler
ecde1f647e Adjust UI to any resoution 2020-09-28 07:01:27 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00