Commit graph

17080 commits

Author SHA1 Message Date
Sal
db46507b81 Merge branch 'respawnstuff' into 'master'
Respawning, FAULTing and spectators

Closes #108

See merge request KartKrew/Kart!392
2021-02-18 18:15:27 -05:00
Sal
5d431dbb2c Merge branch 'firstpersonhitlag' into 'master'
First-person view hitlag

See merge request KartKrew/Kart!393
2021-02-18 18:10:47 -05:00
Sal
3ea8e23337 Merge branch 'ring-burst-reverse-gravity' into 'master'
Fix caltrop dropping in reverse gravity as well as not disappearing under some slope conditions

See merge request KartKrew/Kart!388
2021-02-18 18:07:47 -05:00
toaster
34ebcdf696 Hitlag is now displayed in first-person view. 2021-02-18 13:23:44 +00:00
toaster
5310acc84e * As predicted, remove FAULTing from simply becoming a spectator at the start of the race - only apply it if you attempt to rejoin!
* Mark FAULTing players as in pain, preventing you from using your rings in mid-air (which is especially egregrious when re-entering the race from being a spectator uses the item button).
2021-02-18 11:11:50 +00:00
toaster
2ec943a214 Several changes to respawning and race start.
* Becoming a spectator is now instant, and leaves no bumpable corpse behind.
* Players will now FAULT if they:
    * change from a spectator into a player after the initial camera turnaround but before the end of POSITION.
    * touch an instant kill FOF or get crushed during POSITION.
    * become a spectator during POSITION. (I might change this later, seems overkill)
* If you respawn during POSITION, the jingle will not restart from the beginning.
* Change the FAULT animation to match spinout/currents.
* Clean up some of the spawning code to not place spectators on the ground.
2021-02-17 21:48:09 +00:00
Sal
1858811fbc Merge branch 'opengl-encore-screeninvert' into 'master'
Invert the screen for encore circle transition in OpenGL

See merge request KartKrew/Kart!390
2021-02-16 20:04:26 -05:00
Sryder
0d43c3e3ad Invert the screen for encore circle transition in OpenGL 2021-02-16 18:26:45 +00:00
James R
56dc373f76 n 2021-02-16 10:17:00 -08:00
James R
3ac803be76 Merge branch 'mirrorfixes' into 'master'
Mirror fixes

See merge request KartKrew/Kart!385
2021-02-16 11:33:13 -05:00
James R
465bc55219 Merge branch 'caltropcalstop' into 'master'
Caltrop calstop (resolves #114)

Closes #114

See merge request KartKrew/Kart!381
2021-02-16 11:31:51 -05:00
toaster
4052e01f4a Introduce a sequence of macros to reduce the reliance of Colormap-related code (especially but not limited to Encore mode) on magic numbers. 2021-02-16 14:34:00 +00:00
James R
49bbdd537b Move the debt spike fuse initialization from P_ZMovement to P_MobjThinker
slopes + upward momentum = no upward momentum haha
2021-02-16 04:43:20 -08:00
James R
81d162d19c Add some helper functions for objects in reverse gravity 2021-02-16 04:42:27 -08:00
James R
0cf41dade0 Improve P_SpawnMobjFromMobj by factoring the scale from P_SpawnMobj in
This will copy the parent object's scale to the child, but scale it by the
child's original scale relative to the map scale. Also uses the child's actual
height, instead of the mobjinfo version. Might be useful if either the scale
or height was changed in P_SpawnMobj. Say, from a Lua hook.
2021-02-16 03:55:37 -08:00
James R
b77a67c085 Fix caltrop burst in reverse gravity; condense function
I'm not sure how the rings were working though.
2021-02-16 03:54:09 -08:00
toaster
f40836dcec Fix skies not being Encore-remapped (only affected software :regret:) 2021-02-15 21:55:40 +00:00
toaster
a597d9b463 Fixed a too-small memory allocation for Encore remaps, removing all memory-related crashes in Software. 2021-02-15 16:37:37 +00:00
toaster
8a4542a5ef Reintroduce the mirroring aspect of Encore in OpenGL. I'm not familiar enough with the renderer to recreate the rest of the changes at current, but this is the most significant regression. 2021-02-15 12:26:22 +00:00
toaster
a210049839 Attempt to calculate postimg during chasecam hitlag - otherwise encore mode will temporarily flip back and it'll be confusing. 2021-02-15 11:43:45 +00:00
Sal
e11f4ed167 Merge branch 'purplepussyfooting' into 'master'
Resolves #87 after literally 7 months

Closes #87

See merge request KartKrew/Kart!382
2021-02-14 21:18:28 -05:00
Sal
ea2223abe6 Merge branch 'once-in-battle' into 'master'
Don't disable linedef executors other than 308 outside of Race

See merge request KartKrew/Kart!380
2021-02-14 21:13:51 -05:00
Sal
8cb676b0a1 Merge branch 'bigger-signpost' into 'master'
Beeg Large Signpost

See merge request KartKrew/Kart!383
2021-02-14 21:13:10 -05:00
toaster
f290a6c44d Resolves #87 after literally 7 months 2021-02-14 23:07:26 +00:00
toaster
b66965185a Caltrop calstop (resolves #114).
If a ring isn't lost from the counter, don't drop a caltrop.

This is done by changing the function signature of P_GivePlayerRings to return the number of rings it has successfully given (or taken away) (which can differ from the rings provided to it). This change has been done for Lua as well.

Super Ring absorbtion now uses this system too, so you only need to change one location to modify the maximum and minimum number of rings a player can have (as far as I am aware).
2021-02-14 21:48:55 +00:00
James R
d6ea8549d2 Scale end sign 1.5x 2021-02-13 21:38:22 -08:00
James R
a9a1779e19 Only disable 308 outside of Race 2021-02-13 20:10:12 -08:00
Sal
4993d2ce39 Merge branch 'tracking-fix' into 'master'
Replace the tracking function with Nev3r's version

See merge request KartKrew/Kart!372
2021-02-13 20:55:50 -05:00
Sally Coolatta
c5fa63c0fa Invert the value of cv_fov
After a little more testing, it was reversed for specifically the cvar.
2021-02-13 10:56:40 -05:00
Sally Coolatta
192d0b6410 I_Assert for result/point != NULL 2021-02-13 10:37:25 -05:00
Sal
7f944ce467 Merge branch 'waypoints-disable' into 'master'
Linedef executor 499: Enable/Disable Waypoints in Tagged Sector

See merge request KartKrew/Kart!357
2021-02-13 08:41:32 -05:00
Sal
2dfe9cc9eb Merge branch 'doubly-scaled-floating-rings' into 'master'
Fix rings not floating high enough in mobjscaled maps

See merge request KartKrew/Kart!378
2021-02-13 08:41:16 -05:00
Sal
4da5ed8999 Merge branch 'invertfix' into 'master'
Fixed the Encore mode invert wipe.

See merge request KartKrew/Kart!379
2021-02-13 08:40:15 -05:00
toaster
b91a9928c6 Fixed the Encore mode invert wipe.
Explanation: NearestColor takes UINT8 inputs, but is being provided a number in the range of 1 to 256(!!) - which means very dark channels were looping back around to 0.

This error might exist in public branches too, because I don't think Encore's wipes would have been changed internally without us knowing.
2021-02-13 12:04:57 +00:00
Sally Coolatta
ecb4111bed Merge branch 'master' into tracking-fix 2021-02-12 20:28:57 -05:00
Sally Coolatta
1849f70359 Merge branch 'master' into waypoints-disable 2021-02-12 20:28:16 -05:00
Sally Coolatta
4718c1993a Shortcut function for getting angle difference, so that I don't need (INT32) in front of all of the angle_t's :V 2021-02-12 20:11:09 -05:00
Sally Coolatta
9ba3e07417 Don't allocate result 2021-02-12 19:34:43 -05:00
Sal
c594d5063f Merge branch 'sub-add-shadow' into 'master'
Subtractive shadows

See merge request KartKrew/Kart!369
2021-02-12 19:25:13 -05:00
Sal
86ed506773 Merge branch 'ogl-subtractive-lighting' into 'master'
OpenGL shader updated to act like the new lighting

See merge request KartKrew/Kart!375
2021-02-12 19:24:59 -05:00
James R
f7fd39402a Float flag for rings and horizontal springs no longer scales twice in mobjscaled maps 2021-02-12 16:20:18 -08:00
Sal
f6130b5403 Merge branch 'bot-updates' into 'master'
Bot updates

See merge request KartKrew/Kart!371
2021-02-12 14:19:53 -05:00
Sal
4b556ef114 Merge branch 'air-failsafe' into 'master'
Air failsafe boost

See merge request KartKrew/Kart!367
2021-02-12 13:57:55 -05:00
Sal
f467c051d5 Merge branch 'spindash-in-flashing' into 'master'
Allow spindash while flashing, but you lose rings while doing so.

See merge request KartKrew/Kart!368
2021-02-12 13:57:46 -05:00
Sryder
ca531738ab Fix for missing part of lighting calculation compared to software. 2021-02-12 18:41:16 +00:00
Sal
8fdbee6537 Merge branch 'speedy-crash' into 'master'
Speedometer crash fix

See merge request KartKrew/Kart!373
2021-02-12 13:40:25 -05:00
Sal
3f0aa0c18b Merge branch 'double-scaled-ring-burst' into 'master'
Fix ring spill with object scale

Closes #113

See merge request KartKrew/Kart!377
2021-02-12 13:36:00 -05:00
James R
223e411fa5 parenthesism 2021-02-12 09:23:18 -08:00
Sal
03eb86eb2b Merge branch 'level-title-disables-hud' into 'master'
Don't disable the hud if there isn't a level title

See merge request KartKrew/Kart!376
2021-02-12 11:32:22 -05:00
Sally Coolatta
8734db6cfd Remove prints 2021-02-12 11:21:35 -05:00