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

73 commits

Author SHA1 Message Date
Anders Jenbo
c54cc2013c Calculate tick related values based on current game speed 2020-10-29 21:39:58 +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
09a51aa300 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-18 15:25:51 +02:00
Anders Jenbo
3c3e9b0f63 [hellfire] mainmenu_multi_player 2020-10-18 06:04:35 +02:00
Anders Jenbo
ff49e662a0 [hellfire] mainmenu_single_player 2020-10-18 06:00:39 +02:00
Anders Jenbo
fd7a2a63b5 [hellfire] mainmenu_loop 
UiMainMenuDialog UiSupportDialog have been disabled as to avoid having
to implement hellfireui.dll for now.
 2020-10-18 05:44:07 +02:00
Anders Jenbo
08838c9cae Always use hellfire menu when hellfire is enabled 2020-10-13 23:51:04 +02:00
Anders Jenbo
cec9579186 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:48:34 +02:00
qndel
33a81f0921 [hellfire] mainmenu_play_intro 2020-10-12 09:03:31 +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
Anders Jenbo
35f9b9d750 Add game speed to the ingame options menu 
This removes the option to disable color animations (color cyceling)
 2020-09-28 07:03:22 +02:00
Tyler
d7ca28ff8e Added single-player difficulty menu. 2020-09-17 23:10:47 +02:00
luk
f98651d1b8 implement variable game speed #525 2020-09-17 14:32:06 +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
Anders Jenbo
7e45f8bcc8 More cleanups 2020-04-26 21:33:56 +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
Anders Jenbo
0383f9abcd Add documentation to more files 2020-03-02 02:29:28 +01: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
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
40cea40aa4 Remove windows call types collisions 2019-12-26 05:00:02 +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
0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +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
4cc4cd011c Merge branch 'master' of github.com:diasurgical/devilution 2019-10-28 21:57:36 +01:00
Anders Jenbo
195ac2a4a7 Apply music enums 2019-10-28 21:42:33 +01:00
galaxyhaxz
3a37b4fc0b Add music code+quest (#1575) 2019-09-08 22:01:35 +02:00
Anders Jenbo
d26fe48942 [hellfire] Correct player structure and related functions 2019-09-04 22:20:54 +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
galaxyhaxz
905ad6efcd Fix version string 2019-07-24 10:12:11 +02:00
galaxyhaxz
484b17d259
 		Add Select Hero enum (#1330) 2019-07-23 20:41:32 -05:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
32a51d17ca Align function signatures with PSX symbols 
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
 2019-07-08 04:12:12 +02:00
Anders Jenbo
0483a923c3 Add enum for dlgresults 2019-07-06 05:23:37 +02:00
Anders Jenbo
0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin
5f0fb73b8c Make mainmenu_create_hero bin exact (4 unused arguments added) 2019-05-05 23:33:28 +01:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution 
Fixes #92
 2019-05-05 00:27:08 +02:00
Anders Jenbo
c8301280c5 Clean up mainmenu.cpp 2019-05-02 00:16:46 +01:00
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz
5238265702
 		Implement assert support (#791) 2019-03-29 21:26:37 -05:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00