Christoph Oelckers
7deb3ed4bd
- Duke: got rid of the last 3 remaining #defines not used for list generation, as well.
2020-10-11 14:30:43 +02:00
Christoph Oelckers
fc82b3bc8a
- Duke: replaced the game type macros with inline functions.
2020-10-11 14:30:42 +02:00
Christoph Oelckers
9cc1268839
- Duke: added missing include guard to conlabel.h.
2020-10-11 14:30:42 +02:00
Christoph Oelckers
67375cf79c
- SW: renamed 3 duplicate constants
2020-10-11 14:30:42 +02:00
Christoph Oelckers
f0a1ce4850
- SW: fix some include guards.
2020-10-11 14:30:42 +02:00
Christoph Oelckers
fc54d98100
- Exhumed: Give all savegame handlers and action sequences unique names.
2020-10-11 14:30:41 +02:00
Christoph Oelckers
c87185a337
- use distinct names for monster AI variables and functions.
...
I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 14:30:41 +02:00
Christoph Oelckers
2f4c78dd73
- use distinct variable names for QAV and SEQ management.
2020-10-11 14:30:41 +02:00
Christoph Oelckers
3b59bf759c
- Blood: there's no need to store the loadsave handlers in local variables that never get used.
2020-10-11 14:30:40 +02:00
Christoph Oelckers
47e452f452
- fixed the real issue for the sound problems and reverted the last commit.
...
It was far more serious than a botched merge.
2020-10-11 13:44:23 +02:00
Mitchell Richters
5973391a51
- SW: Tune DrawHUD2()
text positioning and image scaling.
...
Not sure how or when these came to be off. Perhaps additional chars have effected the overall font size?
2020-10-11 22:38:56 +11:00
Mitchell Richters
372f0db28a
- Exhumed: Resolve sound issues following bad merge conflict resolve from b06a847d9a
.
2020-10-11 22:01:37 +11:00
Christoph Oelckers
adaf25377c
- moved the player sprite away from the edge of the frame.
2020-10-11 07:50:41 +02:00
Christoph Oelckers
8b8c6a5e3a
- fixed episode default.
2020-10-11 07:44:51 +02:00
Christoph Oelckers
ca288d08f4
- compile all files with script exports in the main project.
...
This hopefully gets around the failure to find these on on-Windows Builds.
2020-10-11 07:40:11 +02:00
Mitchell Richters
5011b10549
- binaryangle.h/cpp: Inline the functions created in 271eb1c3fa
. No real need to have a separate file for these.
2020-10-11 15:34:18 +11:00
Christoph Oelckers
820b37721b
- moved tab completion code into 'common' as well.
2020-10-11 00:08:07 +02:00
Christoph Oelckers
242a70e610
- split the command line buffer off from c_console.cpp and reactivated the check for CONBACK.
2020-10-10 23:16:08 +02:00
Christoph Oelckers
fe2e96d3a6
Merge branch 'master' into InputContinuation
...
# Conflicts:
# source/games/duke/src/duke3d.h
2020-10-10 21:39:27 +02:00
Christoph Oelckers
dcde91b0c9
- do not wrap the simple value wrappers into a JSON object when being serialized.
...
It only adds to the processing time - they can just be written out as-is.
2020-10-10 21:36:12 +02:00
Christoph Oelckers
a39cf290e3
- Blood: fixed: The player's inventory and some other state were reset for each level, not each new game.
2020-10-10 20:20:12 +02:00
Christoph Oelckers
78d5b2aa95
- Duke: fixed: The Recon's roaming sound was poorly checked resulting in garbled output.
...
It checked for two instances globally, which made the same actor repeat its sound all over again, but if more recons were present some were silent.
Now each one is allowed to play its effect separately.
2020-10-10 19:17:23 +02:00
Christoph Oelckers
b06a847d9a
Merge branch 'menu2'
...
# Conflicts:
# source/exhumed/src/sound.cpp
2020-10-10 19:03:29 +02:00
Christoph Oelckers
e95fea1056
- fixed: Toggling palette emulation should reset the texture filter in the samplers.
2020-10-10 18:57:16 +02:00
Christoph Oelckers
16a4d49268
- added background dimming for the menu when in overlay mode.
2020-10-10 18:29:15 +02:00
Christoph Oelckers
b142f33edd
- fixed problems with stopping sector effect sounds.
...
The old check only accounted for the case of trying to play a valid follow-up sound, but not for merely stopping the old one.
Restored the original check that was here.
2020-10-10 18:11:26 +02:00
Christoph Oelckers
f9ab77f700
- create named texture copies for 'tilefromtexture' replacements.
...
We want to be able later to find them in the texture manager again.
2020-10-10 16:52:04 +02:00
Christoph Oelckers
c478d1add2
- properly uninit the menus.
2020-10-10 15:16:28 +02:00
Mitchell Richters
271eb1c3fa
- binaryangle.h/cpp: Hook up FSerializer and use within Duke for saving objects.
2020-10-11 00:10:53 +11:00
Christoph Oelckers
91e23b3ab5
- Exhumed: play the menu advance sound when starting a game
2020-10-10 13:30:23 +02:00
Christoph Oelckers
294a806793
- fixed some issues with prematurely terminated sounds.
2020-10-10 12:57:43 +02:00
Christoph Oelckers
db21d5e946
- took all script exports out of the namespaces.
...
It looks like GCC cannot deal with this - on MSVC it works fine.
2020-10-10 10:11:22 +02:00
Christoph Oelckers
16fd505f9a
- make sure that sfxinfo_t is always fully initialized by adding initializer values to all fields.
...
Let's hope this finally fixes those sound hiccups.
2020-10-10 09:47:00 +02:00
Mitchell Richters
8f68e8b4a1
- Amend 2865fef7ed
as accidentally returned horizon as Build and not Q16.16.
2020-10-10 17:52:43 +11:00
Mitchell Richters
2865fef7ed
- Duke: Restore return_to_center
in gameexec.cpp dropped in 0ab3b33a6c
and redo based on new code.
2020-10-10 16:59:00 +11:00
Mitchell Richters
6ecbb2587e
- Duke: Fix z position when on certain cameras following changes in 09a05f354c
.
2020-10-10 16:17:02 +11:00
Christoph Oelckers
2237113a77
- fixed font scaling in RR's confirmation screens.
2020-10-10 00:51:26 +02:00
Christoph Oelckers
37d86d03f5
- fixed SW's skill-dependent startup lines
2020-10-10 00:09:18 +02:00
Christoph Oelckers
03e57fa3d7
- fixed Exhumed's game startup.
2020-10-09 23:58:34 +02:00
Christoph Oelckers
d6d9100992
- set proper slider colors for all games.
2020-10-09 23:35:38 +02:00
Christoph Oelckers
b21beb4039
- made the options search work.
...
This required changing how the engine credits menu work because it created a circular dependency in its original form.
2020-10-09 22:33:02 +02:00
Mitchell Richters
9c993b9104
- d_protocol: Change horz/avel pack/unpacking from long to float.
2020-10-09 16:18:28 +11:00
Mitchell Richters
79cd5e4731
- Blood: Fix warptocoords
CCMD.
2020-10-09 12:33:47 +11:00
Mitchell Richters
c6e3b4df11
- Blood: Use backend interpolation functions for angle and rotscrnang.
2020-10-09 11:34:42 +11:00
Mitchell Richters
44e4c5ff78
- Fix joystick scaling following shift to fixedhoriz and binangle.
...
* Remove joystick scaling from `CONTROL_GetInput()`.
* Store turnspeed as constant at top of `processMovement()` and use it for joystick yaw/pitch scaling. This adds the advantage of having the out-of-box turning speed match the keyboard's turn speed and also attenuates when the player is not running.
2020-10-09 11:34:14 +11:00
Christoph Oelckers
2d8bcd06fd
- added the player display for Duke.
...
This completes the menu transition.
2020-10-09 01:09:51 +02:00
Christoph Oelckers
a10aacea3a
- added the QAV drawer page.
2020-10-09 00:50:21 +02:00
Christoph Oelckers
2f8284f10b
- added filler help and credit menus for Exhumed.
...
They should not be empty, so that they do not crash when opened from the console.
2020-10-09 00:21:06 +02:00
Christoph Oelckers
4024ebd12d
- re-added Duke 1.3's credit screens.
2020-10-09 00:11:49 +02:00
Christoph Oelckers
802d295e48
- Shadow Warrior credit screens.
2020-10-08 23:53:15 +02:00
Christoph Oelckers
02507d937d
- got the text screens working. Also reformatted RR's credits a bit for a better presentation.
2020-10-08 23:40:17 +02:00
Christoph Oelckers
19c719db4e
- image scroller is working again.
2020-10-08 22:53:12 +02:00
Christoph Oelckers
6ba06f5ed0
- ImageScroller WIP commit.
2020-10-08 22:20:41 +02:00
Christoph Oelckers
15eaf86f5a
- preparations for the image scroller menu.
2020-10-08 18:02:25 +02:00
Christoph Oelckers
8caaf4fa64
- menu transitions are working again.
2020-10-08 16:33:11 +02:00
Mitchell Richters
f35bec4a5d
- Fix interpolation issues and do other minor fixes following shift to fixedhoriz and binangle.
...
* When interpolating on the initial setup, when binangle reached an overflow point when going lower than zero, the engine was spinning the player around clockwise to the new angle (2047, for instance).
* Interpolating after casting as uint64_t with a workflow similar to the original games, the issue went away.
* Cleaned up other interpolation functions to be of a consistent workflow.
* Scale keyboard input turning down to degree speeds.
* Uplift some remaining Q16.16 code in `applylook()` to full BAM precision.
* Move static calculations of aim and look speeds for `sethorizon()` back into function since GameTicRate isn't set right before calculation is done.
* Simplify the angle target setup back to a basic value like before.
* Repair SW interpolation issues of weapon sprite drawer when rotating left/right.
* Fix SW death horizon constant values following change of horizon center to 0.
2020-10-08 21:12:21 +11:00
Mitchell Richters
9bcdeae6cd
- InputPacket: Change q16avel
to avel
, changing type from fixed_t to float.
2020-10-08 14:47:30 +11:00
Mitchell Richters
e53d58bd42
- gamecontrol: Clean up remainder of legacy angle code.
2020-10-08 14:29:50 +11:00
Mitchell Richters
d758a0ae28
- SW: Cut q16ang
/q16look_ang
/q16rotscrnang
over to PlayerAngle struct.
2020-10-08 14:23:44 +11:00
Christoph Oelckers
cc7290e313
- work on menu transitions.
2020-10-08 01:00:23 +02:00
Christoph Oelckers
56eae0b42d
- got the basics working for Exhumed's main menu.
2020-10-08 00:21:07 +02:00
Christoph Oelckers
a953404331
- SW's text menus done.
...
This also copies the Build texture animation info into the texture manager so that the 2D code can access it through existing interfaces.
2020-10-07 23:22:29 +02:00
Mitchell Richters
3bc6777cf4
- Exhumed: Cut q16ang
/q16look_ang
/q16rotscrnang
over to PlayerAngle struct.
2020-10-08 08:08:40 +11:00
Mitchell Richters
bd68f67460
- Blood: Cut q16ang
/q16look_ang
/q16rotscrnang
over to PlayerAngle struct.
2020-10-08 07:55:54 +11:00
Christoph Oelckers
6041a3355c
- removed the file location reporting for Blood errors because it embeds the full path into the executable, which is not acceptable.
2020-10-07 20:52:25 +02:00
Christoph Oelckers
789eb6d51d
- Most of Duke's menus work again.
2020-10-07 20:32:43 +02:00
Christoph Oelckers
2bb38f7d67
- get load and save game menus and related CCMDs working again.
2020-10-07 18:32:57 +02:00
Christoph Oelckers
53c3a6fc9b
- silenced some warnings.
2020-10-07 16:02:49 +02:00
Mitchell Richters
40cb64cdcf
- applylook(): Remove some forgotten debug lines.
2020-10-07 23:40:41 +11:00
Mitchell Richters
babd7b9556
- InputState: Proposed new sensitivity dividers now that mouse input is based on true pitch and true angle.
2020-10-07 23:25:36 +11:00
Mitchell Richters
fca846272e
- gamecontrol: Initial setup of PlayerAngle
struct and deployment within Duke.
...
* Struct made up of binangle class units.
* Create signed clone of binangle for use with look_ang and rotscrnang.
* Append currently outgoing function names with `2` at the end to avoid conflict.
2020-10-07 23:13:29 +11:00
Mitchell Richters
e2691d4184
- Duke: Clean up a few missed things during f39939d114
.
2020-10-07 18:34:52 +11:00
Mitchell Richters
0c55a533be
- PlayerHorizon: Change struct functions to declarations and define code in gamecontrol.cpp to reduce binary size.
2020-10-07 18:25:50 +11:00
Mitchell Richters
6a30d6880e
- InputPacket: Change q16horz
to horz
, changing type from fixed_t to float.
2020-10-07 18:22:07 +11:00
Mitchell Richters
d16b4651bb
- gamecontrol: Remove old horizon code left behind while cutting over each game.
2020-10-07 18:12:09 +11:00
Mitchell Richters
6476430be6
- SW: Cut q16horiz
/q16horizoff
over to PlayerHorizon struct.
2020-10-07 18:08:57 +11:00
Mitchell Richters
6da756cc9f
- Exhumed: Cut q16horiz
over to PlayerHorizon struct.
2020-10-07 17:40:59 +11:00
Mitchell Richters
c03131f8d1
- Blood: Cut q16horiz
/q16slopehoriz
over to PlayerHorizon struct.
2020-10-07 17:16:58 +11:00
Mitchell Richters
f39939d114
- gamecontrol: Initial setup of PlayerHorizon
struct and deployment within Duke.
...
* Started with the most complicated game first.
* Struct made up of fixedhoriz class units.
* Append currently outgoing function names with `2` at the end to avoid conflict.
2020-10-07 17:12:48 +11:00
Mitchell Richters
0e3604ac9e
- SW: Remove q16horizbase
and apply q16horizoff
in draw code like Duke & Blood.
...
* Standardisation is needed here for upcoming horizon changes.
2020-10-07 13:33:16 +11:00
Mitchell Richters
082336e5f8
- buildhoriz: Implementation of pitch and BAM conversion code.
...
* Determined maximum horizon able to be handed by engine in Q16.16 format is 280039127.
* Re-did pitch math to work on this known maximum and standardised pitch around -90/90 degrees as it should be.
* Because pitch is now -90/90 and not ~-188/188, m_sensitivity_y probably requires re-scaling.
2020-10-07 13:29:04 +11:00
Mitchell Richters
90e711464a
- clamp(): Remove definition in compat.h and uplift definition in templates.h.
2020-10-07 13:29:00 +11:00
Mitchell Richters
8be8bcc87a
- Duke/SW: Fix InitTracerTurret()
to use player's q16horiz with full precision and replace some manually expressed mulscales with mulscale16()
inline from pragmas.h.
2020-10-07 13:28:58 +11:00
Mitchell Richters
09a05f354c
- Re-standardise horizon around 0 and not 100.
...
* Blood had this right. It makes sense that the horizon be based around as it's easier to work with.
* Removed all associated game math to deduct default horizon of 100 when doing weapon zvel etc, meaning actual horizon can just be used.
* Re-did return to center function to work on the already converted pitch. Return speed should be 1:1 with previous code.
2020-10-07 13:28:45 +11:00
Christoph Oelckers
38ddbfe65f
- activated most of the support code for programmatically created menus again.
...
Blood's regular menu screens mostly work again
2020-10-07 01:31:41 +02:00
Christoph Oelckers
5726b693bd
- added back the menu transition, although it cannot be used yet, and all game specific menu CCMDs.
2020-10-07 01:12:57 +02:00
Christoph Oelckers
0968a9d97e
- renamed the Customizer to 'Delegate' because this works very much like a delegate in Objective-C.
...
- route menu sound calls through the delegate to better deal with differences between games.
2020-10-07 01:00:43 +02:00
Christoph Oelckers
603c3b50ec
- reimplemented Blood's menu items.
2020-10-07 00:50:26 +02:00
Christoph Oelckers
06b00887f5
- added a menu control for Blood's dripping blood.
2020-10-06 23:49:34 +02:00
Christoph Oelckers
1ea6084478
- Exhumed also done.
...
Also using proper assets now.
2020-10-06 22:35:25 +02:00
Christoph Oelckers
17a68bc60a
- SW's caption done, too.
...
In this case the font is squashed to be more narrow because otherwise many texts would not fit anymore.
2020-10-06 22:01:20 +02:00
Christoph Oelckers
5bcb72f7a9
- create names for several of SW's textures.
...
Not complete, but should cover most that is really needed.
2020-10-06 21:35:26 +02:00
Christoph Oelckers
b8941a09ad
- we need this...
2020-10-06 21:11:37 +02:00
Christoph Oelckers
bec1f67178
- implemented the menu caption for Duke et.al.
2020-10-06 20:49:55 +02:00
Christoph Oelckers
d22bdf9dc7
- use an alias for the menu bar texture in Blood.
...
Direct tile access has been disabled for now, hopefully this can be buried deep in the engine for all eternity.
2020-10-06 20:05:51 +02:00
Christoph Oelckers
55e7e34707
- added texture aliases so that tiles can given real names in the texture manager.
...
Use this to turn Duke's and RR's tile enums into real names, leaving out RRTILExx - the few that are needed were renamed.
2020-10-06 19:26:22 +02:00
Mitchell Richters
bbc60e8424
- Duke: Ensure tripbomb's ammo_count decrements with use.
...
* Note: Unsure whether `isWW2GI()` was meant to be inversed but do not believe so. Have removed check for now.
* Fixes #104 .
2020-10-06 16:31:28 +11:00
Mitchell Richters
478f20b845
- SW: Apply fix from c86af08a19
not to just when stopping operation of remote objects, but all objects.
...
* Fixes #105 .
2020-10-06 16:23:54 +11:00
Mitchell Richters
d5bd7ba309
- Exhumed: Fix positioning of air level meter when underwater.
...
* Fixes #103 .
2020-10-06 16:19:01 +11:00
Christoph Oelckers
1e131eda9e
- implemented Blood's menu caption
2020-10-06 00:34:35 +02:00