Commit graph

17 commits

Author SHA1 Message Date
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
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
5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01: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