TehRealSalt
|
4e0a8ef9d8
|
Merge branch 'master' into versus-record
|
2019-10-03 10:35:17 -04:00 |
|
TehRealSalt
|
37009ac9b0
|
A few stashed fixes that didn't make it to the branches somehow
|
2019-10-03 10:31:34 -04:00 |
|
TehRealSalt
|
3d5676d4d6
|
atoi
|
2019-10-03 10:16:10 -04:00 |
|
TehRealSalt
|
12829743ae
|
Add easy scrambles to the list now that easy is playable
|
2019-10-03 01:54:52 -04:00 |
|
TehRealSalt
|
a5ea6a9799
|
Merge speed/encore scrambles into the normal cvars as an "auto" option
|
2019-10-03 01:48:16 -04:00 |
|
TehRealSalt
|
c6566ec31a
|
Merge branch 'master' into versus-record
|
2019-10-03 01:32:59 -04:00 |
|
Sal
|
8338d3e71c
|
Merge branch 'fortnite' into 'master'
Battle sudden death
See merge request KartKrew/Kart!166
|
2019-10-03 01:27:09 -04:00 |
|
Sal
|
eb7f662654
|
Merge branch 'genesis-wipe' into 'master'
Genesis-style wipes
See merge request KartKrew/Kart!164
|
2019-10-03 01:10:33 -04:00 |
|
TehRealSalt
|
7f6d825809
|
Remove unused GENESIS_WIPE define
|
2019-10-03 01:10:10 -04:00 |
|
Sal
|
93f9a9e62c
|
Merge branch 'testers' into 'master'
TESTERS macro and compile flag to disable playing by yourself
See merge request KartKrew/Kart!179
|
2019-10-02 17:00:29 -04:00 |
|
James R
|
1b0ba7768c
|
False instead of 0, a little clearer
|
2019-10-02 13:57:14 -07:00 |
|
TehRealSalt
|
7433becd7a
|
Move map loaded failure error from the deleted backwards compat code
|
2019-10-02 12:07:37 -04:00 |
|
TehRealSalt
|
217f61897f
|
K_PlayerForfeit on I_Quit
(I believe these are the only i_systems that matter?)
|
2019-10-02 11:47:56 -04:00 |
|
Sal
|
d5bb5c3a25
|
Merge branch 'ring-tweaks' into 'master'
Ring tweaks
See merge request KartKrew/Kart!180
|
2019-10-02 11:39:31 -04:00 |
|
TehRealSalt
|
7c40a1c07b
|
Make sure it doesn't divide by 0
|
2019-09-28 15:18:01 -04:00 |
|
TehRealSalt
|
8fa5ada23d
|
Allow ring usage during Shrink
|
2019-09-28 15:16:08 -04:00 |
|
TehRealSalt
|
7321a95a65
|
Ring respawn timer is based on lap count (proportional to 3 laps)
|
2019-09-28 15:14:52 -04:00 |
|
Sal
|
1fa417f561
|
Merge branch 'more-transparent-pixel' into 'master'
Fixed some instances that weren't using TRANSPARENTPIXEL
See merge request KartKrew/Kart!178
|
2019-09-28 13:06:23 -04:00 |
|
James R
|
e5b6ebaa4e
|
Disable unused functions in TESTERS build
|
2019-09-27 20:00:46 -07:00 |
|
James R
|
5ceff36ac1
|
Hide Multiplayer hosting options and Offline Mode
|
2019-09-27 19:58:55 -07:00 |
|
James R
|
7a201ea993
|
Hide Unlockables
|
2019-09-27 19:56:41 -07:00 |
|
James R
|
b64dccd498
|
Hide Record Attack in TESTERS build
|
2019-09-27 19:56:18 -07:00 |
|
James R
|
03b3d61fd1
|
Add TESTERS build flag to Makefile
|
2019-09-27 19:21:18 -07:00 |
|
James R
|
246280045c
|
Fix crash in TESTERS build if you try to record demo anyway
|
2019-09-27 19:20:55 -07:00 |
|
James R
|
8cbdc999f4
|
Block playing by yourself in TESTERS build with le funni message
SV_SpawnServer is called in instances other than joining
a server or watching a replay. How convenient, huh?
|
2019-09-27 19:19:04 -07:00 |
|
TehRealSalt
|
9a9a1c1374
|
This shouldn't be merged
|
2019-09-27 15:31:57 -04:00 |
|
TehRealSalt
|
d907158b12
|
Revert this
|
2019-09-27 15:12:55 -04:00 |
|
Sal
|
dca76c3f08
|
Merge branch 'whitespace' into 'master'
Remove trailing whitespace
See merge request KartKrew/Kart!175
|
2019-09-27 14:37:40 -04:00 |
|
TehRealSalt
|
6a1e49a91c
|
Fixed some instances that weren't writing TRANSPARENTPIXEL
|
2019-09-27 14:34:17 -04:00 |
|
Sal
|
38112a5577
|
Merge branch 'no-files-crash' into 'master'
Don't crash if you can't find a pwad or it's already loaded or etc
See merge request KartKrew/Kart!177
|
2019-09-27 12:17:00 -04:00 |
|
TehRealSalt
|
2635d1b810
|
Fix SPB target not being merged
|
2019-09-27 06:46:10 -04:00 |
|
TehRealSalt
|
06d27ae36e
|
Merge branch 'master' into fortnite
|
2019-09-27 06:36:11 -04:00 |
|
TehRealSalt
|
92022be254
|
Don't crash if you can't find a pwad or it's already loaded or etc
|
2019-09-27 06:28:26 -04:00 |
|
Sal
|
ed3ef6601e
|
Merge branch 'abs' into 'master'
Remove unncessary operations
See merge request KartKrew/Kart!176
|
2019-09-27 03:10:59 -04:00 |
|
Sal
|
a313e4c33e
|
Merge branch 'world-tour' into 'master'
Flush random map pool after all but 3 are played
See merge request KartKrew/Kart!170
|
2019-09-27 03:07:04 -04:00 |
|
Sal
|
39115db560
|
Merge branch 'sky-improvements' into 'master'
Sky improvements
See merge request KartKrew/Kart!174
|
2019-09-27 03:06:51 -04:00 |
|
Sal
|
542c4a3306
|
Merge branch 'new-springs' into 'master'
New springs
See merge request KartKrew/Kart!171
|
2019-09-27 03:06:29 -04:00 |
|
James R
|
739d602c84
|
Addition unecessary as ruled out by if condition
|
2019-09-26 16:41:02 -07:00 |
|
James R
|
971eed8d97
|
abs is unnecessary on unsigned types
|
2019-09-26 16:35:41 -07:00 |
|
James R
|
1d59d8305d
|
Remove trailing whitespace
|
2019-09-26 14:39:23 -07:00 |
|
James R
|
7a6a2f248e
|
Remove trailing whitespace
|
2019-09-26 14:32:25 -07:00 |
|
Sal
|
921409224c
|
Merge branch 'model-gradients' into 'master'
Model gradients + model tilt adjustments
See merge request KartKrew/Kart!157
|
2019-09-25 21:53:21 -04:00 |
|
TehRealSalt
|
7b484e9d75
|
Merge branch 'master' into versus-record
|
2019-09-24 02:47:00 -04:00 |
|
TehRealSalt
|
cb355e7e8f
|
Merge branch 'master' into new-springs
|
2019-09-24 02:46:35 -04:00 |
|
Sal
|
002eecea47
|
Merge branch 'maps-pk3' into 'master'
Use maps.pk3
See merge request KartKrew/Kart!173
|
2019-09-24 02:46:10 -04:00 |
|
TehRealSalt
|
60b0df0330
|
Did not mean to commit this eons ago... :V
|
2019-09-24 02:01:27 -04:00 |
|
TehRealSalt
|
7cfcb2f61a
|
Don't select items in the air or with the Ambush flag for overtime
|
2019-09-24 02:00:27 -04:00 |
|
TehRealSalt
|
3321b68fbb
|
Merge branch 'master' into versus-record
|
2019-09-23 21:29:08 -04:00 |
|
TehRealSalt
|
f75392109d
|
Forgotten include
|
2019-09-23 21:28:45 -04:00 |
|
Sal
|
3eef46b06c
|
Merge branch 'showhud' into 'master'
Treat ping and FPS counters like HUD
See merge request KartKrew/Kart!168
|
2019-09-23 20:32:27 -04:00 |
|