Commit graph

5757 commits

Author SHA1 Message Date
TehRealSalt
19224b93e8 Merge branch 'v1' 2019-05-02 09:59:45 -04:00
Sal
243265ffc0 Merge branch 'respawn-flash' into 'v1'
Flashing tics on respawn

See merge request KartKrew/Kart!138
2019-05-02 01:39:31 -04:00
Sal
18d9f18a41 Merge branch 'default-md2' into 'v1'
Add option to turn off the PLAY default md2

See merge request KartKrew/Kart!140
2019-05-02 00:03:18 -04:00
wolfy852
b2e12461d9 Fix boost -> drift -> release sliptides not showing the effect when turning right 2019-04-26 19:26:22 -05:00
wolfy852
fdb5502f09 Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 18:27:41 -05:00
wolfs
a7e6589ce7 Merge branch 'intermission-think' into 'next'
New intermission Hook for Y_Ticker

See merge request KartKrew/Kart-Public!131
2019-04-26 19:25:18 -04:00
wolfy852
e2a6b9fad4 Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 05:53:26 -05:00
wolfs
ce5b99cfe4 Merge branch 'forceskin-by-name' into 'next'
Allow names to be used with forceskin

See merge request KartKrew/Kart-Public!102
2019-04-26 06:42:09 -04:00
wolfs
cc954e3ffa Merge branch 'add-value-command' into 'next'
Add a command to increment cvars

See merge request KartKrew/Kart-Public!128
2019-04-26 06:41:52 -04:00
wolfy852
2bdfbcdd23 Merge remote-tracking branch 'remotes/pub/master' into next 2019-04-26 05:42:27 -05:00
wolfs
674810478d Merge branch 'room-list-first' into 'master'
Show room list instead of server list if you haven't selected a room yet

See merge request KartKrew/Kart-Public!127
2019-04-26 06:39:31 -04:00
wolfs
8df9861b3f Merge branch 'no-audio-option' into 'master'
`-noaudio` option to cover `-nomusic` and `-nosound`

See merge request KartKrew/Kart-Public!129
2019-04-26 06:37:02 -04:00
wolfs
f624d2acda Merge branch 'save-showjoinaddress' into 'master'
Save showjoinaddress to config

See merge request KartKrew/Kart-Public!132
2019-04-25 23:17:07 -04:00
Steel Titanium
cae59aad9a Save showjoinaddress to config 2019-04-25 23:13:09 -04:00
Latapostrophe
dab5469b4a Terminology changes 2019-04-23 23:49:46 +02:00
Sal
97caa08e4d Merge branch 'level-specials-setup-stuff-backport' into 'master'
Level specials setup stuff backport

See merge request KartKrew/Kart!133
2019-04-22 23:10:51 -04:00
Sal
5839fa4cee Merge branch 'spb-stuff' into 'v1'
Fix SPB being way too fast in current sections where the player has no control

See merge request KartKrew/Kart!141
2019-04-22 22:00:06 -04:00
Latapostrophe
313b971e17 Fix SPB being way too fast in current sections where the player has no control 2019-04-22 20:40:17 -05:00
wolfy852
9cac5f5277 Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible 2019-04-22 20:18:15 -05:00
Steel Titanium
80d1181cff Fix mangled comment 2019-04-22 19:27:42 -04:00
Sal
e7660d04ea Merge branch 'tangibility-crisis' into 'master'
Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible

See merge request KartKrew/Kart!139
2019-04-22 12:14:15 -04:00
Latapostrophe
60428fbc29 Add option to turn off the PLAY default md2 2019-04-22 11:29:44 +02:00
wolfy852
91d0d756a3 Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible 2019-04-22 04:24:07 -05:00
Steel Titanium
3e838c1e83 New IntermissionThinker hook 2019-04-22 00:29:47 -04:00
wolfy852
870f29f861 Flashing tics on respawn 2019-04-21 07:52:01 -05:00
Sal
41fc8f2621 Merge branch 'under_the_weather' into 'master'
Under the weather

See merge request KartKrew/Kart-Public!125
2019-04-19 16:40:25 -04:00
Sal
e3dad8789a Merge branch 'd_clisrv-shitsprinkles' into 'master'
Support splitscreen PLAYERINFO and don't expose clients' IP addresses

See merge request KartKrew/Kart-Public!126
2019-04-19 16:40:12 -04:00
James R
6a5bb9f23f Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-04-18 23:50:29 -07:00
James R
c2a14da4b5 Add a command to increment cvars 2019-04-18 23:42:28 -07:00
James R
7dae0ad875 Show rooms list in server browser initially
If you haven't selected a room yet, you're
shown the room list instead of server list.
2019-04-18 22:41:50 -07:00
James R
7fd1f6c528 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-04-14 21:14:01 -07:00
toaster
5a6722a5e9 Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain. 2019-04-14 14:41:39 +01:00
Steel Titanium
8e09ba7dbf Merge branch 'next' into forceskin-by-name 2019-04-11 21:01:14 -04:00
Sal
b110591a63 Merge branch 'clear-all-controls' into 'master'
Clear P3 and P4 controls too when clearing all controls

See merge request KartKrew/Kart-Public!117
2019-04-11 12:20:48 -04:00
Sal
bdd77db6c9 Merge branch 'dedicated-end-vote-fix' into 'master'
Fix dedicated servers not ending the vote

See merge request KartKrew/Kart-Public!121
2019-04-11 12:20:08 -04:00
Sal
ac2bce0a3e Merge branch 'fix-function-typo' into 'next'
Lua: fix K_PlayPowerGloatSound mistype

See merge request KartKrew/Kart-Public!122
2019-04-11 12:06:33 -04:00
Sal
a1e4748a68 Merge branch 'patch-1' into 'next'
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()

See merge request KartKrew/Kart-Public!119
2019-04-11 12:05:59 -04:00
Lachlan Wright
bc2f78020b Update k_kart.c 2019-04-10 03:16:46 -04:00
Steel Titanium
13bfbac72b Lua: fix K_PlayPowerGloatSound mistype 2019-04-06 21:59:58 -04:00
James R
e9869a55e3 Let dedicated servers end vote time too! 2019-04-04 16:13:31 -07:00
Monster Iestyn
3b3a37daad level header's "forcecharacter" parameter doesn't take skin numbers anymore, so this isn't needed! 2019-04-03 19:51:36 +01:00
Monster Iestyn
453f673219 Spinning/swinging maces/chains can now use P_FindSpecialLineFromTag!
# Conflicts:
#	src/p_mobj.c
2019-04-03 19:51:08 +01:00
Monster Iestyn
11b5b624bb Whoops forgot this 2019-04-03 19:46:21 +01:00
Monster Iestyn
07e8ef6627 Split off part of P_SpawnSpecials into a new function called P_InitSpecials
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values

# Conflicts:
#	src/p_spec.c
2019-04-03 19:46:10 +01:00
Steel Titanium
e47854880a Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-27 19:18:51 -04:00
Alam Arias
dc11f9b371 Merge remote-tracking branch 'upstream/master' 2019-03-27 19:13:41 -04:00
Alam Ed Arias
8d51de4993 CircleCI: use libpng-dev 2019-03-27 18:51:20 -04:00
Alam Ed Arias
af1682d758 CircleCI: Debian Jessie is dead, long live Debian Stretch 2019-03-27 18:23:03 -04:00
Lachlan Wright
40f351debb Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite() 2019-03-27 03:23:32 -04:00
Alam Arias
783f910d65 TravisCI: remove xcode7.3 on DPL mac build 2019-03-26 21:20:17 -04:00