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
52fa738ef8
Replace even more ints with INT32
2020-03-21 13:18:17 -07:00
James R
8a28d3cfe5
Replace some instances of int with fixed width types
2020-03-21 13:12:50 -07:00
James R
29ebf7ee60
Attempt to fix Sal's compiler warnings
2020-03-21 13:07:22 -07:00
James R
1dd95f5e3b
gr_shearing doesn't exist in master!
2020-03-21 12:53:33 -07:00
James R
b1db9077a4
splitscreen -> r_splitscreen
2020-03-21 12:48:51 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -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
James R
cca9b5e2f4
Merge branch 'parties-only' into parties
2020-03-18 19:42:58 -07:00
James R
26794eef46
Draw mini ping counter in splitscreen
2020-03-18 19:42:13 -07: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
Sally Cochenour
ed9919d47c
Remove drift when hitting 0 speed
...
Prevents silliness like this: https://cdn.discordapp.com/attachments/275750804227489794/688515983471804455/kart0027.gif
2020-03-14 18:38:01 -04:00
Sally Cochenour
219d4aebf2
Actually, might've reintroduced more lawnmower problems; let's play it safe
2020-03-14 18:31:53 -04:00
Sally Cochenour
9dfbd918a4
Don't forcefully remove drift when bumping walls
2020-03-14 18:14:21 -04:00
Sally Cochenour
f37b1268b4
Slight adjustments to yellow spark nuances
...
Instead of setting you to yellow sparks when before you could keep red sparks, it keeps your previous "state". When going below 20 speed when you have sparks, you no longer stop charging sparks, but you have to break above 20 speed once you have yellow sparks to get normal sparks again.
2020-03-14 18:12:36 -04:00
Sally Cochenour
c6f3ac651e
Switch red & blue sparks, add yellow sparks, add big spark sprites
2020-03-14 01:43:54 -04:00
lachwright
49f9d830ed
Attempt to make splitscreen's camtilt better
2020-03-12 01:23:09 +08:00
lachwright
e2c95a0060
Visibility improvement
2020-03-10 19:30:02 +08:00
lachwright
f0c98697dc
Add camera pitching when driving on downhill slopes
2020-03-10 05:18:05 +08:00
