James R
ed2d40b98e
Unused parameter :)
2020-07-31 22:17:22 -07:00
Sal
21dfe49bf8
Merge branch 'antigrav-respawn' into 'master'
...
Antigravity fixes, round 2
See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Latapostrophe
b62ef5a51d
Kill flipcam again but nothing else associated with it.
2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c
Revert "Push flipcam down the nearest staircase"
...
This reverts commit 06d70c1f8e
2020-07-26 20:27:22 +02:00
Sally Coolatta
ba6d5e95ba
Add Sneaker x2 to pad out the item table a bit better
...
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
2020-07-24 19:11:52 -04:00
Latapostrophe
06d70c1f8e
Push flipcam down the nearest staircase
2020-07-24 16:17:07 +02:00
James R
f1648fbf5c
Followers compiler warnings
2020-07-09 16:39:47 -07:00
Latapostrophe
cab9c2a139
Merge branch 'v2-master' into followme-internal
2020-06-07 23:56:32 +02:00
Sally Coolatta
136bb1d252
Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player
2020-06-06 19:45:13 -04:00
Latapostrophe
f33e4d62a0
Sort conflicts, fix misordered follower bubble states in dehacked
2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Latapostrophe
5412358fcf
Fixed setting follower on title screen + mixed declarations
2020-06-03 01:23:32 +02:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04:00
Sally Coolatta
d062a35a3a
Huge respawn overhaul
...
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -04:00
Sally Coolatta
4916516e2e
Prevent duplicate skins, fix bots not being able to be disabled, change default to "off"
2020-05-24 17:12:58 -04:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sally Coolatta
e51bceb567
Items respawn in GP
2020-05-13 03:04:33 -04:00
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
Latapostrophe
3f43107eea
Add Opposite option for followercolor
2020-05-09 12:12:29 +02: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
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
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
