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

50 commits

Author SHA1 Message Date
Anders Jenbo
f05ae4c19a Unify monster data 2021-01-21 04:26:03 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
c802cbdc4d Merge more Hellfire code paths 2021-01-05 23:14:35 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
Anders Jenbo
38dbcf7641 Format source 2020-12-02 00:52:38 +01:00
qndel
f137159b8d monsters cleanup 2020-11-10 20:12:55 +01:00
Anders Jenbo
72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
qndel
fa0b326498 unify names 2020-10-24 08:07:56 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
Anders Jenbo
7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo
cd2f7fc4d4 Fix mapping objects and monsters 
Added sound to fire trap lever
Added damage to fire trap

Fix rendering of skull pile

Remove one to many hellfire monsters

Remove duplicate items from ObjTypeConv
Remove slain hero (crashes game on low level heros)
Remove water (it's miss aligned and not realy useful)
Added trap variants of all chests
Added book stand
Removed door objects (they aren't of much use and will crash the game if
used on the wrong levels)
Rmoved all story books (crashes game if not use on the right level, tied
to specific quests etc)
 2020-09-19 14:23:57 +02:00
Anders Jenbo
e226b918a0 Clean up enum usage 2020-09-19 14:22:34 +02:00
Anders Jenbo
c1b4d3d8b5 Copy documentation from sanctuary/notes 2020-07-06 05:43:25 +02:00
Anders Jenbo
9a04787577 Make all objects and monsters avalible to .dun levels 2020-06-21 15:14:10 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo
f066b57cd0 Merge master in to hellfire 2020-04-09 02:14:08 +02:00
Anders Jenbo
2ec7c78eae Format source 2020-04-08 22:28:53 +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
edcd92e012 Misc clean ups that missed last round 2020-04-08 21:47:32 +02:00
Anders Jenbo
1340192b59 Correct array sizes 2020-04-08 20:34:27 +02:00
Anders Jenbo
c09c37ec21 Create define for monsterAvailTbl 2020-04-08 20:34:24 +02:00
Anders Jenbo
7db4ed749a Apply more enums, defines and types 2020-04-08 20:18:11 +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
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
Anders Jenbo
0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01:00
Anders Jenbo
25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Anders Jenbo
20621a0642
 		add all.h and use in place of diablo.h (#2005) 
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
 2020-02-14 13:12:54 +01:00
Anders Jenbo
da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo
7369deba1b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-25 20:25:56 +01:00
Anders Jenbo
edb2f774d4
 		Fix Devil Kin Brute being enabled 2019-12-25 20:12:52 +01:00
Anders Jenbo
9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo
c62a9086b7 [hellfire] Fix broken data 2019-12-15 06:52:17 +01:00
Anders Jenbo
5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
Anders Jenbo
a18720892b Correct Hork Demon AI and align table 2019-09-20 23:24:22 +02:00
Anders Jenbo
b57a512b90 Document MonstAvailTbl 2019-09-19 22:09:34 +02:00
Anders Jenbo
078329e79c [hellfire] Correct monster data 2019-09-19 09:05:01 +02:00
galaxyhaxz
8ad915da83 Fix monsters 2019-09-19 03:31:47 +02:00
Robin Eklind
85d948d05d
 		Update Source/monstdat.cpp 2019-09-18 18:13:10 +02:00
Anders Jenbo
9aec39a07d Add UniqMonst 2019-09-18 11:54:10 +02:00
Anders Jenbo
8e726b3d50 [hellfire] Monster data 2019-09-18 10:15:50 +02:00
Anders Jenbo
98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Anders Jenbo
68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
Anders Jenbo
aac4269fd9 Fix bad merge 2019-07-21 22:49:38 +02:00
Anders Jenbo
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Anders Jenbo
c1f9e8293e Correct new line encoding 
_asm.cpp and _render.cpp is still incorrectly encoded
 2019-07-06 16:48:37 +02:00
Anders Jenbo
a46ef68b2c Merge branch 'master' of github.com:diasurgical/devilution 2019-04-29 02:29:39 +02:00
galaxyhaxz
610580625e Split data from files 2019-04-29 01:40:44 +02:00