thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-04 18:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6810 commits 2 branches 14 tags 206 MiB
Commit graph

6810 commits

This branch
This branch
All branches
Author SHA1 Message Date
toasterbabe
7a14bbba82 Disable colour profile influence on screenshots and gifs if you want. 
(cherry picked from commit 8b46ee76ff)

# Conflicts:
#	src/m_menu.c
 2020-03-23 16:35:38 -07:00
toasterbabe
56ac088443 Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise. 
(cherry picked from commit 9d46ba281f)
 2020-03-23 16:34:59 -07:00
toasterbabe
cdf8c54f2d Correcting gamma to match base SRB2. 
(cherry picked from commit 29d5af61c1)
 2020-03-23 16:34:59 -07:00
toasterbabe
fcc80b12ad Colour Cube Calibration Menu! (called "Advanced Color Settings" because No Fun Allowed...) 
https://cdn.discordapp.com/attachments/237798387070664724/304343382073933824/aa.png

Also, a "Reset all" button for the Monitor toggle menu, a ton of new cvars to match up with the colour cube calibration, and a bunch of variable renames related to colour cube operations.

(cherry picked from commit c3840ba01d)

# Conflicts:
#	src/m_menu.c
#	src/v_video.c
 2020-03-23 16:34:34 -07:00
toasterbabe
b1202b617c greem 
(cherry picked from commit 9b13caccae)
 2020-03-23 16:28:35 -07:00
toasterbabe
a82e5ee916 Figured out what was up. I didn't quite understand my original array! 
(cherry picked from commit c2edd6224d)
 2020-03-23 16:28:35 -07:00
toasterbabe
f5ecb1b9c9 Introducing the Colour Cube! https://cdn.discordapp.com/attachments/293238104096112641/304015171385294850/aa.png 
Basically in preperation of supporting colourblindness modes I implemented the following link when loading palettes.
http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html

This basically means I can do whatever the hell I want to the colour profile of incoming paletties, and nobody can stop me. Muahahahaha etc.

Also, I added a saturation feature to show off its full potential, converted gamma from a table to a factor of the calculation, tweaked some menus and made the default value of cvars show up on sliders. Because that's how I roll.

(cherry picked from commit 83e16da83b)

# Conflicts:
#	src/m_menu.c
 2020-03-23 16:27:14 -07:00
toasterbabe
ae3c4a0227 Removal of cv_allcaps for console stuff. 
(cherry picked from commit 95d89078f5)
 2020-03-23 15:05:00 -07:00
Sally Cochenour
464e3273a9 Missing include 2020-03-22 21:16:55 -04:00
Sally Cochenour
a638054332 Bad whoopsie 2020-03-22 20:37:20 -04:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master' 
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
 2020-03-22 20:31:08 -04:00
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master' 
abs on unsigned does nothing

See merge request KartKrew/Kart!220
 2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master' 
Break the Capsules

See merge request KartKrew/Kart!172
 2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
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
James R
d46c6dc384 Kill trailing whitespace 2020-03-21 17:37:33 -07:00
James R
12a229285b Kill CRLF 2020-03-21 17:37:16 -07: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