Sally Coolatta
fa5fccffc5
Implement lives system
...
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
249fff87ad
Merge branch 'new-cars-movie' into colorize-tweak
2020-05-12 22:46:46 -04:00
Sally Coolatta
63797b35f7
Merge branch 'pet-robo' into grand-pricks
2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Sally Coolatta
4ae81ff236
Add menu for selecting cup & other options
2020-05-09 20:03:14 -04:00
Sally Coolatta
b4f8d708a4
Merge branch 'master' into new-menus
2020-05-09 17:04:10 -04:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Latapostrophe
3f43107eea
Add Opposite option for followercolor
2020-05-09 12:12:29 +02:00
Zachary McAlpin
81f651a81e
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
Latapostrophe
766f7f035f
Let followers change colour separatly from players
2020-05-04 18:08:41 +02:00
Latapostrophe
59452ae026
Merge branch 'v2-master' into followme-internal
2020-05-04 12:52:47 +02:00
Sally Coolatta
ecb01ef83b
Merge branch 'master' into pet-robo
2020-05-03 21:33:30 -04:00
Sally Coolatta
b9ff3403a9
Add missing netxcmdnames from james stuff
2020-05-03 21:32:12 -04:00
Sally Coolatta
cb12d1ebf8
Merge branch 'master' into pet-robo
2020-05-03 21:30:40 -04:00
Sal
5a56271392
Merge branch 'more-debug' into 'master'
...
More item debug
See merge request KartKrew/Kart!185
2020-05-03 21:16:58 -04:00
Latapostrophe
63485c3dbe
Merge branch 'v2-master' into followme-internal
2020-05-03 22:37:26 +02:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
James R
6613b19220
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
Louis-Antoine
ccf4bbe194
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
ThatAwesomeGuy173
3e37730545
Use "addons" instead of "add-ons" for consistency
2020-04-22 01:24:59 -06:00
James R
8490919257
Bye death fades
2020-04-19 22:06:22 -07:00
wolfs
4a264ffba9
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium
4bfb583e91
Remove some of these superfluous ifdef checks.
...
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Steel Titanium
5e0eca9fe9
Support for http downloads
2020-04-07 18:22:29 -04:00
James R
2e963a46f5
For fun, let the bots vote
2020-04-02 14:16:29 -07:00
James R
9bdebe51bf
Fix a dumb warning
2020-03-31 16:54:20 -07:00
James R
6975de85b4
Call the substitution macro FOREACH
2020-03-31 16:45:36 -07:00
James R
1243d0940a
Merge remote-tracking branch 'origin/master' into more-debug
2020-03-31 16:44:04 -07:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02:00
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
Sally Cochenour
ff621d3e46
Skins, rudimentary ticcmd building for bots
2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Steel Titanium
e9110b660c
Better directory structure
...
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)
# Conflicts:
# src/m_menu.c
# src/m_menu.h
# src/m_misc.h
2020-03-24 15:36:44 -07:00
Jaime Passos
d64dc5b2a8
Local Color Table for GIF movie mode
...
(cherry picked from commit 5a330803ec5bea2ca7b6b30bf7972b11753b571d)
2020-03-23 17:47:08 -07:00
toasterbabe
7a14bbba82
Disable colour profile influence on screenshots and gifs if you want.
...
(cherry picked from commit 8b46ee76ff
2020-03-23 16:35:38 -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
2020-03-23 16:34:34 -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
2020-03-23 16:27:14 -07:00
James R
572bf314e5
Merge remote-tracking branch 'origin/master' into resume
2020-03-22 19:01:05 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde
Merge branch 'master' into new-items
2020-03-22 20:50:28 -04:00
