thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6772 commits 1 branch 12 tags 205 MiB
Commit graph

6772 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master' 
Air spark experiment

See merge request KartKrew/Kart!217
 2020-03-22 14:26:33 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master' 
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
 2020-03-22 14:23:21 -04:00
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
Sal
36f9bb4381 Merge branch 'waypoints' into 'master' 
Waypoints Exist

See merge request KartKrew/Kart!215
 2020-03-22 01:05:02 -04:00
Sally Cochenour
c75e3a025c Braces to avoid compile error 
(Not sure why I never got this until now?)
 2020-03-21 23:11:19 -04:00
Sally Cochenour
521c4662bf void out heap after done asserting, to fix an unused variable compile error I get 2020-03-21 23:09:05 -04:00
Sryder
4975cce3ac Just use an I_Assert on SpawnSPBRingTrail 2020-03-22 00:47:17 +00:00
Sryder
9dae62c2c6 Fix me being hyperdumb with copypaste error 2020-03-22 00:47:02 +00:00
Sryder
2be2277f4b Fix the merge confluct I SOMEHOW missed 2020-03-22 00:44:28 +00:00
Sryder
203aa0602e Use P_FindSpecialLineFromTag for MT_WAYPOINT, now that it works where we need it 
This matches how MT_SPINMACEPOINT was changed
 2020-03-22 00:25:48 +00:00
Sryder
5cd1296505 Include license/copyright headers on new files. 2020-03-22 00:16:32 +00:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2020-03-21 23:27:55 +00:00
Sryder
e874af3e43 Very minor fix to WRONG WAY 
More opaque waypoint markers for kartdebugwaypoints
Looks like whitespace got murdered in k_kart.c again
 2020-03-21 23:24:04 +00:00
Sal
bda7dc9ddf Merge branch 'colors-yet-again' into 'master' 
Another round of small color tweaks

See merge request KartKrew/Kart!208
 2020-03-21 19:03:27 -04:00
Sal
9d35d0f5d8 Merge branch 'driftspark-update' into 'master' 
Yellow drift sparks & new drift spark effects

See merge request KartKrew/Kart!211
 2020-03-21 19:02:48 -04:00
Sal
cbfce16dcc Merge branch 'done-with-spikeballs' into 'master' 
Slow down backwards spikeballs (again)

See merge request KartKrew/Kart!212
 2020-03-21 18:49:02 -04:00
Sal
0cb5e5893c Merge branch 'objscalefixes' into 'master' 
Minor map object scale fixes

See merge request KartKrew/Kart!206
 2020-03-21 18:48:36 -04:00
Sally Cochenour
668f80a8ea Properly scale... 2020-03-21 18:47:44 -04:00
Sal
21f28b27f5 Merge branch 'oops' into 'master' 
Fix compile error with camtilt

See merge request KartKrew/Kart!214
 2020-03-21 18:45:19 -04:00
Sryder
738d1f1940 Make kartdebugwaypoints far more clear to use for the debugging lines 
Fix memory reallocation issue that I don't think could be seen currently
 2020-03-21 21:32:40 +00:00
James R
1dd95f5e3b gr_shearing doesn't exist in master! 2020-03-21 12:53:33 -07:00
Sryder
3d3b8b6bc6 Replace many cases of if else if statements with I_Asserts. 
This is done specifically on static functions that aren't used as callbacks.
This is done to keep the code cleaner, and the I_Asserts get compiled out in Release builds.
Logic is left in the "public" functions to avoid crashes as a result of the modules.
 2020-03-21 19:00:00 +00:00
Sal
68bec970a3 Merge branch 'viewpoint-text-toggle' into 'master' 
Option to hide/show viewpoint text

See merge request KartKrew/Kart!209
 2020-03-20 22:07:30 -04:00
Sal
27a7f020d3 Merge branch 'camtilt' into 'master' 
Add camera pitching when driving on downhill slopes

See merge request KartKrew/Kart!210
 2020-03-20 21:41:17 -04:00
Sal
aeb6567b53 Merge branch 'sal-waypoints' into 'waypoints' 
Sal edits to waypoints

See merge request KartKrew/Kart!202
 2020-03-20 20:43:27 -04:00
Sally Cochenour
263ef8f92c Use divide/multiply for waypoint closest calculations 2020-03-20 19:33:41 -04:00
Latapostrophe
b959c01349 Fix antigrav respawn, no respawn flag, and remove spinout when respawning 2020-03-20 11:04:26 +01:00
Sally Cochenour
46049dba40 Fix drift spark weirdness in mobjscale maps 2020-03-19 22:52:11 -04:00
Sally Cochenour
7924606fe4 Opaque splash 2020-03-19 22:37:13 -04:00
Sally Cochenour
40e01fb71c Increase thrust of destroyed items 
Roughly matches what it was supposed to look like before gravity was increased
 2020-03-19 22:35:07 -04:00
Sally Cochenour
5ef433f9c7 Remove bumper when you respawn in Battle again 
(This stuff really should be its own function...)
 2020-03-17 19:54:32 -04:00
Sally Cochenour
4b2b116481 Try using GameSpeedScalar for thrown item scaling between game speeds, rather than arbritrary values 
In Hard mode: Spikeballs will be thrown slightly less with this code change, while Bananas will be thrown slightly farther.

That said, the difference is so small that it's very likely not noticable, it just makes the code nicer looking & more consistent :P
 2020-03-17 18:55:15 -04:00
Sally Cochenour
9e3a37cdc7 Make Ballhog thrown more like normal missiles 
(For some reason, it used banana toss throwing speeds before)
 2020-03-17 18:49:16 -04:00
Sally Cochenour
fccc4d2937 Slow down backwards spikeballs (again) 2020-03-16 04:24:32 -04:00
Sally Cochenour
860c1fe23b Opaque rain 2020-03-16 04:17:45 -04:00
Sally Cochenour
a322f4efd4 Merge branch 'driftspark-update' into air-spark-experiment 2020-03-16 00:54:48 -04:00
Sally Cochenour
48e69f7c91 Air sparks, start on drift boosts 2020-03-16 00:53:33 -04:00
Sally Cochenour
4026344ad3 Minor yellow-spark related cleanup 
Sound plays when you go to yellow sparks & back, and Red transition uses Tangerine instead of Raspberry
 2020-03-15 23:21:46 -04:00
Sally Cochenour
4174d9a23e Add a function for retrieving drift spark color, to simplify a lot of code & add transition colors to everything 2020-03-15 23:02:43 -04:00
Sally Cochenour
3093a3078e Scale dust properly 2020-03-15 22:05:43 -04:00
Sally Cochenour
c4dd88bbae Turn sparkles that warn you when you're about to hit a new drift spark! 2020-03-15 21:59:22 -04:00
Sally Cochenour
7d1c132ca2 Fix drift spark camera when you go to yellow sparks 2020-03-15 21:21:07 -04:00
Sally Cochenour
01885c5166 Revert "Actually, might've reintroduced more lawnmower problems; let's play it safe" 
This reverts commit 219d4aebf2.
 2020-03-15 20:52:41 -04:00
Sally Cochenour
1e10ec00d7 Merge branch 'waypoints' into sal-waypoints 2020-03-15 20:23:24 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Sryder
c268313f0a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/Makefile
#	src/k_kart.c
#	src/p_map.c
#	src/p_setup.c
#	src/p_spec.c
 2020-03-16 00:13:42 +00:00
Sally Cochenour
084901a8b1 Add warnings for old map setups 
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
 2020-03-15 19:21:06 -04:00
Sally Cochenour
e3d50862c0 Using sparks in air experiment 2020-03-15 18:38:25 -04:00
Sally Cochenour
69cc03a434 This line broke yellow sparks entirely 2020-03-14 19:01:34 -04:00
Sally Cochenour
f235a50d2e Blue sparks trail longer 2020-03-14 18:46:22 -04:00