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

43 commits

Author SHA1 Message Date
qndel
d2ba033d84 fix collision of bodies in butcher chamber/hell 2021-12-14 08:20:25 +01:00
Juliano Leal Goncalves
d4a5868a89 🚚 Rename 'ObjDataStruct' struct to 'ObjectData' 2021-09-06 12:53:44 +02:00
thebigMuh
f41fdedbc7
 		🐛 [hellfire] Fix missing braziers in crypt (causing instability) 
- Crypt candles (braziers) around the storybook were occasionally missing
- Marked OFILE_CANDLE2 to load for all levels 1 through 12, so it is always loaded for crypt as well
- Made search for object graphics a bit more secure, as in the bugged case it would run off past the end of an array
 2021-04-29 01:59:00 +02:00
Anders Jenbo
997c1dba55 🚚 Split up all.h in to proper header relations 2021-04-16 01:04:54 +02:00
Anders Jenbo
20186e0370 🎨 Replace TRUE/FALSE with true/false 
fix


Fix


fix
 2021-04-09 15:13:02 +02:00
Anders Jenbo
bfb3c11c2b 🎨 Change namespace to devilution 2021-04-06 15:21:25 +02:00
Anders Jenbo
630e507f63 🚚 Apply namespace 2021-04-06 15:21:25 +02:00
Anders Jenbo
6f1498d315 🚚 Move structures to there respective headers 2021-04-06 12:41:00 +02:00
Anders Jenbo
0da09df7d6 Fix a few compiler warnings 2021-02-22 05:13:57 +01:00
Anders Jenbo
6f8f4c3293 Unify another chunk of simple Hellfire code paths 2021-01-07 07:19:07 +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
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
09a51aa300 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-18 15:25:51 +02:00
Anders Jenbo
35ca35e813 Books are present on all floors of the crypt 2020-10-17 22:18:38 +02:00
Anders Jenbo
ad2ac2aeeb Merge branch 'master' of github.com:diasurgical/devilution 2020-10-15 03:55:36 +02:00
Anders Jenbo
f434bd6504
 		Add hellfire bugfix 2020-10-14 11:29:55 +02:00
Anders Jenbo
57326c6c7f Merge branch 'master' of github.com:diasurgical/devilution 2020-10-14 11:02:48 +02:00
Anders Jenbo
749cda49f1 Implement loading of hellfire object files 2020-10-14 09:31:05 +02:00
Anders Jenbo
f33e2fa4b7
 		Add hellfire AllObjects data 
This should fix books not appearing in the crypt
 2020-10-14 06:47:27 +02:00
Anders Jenbo
8ecb56952f
 		Correct right L2DOOR not having oTrapFlag enabled 2020-10-14 06:08:36 +02:00
Anders Jenbo
b1ed0de89d Fix skull pile, again 2020-09-28 07:03:22 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo
fcf0c0f81d Add right facing bookcase for mapping 2020-09-20 00:52:13 +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
1ba96a6777 Add doxygen description to remaining engine files 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
10be0c66e0
 		Correct ObjTypeConv 2020-04-13 20:32:05 +02:00
Anders Jenbo
8c3ec91232 Use enums in the ObjTypeConv map 2020-04-13 19:36:07 +02:00
Anders Jenbo
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
054458845a Fix CLang builds 
Possibly the type of ObjDataStruct should be changed to byte
 2020-04-06 10:45:05 +02:00
Anders Jenbo
a291939a7d Value types 2020-04-06 05:43:20 +02:00
Anders Jenbo
187a021b30
 		More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +02:00
Anders Jenbo
48d0589db6 Correct line change in objdat.cpp 2020-03-07 16:38:49 +01:00
Anders Jenbo
d6f70c56ce Format files 2020-03-01 22:48:17 +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
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