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

267 commits

Author SHA1 Message Date
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
Tyler
c803c6aa66 Calculate position of screen elements 2020-09-27 00:21:54 +02:00
luk
f98651d1b8 implement variable game speed #525 2020-09-17 14:32:06 +02:00
Anders Jenbo
1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Robin Eklind
6448f7901b stores: add bugfix comment for DrawSLine 2020-07-03 04:37:51 +02:00
Anders Jenbo
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
3f11876aba Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 10:48:11 +02:00
qndel
5191237f42
 		enums and stuff (#2024) 2020-04-06 08:04:14 +02:00
Anders Jenbo
b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
qndel
f35c955e36 [hellfire] S_StartBBoy bin exact 2020-03-31 17:00:54 +02:00
qndel
19ec9622f5 [hellfire] S_StartWRecharge bin exact 2020-03-31 16:49:44 +02:00
qndel
408780458a [hellfire] S_StartSRepair bin exact 2020-03-31 16:49:11 +02:00
qndel
4ecc2090d9 [hellfire] S_StartWSell bin exact 2020-03-31 16:48:56 +02:00
qndel
48739cd1a2 [hellfire] S_StartSSell bin exact 2020-03-31 16:48:40 +02:00
qndel
540363493c [hellfire] S_StartHealer bin exact 2020-03-31 16:06:54 +02:00
Anders Jenbo
776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
Robin Eklind
bac19161bc
 		Merge pull request #2023 from qndel/S_BBuyEnter 
[hellfire] S_BBuyEnter bin exact
 2020-03-28 10:52:46 +01:00
qndel
ccb44d0c6e [hellfire] S_BBuyEnter bin exact 2020-03-28 04:57:05 +01:00
qndel
3271bb1c2c [hellfire] S_StartSIdentify bin exact 2020-03-28 04:44:56 +01:00
galaxyhaxz
f89204e7dd Fix function/var names (effects/sound) 2020-03-24 00:22:36 -05:00
Anders Jenbo
a37b983863 [hellfire] InitStores 2020-03-12 04:36:14 +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
Anders Jenbo
3c276a3cd3 Add documentation 
- Add file documentation to about 1/4 of the files in Source
- Copy over a lot of the documentation from the sanctuary/notes repo
- Standardise all the existing documentation
- Create a configuration for Doxygen
- Add more documentation (engine.cpp is now fully documented)
 2020-03-01 22:18:00 +01:00
Anders Jenbo
58e3192ef9 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #620
 2020-02-29 18:18:45 +01:00
galaxyhaxz
81ff8e6287 Metallic hydrogen neural array 2020-02-28 16:35:57 -06: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
40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
Anders Jenbo
08aa6a860a Move generic helpers out of miniwin 2020-02-01 13:56:08 +01:00