James R
9d485e17e7
Merge branch 'karma-gate' into 'master'
...
Elimination timer for karma bombs during overtime
See merge request KartKrew/Kart!459
2021-11-28 00:20:52 +00:00
Sally Coolatta
cb5ea8b335
Add basic damage hitlag effects
...
- Invert high contrast greyscale colorization effect for damage hitlag
- Jitter is now also exclusive to damage-related hitlag
- Since jitter is now just tied to a flag, removed the old trick momentum hack
2021-11-27 13:38:45 -05:00
James R
059058476e
Elimination timer for karma bombs during overtime
...
Every hit on another player while you are alive awards you
five seconds of karma bomb time during overtime. When this
timer is empty, you will DIE.
2021-11-26 21:55:32 -08:00
James R
1958f3f61c
Sync respawn.airtimer
...
Oops!
2021-11-26 12:55:23 -08:00
lachablock
debfb41423
Merge remote-tracking branch 'origin/master' into capsules
2021-06-14 12:20:53 +10:00
lachablock
b78db12b0d
Add item capsules
2021-06-14 12:20:39 +10:00
Latapostrophe
d10f4ea128
More suitable data types + lua push
2021-04-23 00:14:36 +02:00
Latapostrophe
29e11a0378
changes to the delay, boost when doing upwards trick
2021-04-22 15:11:15 +02:00
lachablock
aeaf6c94f5
Give purple & rainbow driftboosts a 30% speed boost
2021-04-21 14:40:13 +10:00
lachablock
5e327e09c6
Merge master (resolve structgunch conflicts)
2021-04-20 16:09:59 +10:00
Sally Coolatta
e006cfa287
Make spindashing bots work better
...
They will no longer do it on a whim after getting bumped out of position of hitting walls, instead checks if they're trying to accelerate and they physically can't.
2021-04-11 04:54:27 -04:00
Sally Coolatta
359cf86efb
Merge branch 'master' into big-large-map-markers
2021-04-09 19:49:33 -04:00
Sally Coolatta
72dc88c043
Attempt at a non-controller dependent compromise for turn easing
...
Values are subject to tweaking.
(AngleDelta stuff is a leftover of the previous attempt, but I think the code's useful so I kept it in this commit anyway)
2021-04-05 23:52:56 -04:00
James R
c4072ff050
Don't read renderflags twice
2021-04-01 19:08:51 -07:00
Sally Coolatta
fed0e0f9e5
Issue #133 thing
2021-04-01 21:09:30 -04:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
toaster
d039b14aa4
Make kickstartaccel a UINT8 instead of an INT32 kartstuff entry.
2021-02-21 18:08:04 +00:00
Sal
e6a0ff727c
Merge branch 'typing-notifier' into 'master'
...
Typing Indicator
See merge request KartKrew/Kart!389
2021-02-18 18:34:00 -05:00
James R
46e4d5c8ee
Add typing_timer and typing_duration to netsave
2021-02-16 11:03:19 -08:00
Sally Coolatta
c4850c1990
Merge branch 'master' into oop-starttime
2021-02-12 20:28:45 -05:00
Sally Coolatta
b91ceddcbf
Sync numbulbs
...
I don't think this has ever caused issues (numbulbs is just for HUD), but the drawn bulbs on start up might as well be synched if the starttime needs to be resynched too.
2021-02-12 20:27:14 -05:00
Sally Coolatta
93c5942ceb
Air failsafe boost
...
While in the air: release accelerate while at nearly-still speeds, and you'll preform a minisucle air drift boost. This mechanic is meant to fix the long-standing issue where you can get stuck in 0 speed in the air and not be able to do anything.
2021-02-07 14:07:27 -05:00
Sally Coolatta
4535a642d6
Merge branch 'master' into spindash-rebalance
2021-02-07 02:35:55 -05:00
Sally Coolatta
ee68862d1f
Drift protection
...
Before, doing a spindash input while turning, but not being at a low enough speed, would make you start drifting.
Now, it checks if you're trying to E-Brake first before interpreting it as a drift input.
If you were already drifting, then attempting accel+brake will still be brake-drift, so that technique is unaffected.
2021-02-06 00:08:28 -05:00
Sally Coolatta
b7e578b82b
Keep look backwards direction in a variable, so it can smoothly rotate
2021-02-04 00:26:59 -05:00
Sally Coolatta
d627da7510
Fix lap executors not happening, and also edit it so they act like Each Time rather than Once
...
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
2021-02-01 14:34:48 -05:00
Jaime Ita Passos
9fc1379668
Revert "Move a few mobj spawn defaults to its own function"
...
This reverts commit 3f36a51f5b
2021-01-17 23:17:46 +01:00
Latapostrophe
3cd4c87df5
Weaker tumble, some effects + tumble on spring panel fail
2021-01-09 21:58:35 +01:00
SteelT
29b5f38347
Merge branch 'master' into big-large-map-markers
...
# Conflicts:
# src/d_netcmd.c
2021-01-09 15:52:34 -05:00
Sally Coolatta
cfda66103d
Merge branch 'master' into just-tumble
2021-01-06 23:02:51 -05:00
Latapostrophe
fe4d9ce889
New trick panel shit (but only the gameplay part)
2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
Jaime Ita Passos
3f36a51f5b
Move a few mobj spawn defaults to its own function
2020-12-06 17:46:35 -03:00
Jaime Ita Passos
8cbaf9a5eb
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 17:29:20 -03:00
James R
85bf84193d
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
d0ca3b78c1
Merge branch 'master' into battle-rethink
2020-11-18 17:49:06 -05:00
Sal
b2eb64ac09
Merge branch 'roll-and-tilt' into 'master'
...
Roll & pitch replace modeltilt
See merge request KartKrew/Kart!326
2020-11-17 20:03:48 -05:00
Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
Sally Coolatta
827a1b5fca
Refactor stealing & destroying bumpers
...
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
2020-11-15 06:25:38 -05:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
GoldenTails
d2e8823d50
Add skincolor vars to the NetSave
2020-11-08 20:43:16 -06:00
Sally Coolatta
0e28470228
Merge master
2020-11-08 02:34:24 -05:00
Sally Coolatta
470e399abe
Merge master, add support for hitlag jitter in OpenGL
2020-11-08 01:56:27 -05:00
James R
37c345c7eb
Map lump names can be anything, map number is dynamically allocated
2020-10-30 20:10:31 -07:00
Sally Coolatta
9dd43d4e4e
Remove modeltilt, use roll & pitch instead
...
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Jaime Passos
cdc4a6d86e
Implement blend modes
2020-10-27 00:03:41 -03:00
