Commit graph

1525 commits

Author SHA1 Message Date
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
a43a762b46 Instead of hacking ticcmd generation, add/modify helper functions acting as intermediaries that add the necessary changes.
* Introducing K_GetKartButtons(player_t), for adding false presses to.
* K_GetForwardMove(player_t) takes kickstarting into account, and is now applied to engine sound generation too.
* BT_REALACCELERATE has been deleted.
2021-02-22 12:21:48 +00:00
toaster
d039b14aa4 Make kickstartaccel a UINT8 instead of an INT32 kartstuff entry. 2021-02-21 18:08:04 +00:00
toaster
08d087c6b5 Acceleration Kickstart, my little hobby project.
It's no secret that holding down a button a lot can fuck with your wrists and fingers. It's too late for me to be damageless, but I can at least create an option to reduce further harm.

This accessibility feature, when enabled (kickstartaccel and kickstartaccel2/3/4 in the console) behaves with the following properties:
* Hold accelerate for 1 second to lock it down.
* Press again to release.
* Short holds/presses do nothing (good for POSITION).
* Continue holding it during the releasing press to re-lock it.
* A small triangular UI element is added next to the speedometer sticker, which displays the current state of the acceleration kickstart for visual feedback. (NO SPLITS SUPPORT YET)

In addition:
* Add PF_ACCELDOWN and PF_BRAKEDOWN, and BT_REALACCELERATE (which ACCELDOWN tracks). Even if this feature never gets merged, BT_REALACCELERATE is required because sneakers and boosters force it on too (extending this is how I implemented it).
* Fix the dehacked playerflag list being out of shape.
* I replaced some existing flags during development of this branch, so their old uses have been whittled away.
2021-02-20 23:10:18 +00:00
X.organic
5e832ece89 Move Dehacked table sanity check to deh_tables.c 2021-02-16 19:46:31 +01:00
James R
44ec94f287 Merge remote-tracking branch 'origin/master' into funny-spikes 2021-02-06 03:00:50 -08:00
James R
caa7fe1b47 Merge branch 'player-new-frames' into 'master'
New player frames: Glancing and death

See merge request KartKrew/Kart!362
2021-02-06 05:57:11 -05:00
James R
f9c6a5e8b5 Drop Funny Spikes when getting stung
DEBTA0-DEBTH0

Instead of dropping rings, drop non collectable spikes!
2021-02-06 02:31:24 -08:00
Sal
053ecf203f Merge branch 'pos-hud-tweaks' into 'master'
Position number uses additive/subtractive

See merge request KartKrew/Kart!361
2021-02-05 17:53:11 -05:00
Sally Coolatta
75dd970adc Beam objects
Place 2 to arbritrarily place the line anywhere. For sprint maps.
2021-02-05 01:58:34 -05:00
Sally Coolatta
e2e342f3f7 Update panim for the new states 2021-02-03 19:29:13 -05:00
Sally Coolatta
480e32d369 Properly add states to the tables...
Mind's been split everywhere tonight
2021-02-03 19:20:27 -05:00
Sal
fe0c9cef65 Merge branch 'lua-karthud-bruh' into 'master'
Lua: Expose p.karthud and p.respawn

See merge request KartKrew/Kart!354
2021-02-03 02:19:27 -05:00
Sally Coolatta
bea2724a86 Glance frames
When someone is about to pass you, you'll take a glance at 'em!
2021-02-03 01:24:00 -05:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
Sally Coolatta
4d108930a9 Update position nums to use additive
Looks far more colorful this way! By default it is additive... but like SMK, there is a map header option for subtractive, intended for maps with white roads.
2021-02-02 19:58:07 -05:00
Sal
60745502f2 Merge branch 'additive-subtractive-hud' into 'master'
Additive and subtractive for the HUD

See merge request KartKrew/Kart!360
2021-02-02 18:23:49 -05:00
Sally Coolatta
ec1bcd73dc Merge branch 'additive-subtractive-hud' into pos-hud-tweaks 2021-02-02 18:23:07 -05:00
Sally Coolatta
237f86749d Merge branch 'master' into finish-line-beam 2021-02-01 23:31:19 -05:00
Sryder
a06e4da65b Additive and subtractive for the HUD 2021-02-01 17:53:27 +00:00
Latapostrophe
aee76fe88d expose karthud to lua. bruh. 2021-01-21 22:18:00 +01:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01:00
GoldenTails
d0b1a48806 Make caret coloring support letters. 2020-12-06 04:28:12 -06:00
GoldenTails
d673604b48 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
James R
0d4fc032c5 Merge branch 'remove-unused-music-types' into 'next'
Remove unused music type enums

See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -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
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
ef0da6ce9c Finished bumper destruction 2020-11-16 02:38:13 -05:00
Sally Coolatta
ae5d5abe24 Chaos Emeralds now sparkle 2020-11-16 00:51:00 -05:00
Sally Coolatta
0dc0ff8e6f More finalized Chaos Emerald visuals 2020-11-15 15:11:13 -05:00
Sally Coolatta
42f411399a Add bumper explosion effect 2020-11-15 12:56:03 -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
James R
66edde2556 Remove unused music type enums 2020-11-14 15:56:40 -08:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Steel Titanium
8804e6063a Remove unused music types 2020-11-08 21:33:12 -05:00
Sally Coolatta
39acb46903 Last 3/4s: Spindash wind 2020-11-08 15:32:30 -05:00
Sally Coolatta
bffc367c36 Second-half spindash dust effect 2020-11-08 14:14:13 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
11872504ae Merge master 2020-11-08 01:26:40 -05:00
Jaime Passos
8599447c70 Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
Steel Titanium
115b509348 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
# Conflicts:
#	src/dehacked.c
2020-11-01 23:22:03 -05:00
James R
cbafb906db Merge branch 'lua_expose-gamestate' into 'next'
Expose gamestate to Lua

See merge request STJr/SRB2!1229
2020-11-01 22:57:52 -05:00
Steel Titanium
ef1ca357de Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
Steel Titanium
00f9e777af Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Sally Coolatta
875493d778 Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
2020-10-30 02:15:49 -04:00