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

89 commits

Author SHA1 Message Date
Anders Jenbo
d37fb68809 Make header checks portable 2021-03-02 12:17:13 +01:00
Anders Jenbo
39999791b3 Revamp ini options and sync in multiplayer 
[NetMsg]
F12=Now you DIE!
F11=Here's something for you.
F10=Follow me.
F9=I need help! Come Here!

[Game]
Speed=50
Fast Walk=1
Grab Input=0
Theo Quest=0
Cow Quest=0

[Audio]
Sound Volume=0
Music Volume=0
Walking Sound=1

[Graphics]
Fullscreen=1
Fit to Screen=1
Scaling Quality=2
Integer Scaling=0
Vertical Sync=1
Blended Transparency=1
Gamma Correction=100
Color Cycling=1

[Diablo]
Intro=0

[Hellfire]
Intro=0
SItem=

[Phone Book]
Entry1=127.0.0.1

[Network]
Bind Address=0.0.0.0
 2021-03-01 11:52:26 +01:00
Anders Jenbo
4563ef4e83 [hellfire] Disable jogging by default 2021-02-25 05:50:24 +01:00
Anders Jenbo
713f74e8d5 Implement Support menu 2021-02-22 05:13:57 +01:00
pionere
97d53ced7e get rid of a few warnings (strncpy) 2021-02-19 22:04:11 +01:00
FluffyQuack
790c8e17e5 Implemented blended tranparency 2021-02-19 05:57:48 +01:00
qndel
ab9911064f unify checks for single and multiplayer 2021-02-18 22:32:01 +01:00
Anders Jenbo
9894bffc95 Unify another chunk of Hellfire code 2021-01-23 03:34:03 +01:00
Anders Jenbo
9b1568cc08 Startup issues with shareware version 2021-01-17 16:04:13 +01:00
Anders Jenbo
8c261d0966 Merge remaning clean Hellfire code paths 2021-01-09 19:04:31 +01:00
Anders Jenbo
6f8f4c3293 Unify another chunk of simple Hellfire code paths 2021-01-07 07:19:07 +01:00
Anders Jenbo
c802cbdc4d Merge more Hellfire code paths 2021-01-05 23:14:35 +01:00
Anders Jenbo
61a580588c Unify save game loading 2021-01-02 22:35:42 +01:00
Anders Jenbo
61b2d0de95 Merge branch 'master' of github.com:diasurgical/devilution 2020-12-16 02:24:39 +01:00
Anders Jenbo
fa3785a475 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-04 03:02:48 +01:00
Anders Jenbo
ead99489b1 Reorder mainmenu.cpp 2020-11-03 03:53:09 +01:00
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