Christoph Oelckers
5148fc877d
- consolidate the 3 instances of input.cpp.
...
Some stuff had to be disabled to make it work but that's hardly relevant considering that the goal is to transition off MACT for input handling.
2019-10-28 18:32:05 +01:00
Christoph Oelckers
a72863112b
- fix compilation
2019-10-28 17:50:08 +01:00
Christoph Oelckers
21f6178ade
- avoid writing directly to a backend status variable
2019-10-28 07:10:56 +01:00
Christoph Oelckers
901b86577e
- more cleanup
...
Moving init code and key binding getter to backend
2019-10-28 07:05:32 +01:00
Christoph Oelckers
4f4fc1a8d4
- Cleanup
2019-10-28 07:02:42 +01:00
Christoph Oelckers
065721c62b
- simplified the button state maintenance
...
This removes all unused parts of the implementation and moves the rest to the InputState class for easier replacement later. All MACT is doing now here is to call the UpdateStatus function, the internal workings are no longer relevant.
2019-10-28 07:00:31 +01:00
Christoph Oelckers
f8203ac766
- fixed the compile errors and consolidated the key binding CCMDs.
2019-10-28 06:47:49 +01:00
Christoph Oelckers
e7f75cbf4d
WIP
2019-10-28 01:12:31 +01:00
Christoph Oelckers
68b64d2091
- fixed compilation.
2019-10-27 23:18:44 +01:00
CommonLoon102
43da4b68a2
feature: show player names ( #234 )
...
# Conflicts:
# source/blood/src/config.cpp
# source/blood/src/config.h
# source/blood/src/menu.cpp
# source/blood/src/osdcmd.cpp
2019-10-27 22:24:30 +01:00
Christoph Oelckers
d962a7810d
- deleted unused headers
2019-10-27 22:15:21 +01:00
Christoph Oelckers
cee194fd05
- removed the MACT scriplib after completing the config transition.
2019-10-27 17:31:23 +01:00
nukeykt
aebd22eea8
This makes more sense
2019-10-27 16:54:25 +01:00
nukeykt
5a087b1768
Add gModernMap guard
2019-10-27 16:54:24 +01:00
Christoph Oelckers
bfea07570a
- mapped the remaining Shadow Warrior options to the CVARs.
2019-10-27 16:53:00 +01:00
Christoph Oelckers
2e7ba30068
- a bit more config cleanup.
2019-10-27 14:09:56 +01:00
CommonLoon102
441bd25ca5
feature: option to show voxels instead of sprites for showing weapon ( #233 )
...
# Conflicts:
# source/blood/src/controls.cpp
# source/blood/src/menu.cpp
# source/blood/src/osdcmd.cpp
2019-10-27 13:47:01 +01:00
Christoph Oelckers
c0d5ca8ab8
- Config work almost done.
...
The only thing still referencing the old config file is Shadow Warrior's config read function.
2019-10-27 13:40:24 +01:00
Christoph Oelckers
cdc5044f07
- converted noautoload and forcesetup flags to CVARs.
2019-10-27 09:38:55 +01:00
Christoph Oelckers
4b5ec2aabb
- transitioned the combat macros to the new config and made them independent for all games, so that everything can use the original text. (But considering that they are a multiplayer feature I'm not sure how much that is worth.)
...
- sort the config output alphabetically.
- do not use [=] as key names for the bindings.
2019-10-27 08:14:58 +01:00
Christoph Oelckers
249f6e9d62
- consolidated the joystick and mouse setup code.
2019-10-26 23:45:55 +02:00
Christoph Oelckers
b2d7179dbe
- consolidated the 4 sets of mouse and joystick configuration variables.
2019-10-26 21:50:49 +02:00
Christoph Oelckers
db1a9a9363
- the config finally get saved.
...
Still with a few errors, though.
2019-10-26 20:47:37 +02:00
Christoph Oelckers
cd47582632
- disabled the settings.cfg console script so that the newly added config code can take over its duties.
...
- write the console log to the folder returned by M_GetDocumentsPath and not to the root game directory.
- removed G_ExtPreInit because it has become redundant. The search path setup will have to be redone anyway.
2019-10-26 13:41:42 +02:00
Christoph Oelckers
1e0d49f947
- game starts again.
2019-10-26 13:16:32 +02:00
CommonLoon102
bcf3385ddf
randomize ejecting brass and shell angle on the ground ( #230 )
2019-10-26 10:35:15 +02:00
Grind Core
3cd44c89f5
Commented system message in OperateSprite()
2019-10-26 10:35:14 +02:00
Grind Core
b6ad64ee54
Refactor: xsector, xwall and xsprite structs
...
- Added QAV scene player (playing user animation instead of weapon)
- Added trigger event intiator for sprites (WIP and experimental)
# Conflicts:
# source/blood/src/actor.h
# source/blood/src/player.h
2019-10-26 10:35:13 +02:00
Christoph Oelckers
1c29169492
-perform a proper exit, i.e. make sure that the deinit code can run, by throwing a special exception and actually catching it in the main function.
2019-10-26 10:30:08 +02:00
Christoph Oelckers
0d878a8604
- some needed cleanup on the control code before testing can start.
2019-10-26 10:16:39 +02:00
Christoph Oelckers
47acdae8e6
- moved binding files to subdirectory
...
- fixed search/replace error.
2019-10-26 09:05:17 +02:00
Christoph Oelckers
cfaafcede7
- everything compiles again (not tested yet.)
2019-10-26 00:32:49 +02:00
Christoph Oelckers
9648c026a9
- small adjustments
2019-10-24 20:36:18 +02:00
Christoph Oelckers
8730ce552b
- make things compile again.
...
Let's hope it still works...
2019-10-24 20:28:46 +02:00
nukeykt
df415605ae
Use gameHandleEvents for time updating
...
# Conflicts:
# source/blood/src/gui.cpp
2019-10-24 19:49:57 +02:00
nukeykt
01d63d19e9
Fix crash with WinMM driver
2019-10-24 19:49:51 +02:00
nukeykt
7f094d3a73
Fix music init code
...
# Conflicts:
# source/blood/src/config.cpp
# source/blood/src/menu.cpp
# source/blood/src/osdcmd.cpp
2019-10-24 19:49:50 +02:00
nukeykt
e6f53f7c30
Resolve merge issues
...
# Conflicts:
# GNUmakefile
# platform/Windows/eduke32.sln
# platform/Windows/props/build_common.props
# source/audiolib/include/music.h
# source/blood/src/blood.cpp
# source/blood/src/gui.cpp
# source/blood/src/mapedit.cpp
# source/blood/src/sound.cpp
# source/build/include/vfs.h
# source/build/src/vfs.cpp
2019-10-24 19:48:11 +02:00
Christoph Oelckers
3ed87f449e
- and the last 2 hud CVARS for Blood…
2019-10-24 01:41:55 +02:00
Christoph Oelckers
3efb54e167
- ported most of the remaining HUD CVars
2019-10-24 01:30:33 +02:00
Christoph Oelckers
20df360778
- converted the Polymost CVARs.
2019-10-23 21:11:37 +02:00
Christoph Oelckers
c1041a9c37
- removed the unused DN3D menu code from the Blood subproject.
2019-10-23 19:08:41 +02:00
Christoph Oelckers
ee5f0a7cf6
- cleaned out the remains of the frontends' CVAR definitions.
2019-10-23 18:58:34 +02:00
CommonLoon102
20a393871b
fix compiler error: storage size of weaponQAV isn't known ( #226 )
2019-10-23 18:38:00 +02:00
Szilárd Biró
0f67b74a53
SEQFRAME big endian fix
2019-10-23 18:37:55 +02:00
Christoph Oelckers
21d90fd08b
- fixed compilation.
2019-10-23 18:36:48 +02:00
Christoph Oelckers
02fff2df06
- refactored wchoice and sensitivity CVARS
...
This is all that's needed for now, the remaining ones can wait.
2019-10-23 17:21:14 +02:00
Christoph Oelckers
18430c6c9f
- refactored r_fpslimit
...
Also removed the entire cruft related to this - the pointless offsetting value and the precalculation of the timer value (as if we could not afford a single division for something that WAITS!
Unfortunately this required removal of the menu option for the time being.
2019-10-23 17:07:29 +02:00
Christoph Oelckers
43413e4dff
- r_useprecache
2019-10-23 14:39:33 +02:00
Christoph Oelckers
63f020996e
- a few more CVARs
2019-10-23 01:30:43 +02:00