Commit graph

441 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
3b04a4d6d9 [hellfire] SpawnPremium min diff 2020-11-09 02:06:09 +01:00
Anders Jenbo
fa3785a475 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-04 03:02:48 +01:00
Anders Jenbo
9f9a7920d4 Reorder items.cpp 2020-11-03 02:05:01 +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
ac8a2a410e Fix building Hellfire with CLang 2020-10-19 06:33:17 +02:00
Anders Jenbo
ad2ac2aeeb Merge branch 'master' of github.com:diasurgical/devilution 2020-10-15 03:55:36 +02:00
Anders Jenbo
d665dfae9a Clean up RndItem 2020-10-15 03:08:16 +02:00
Anders Jenbo
e0825eb60a Clean up SaveItemPower 2020-10-15 03:03:09 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
qndel
95e084dbd3
apply enums (#2088) 2020-10-12 00:23:59 +02:00
qndel
7b8dd91979 [hellfire] HealerItemOk bin exact 2020-10-12 00:14:56 +02:00
qndel
b0142637b7
Ear cleanup #2 (#2100) 2020-10-12 00:14:24 +02:00
qndel
46e38e025e RechargeItem cleanup 2020-10-12 00:04:02 +02:00
qndel
1d308c5f95 CalcSelfItems cleanup 2020-10-12 00:03:50 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
qndel
01ef654093 RndItem cleanup 2020-10-11 16:12:05 +02:00
Anders Jenbo
f1a193e1e2 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-11 07:01:25 +02:00
pionere
f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Juliano Leal Goncalves
18aa44277f Fix incorrect spelling of 'right-click[ing]' 2020-10-07 04:16:18 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Tyler
c803c6aa66 Calculate position of screen elements 2020-09-27 00:21:54 +02:00
qndel
2cc494581f Add enum for icreateinfo 2020-09-01 07:02:38 +02:00
Anders Jenbo
c1b4d3d8b5 Copy documentation from sanctuary/notes 2020-07-06 05:43:25 +02:00
Robin Eklind
60eb5c946c items: add BUGFIX comment for DrawULine 2020-07-03 02:19:38 +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
3227fea5c0 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-26 21:44:34 +02:00
Robin Eklind
e6fa244fa7 items: add BUGFIX comment for SaveItemPower 2020-04-26 19:32:38 +02:00
Anders Jenbo
fe82c0b1f1 Clean up GetItemPower
Thanks @tsunamistate for bringing attention to this
2020-04-15 16:52:42 +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
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
630655d9e4 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-08 21:58:34 +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
qndel
92c4824820 [hellfire] CalcPlrItemVals 2020-04-06 07:42:34 +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
c632e2d1d0
Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
galaxyhaxz
71565b9c02
Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <mewmew@users.noreply.github.com>

Co-authored-by: Robin Eklind <mewmew@users.noreply.github.com>
2020-03-11 21:27:40 -05:00
Robin Eklind
09e25b1e10
Merge pull request #2014 from mewpull/bug-SetupAllItems
Document BUG in SetupAllItems when recreating unique items.
2020-03-03 11:11:34 +01:00
Anders Jenbo
0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01:00
Robin Eklind
68a8f07d2b Document BUG in SetupAllItems when recreating unique items. 2020-03-01 23:33:28 +01:00