wolfs
|
a0b1fce139
|
Merge branch 'md3-vanilla-kart' into 'next'
MD2/MD3 support rewritten + optimizations [GCC port]
See merge request KartKrew/Kart-Public!19
|
2019-04-30 15:22:30 -04:00 |
|
wolfs
|
38770282d4
|
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 |
|
wolfs
|
235426153f
|
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
|
8d0b185d96
|
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
|
690a495d9b
|
Merge remote-tracking branch 'remotes/pub/master' into next
|
2019-04-26 05:42:27 -05:00 |
|
wolfs
|
f2ec722b12
|
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
|
4dff8b4a11
|
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
|
e6ba65bac9
|
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
|
21e8a2c537
|
Save showjoinaddress to config
|
2019-04-25 23:13:09 -04:00 |
|
Steel Titanium
|
e62fcc8148
|
Fix mangled comment
|
2019-04-22 19:27:42 -04:00 |
|
Steel Titanium
|
445bb0b99b
|
New IntermissionThinker hook
|
2019-04-22 00:29:47 -04:00 |
|
Sal
|
e76d33f9ba
|
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 |
|
James R
|
387a701db5
|
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
|
2019-04-18 23:50:29 -07:00 |
|
James R
|
3db1244849
|
Add a command to increment cvars
|
2019-04-18 23:42:28 -07:00 |
|
James R
|
4b05199b9f
|
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
|
d7e964bd54
|
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
|
2019-04-14 21:14:01 -07:00 |
|
toaster
|
972e6e9cf5
|
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 |
|
wolfy852
|
052104999f
|
Generic model terminology
|
2019-04-12 00:35:35 -05:00 |
|
Steel Titanium
|
588d3a8c6e
|
Merge branch 'next' into forceskin-by-name
|
2019-04-11 21:01:14 -04:00 |
|
Sal
|
db18492836
|
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
|
b128f44986
|
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
|
ecdfb1ddcc
|
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
|
4f1a329ef2
|
Update k_kart.c
|
2019-04-10 03:16:46 -04:00 |
|
Steel Titanium
|
f8fec8e625
|
Lua: fix K_PlayPowerGloatSound mistype
|
2019-04-06 21:59:58 -04:00 |
|
James R
|
ab17769f89
|
Let dedicated servers end vote time too!
|
2019-04-04 16:13:31 -07:00 |
|
Steel Titanium
|
ae74b5cb9d
|
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
|
2019-03-27 19:18:51 -04:00 |
|
Lachlan Wright
|
a4722aded8
|
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
|
2019-03-27 03:23:32 -04:00 |
|
Alam Arias
|
7d98adf6dc
|
Merge commit 'upstream/master~1'
|
2019-03-26 09:48:13 -04:00 |
|
Monster Iestyn
|
8e78369f83
|
Merge branch 'dedicated-server-credits-fix' into 'master'
Dedicated server credits fix
See merge request STJr/SRB2!476
|
2019-03-26 09:44:21 -04:00 |
|
Monster Iestyn
|
8c1c0875a2
|
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
|
2019-03-25 21:35:04 +00:00 |
|
Monster Iestyn
|
147221cf6e
|
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
|
2019-03-25 18:54:47 +00:00 |
|
fickleheart
|
ca37b467e0
|
Clear P3 and P4 controls too when clearing all controls
|
2019-03-24 17:31:04 -05:00 |
|
Alam Arias
|
32fd6dc834
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-23 15:08:45 -04:00 |
|
Alam Arias
|
544f806f92
|
Merge commit 'upstream/master~1'
|
2019-03-22 10:18:10 -04:00 |
|
wolfy852
|
7911fa24d0
|
Fix Visual Studio compiling
|
2019-03-21 00:32:27 -05:00 |
|
James R
|
ed0f8fd967
|
Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
|
2019-03-20 20:37:00 -07:00 |
|
James R
|
f139ffd1dc
|
Let localhost connections
|
2019-03-20 20:37:00 -07:00 |
|
wolfy852
|
6b743d383b
|
Merge branch 'next' into md3-vanilla-kart
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
|
2019-03-20 19:50:20 -05:00 |
|
Monster Iestyn
|
ecb6322a52
|
Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
|
2019-03-20 17:33:04 -04:00 |
|
fickleheart
|
af17038cfb
|
LAT
|
2019-03-17 21:44:11 -05:00 |
|
fickleheart
|
ca68042d95
|
Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep
|
2019-03-17 16:37:01 -05:00 |
|
fickleheart
|
f909a055d8
|
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
|
2019-03-17 16:36:52 -05:00 |
|
James R
|
70f40d54cb
|
Resume sounds on unpausing after a window re-focus
|
2019-03-16 15:50:16 -07:00 |
|
James R
|
5057c37dfb
|
Move change viewpoint control checking so it doesn't take precedence
Notably over chat.
|
2019-03-16 15:42:18 -07:00 |
|
fickleheart
|
4b71ac7b6b
|
Merge branch 'netarchive-fix' into version-prep
|
2019-03-16 15:00:02 -05:00 |
|
fickleheart
|
b9ae148af6
|
Merge branch 'colormap-caching-workaround' into version-prep
|
2019-03-16 14:59:55 -05:00 |
|
fickleheart
|
50c0ed0f07
|
Fix bad merge in map data archiving code
|
2019-03-16 14:56:56 -05:00 |
|
fickleheart
|
875506e6cc
|
Don't free this cached colormap!
|
2019-03-16 12:22:11 -05:00 |
|
fickleheart
|
f18d2a684b
|
Merge branch 'lua-ticcmd-latency' into version-prep
|
2019-03-16 02:41:19 -05:00 |
|
fickleheart
|
d727492c87
|
Merge branch 'colormap-caching-workaround' into version-prep
|
2019-03-16 02:41:14 -05:00 |
|