Commit graph

5830 commits

Author SHA1 Message Date
wolfy852
97493fdfd7 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/hw_main.h
#	src/m_menu.c
#	src/r_main.c
#	src/v_video.c
2019-05-06 14:26:09 -05:00
wolfy852
535b386f8e Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs
58c5979a1e Merge branch 'newping' into 'master'
New ping command

See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
wolfs
62140e1481 Merge branch 'autofocus' into 'master'
Grab mouse focus whenever the window is focused

See merge request KartKrew/Kart-Public!120
2019-05-06 15:12:48 -04:00
wolfs
b2a8e555bb Merge branch 'ms-connectionfail-bandaid' into 'master'
Don't try operating on a closed socket

See merge request KartKrew/Kart-Public!133
2019-05-06 15:12:39 -04:00
Sal
0ee1cd6cbf Merge branch 'alias-argh' into 'master'
Allow argument substitution in aliases

See merge request KartKrew/Kart-Public!124
2019-05-02 10:05:30 -04:00
Sal
a12fb1c81d Merge branch 'save-d_clisrv-cvars' into 'master'
Register showjoinaddress after the config loads and match some other cvars to its behavior

See merge request KartKrew/Kart-Public!135
2019-05-02 10:04:45 -04:00
Sal
0cd815cb44 Merge branch 'deadzone-bullshit' into 'v1'
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5

See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
Sal
071b335d57 Merge branch 'anim-fix' into 'v1'
Fix wheel animations

See merge request KartKrew/Kart!144
2019-05-02 09:23:22 -04:00
Sal
3d71a0aac7 Merge branch 'next-colors' into 'v1'
Final colors for v1.1

See merge request KartKrew/Kart!143
2019-05-02 09:23:10 -04:00
TehRealSalt
e772a750a8 Missed a spot 2019-05-02 02:52:22 -04:00
TehRealSalt
fd148ec207 Dumbass typo 2019-05-02 02:13:44 -04:00
Sal
738c5be37b Merge branch 'expose-numlaps' into 'next'
Expose cv_numlaps.value as global variable

See merge request KartKrew/Kart-Public!134
2019-05-02 01:41:41 -04:00
Sal
f615ffab30 Merge branch 'port-param' into 'next'
New -port command line parameter

See merge request KartKrew/Kart-Public!137
2019-05-02 01:40:31 -04:00
Sal
b0b6390998 Merge branch 'when_i_say_encore_you_say_how_high' into 'master'
When I say Encore you say how high

See merge request KartKrew/Kart-Public!136
2019-05-02 01:40:12 -04:00
Sal
dee068a7ff Merge branch 'respawn-flash' into 'v1'
Flashing tics on respawn

See merge request KartKrew/Kart!138
2019-05-02 01:39:31 -04:00
TehRealSalt
f99a5a6a8b Fix wheel animations 2019-05-02 00:44:04 -04:00
Sal
b410b216a4 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
TehRealSalt
39bea80b9e Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5 2019-05-01 23:30:53 -04:00
James R
103e67bbaa Fix differing signedness compare 2019-04-30 13:03:13 -07:00
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
Steel Titanium
0128643043 Prettyify code. 2019-04-28 22:02:25 -04:00
Steel Titanium
72e402c1aa Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into port-param 2019-04-28 21:56:33 -04:00
Steel Titanium
1c21a4ed6f New -port param 2019-04-28 21:53:36 -04:00
toaster
031ffbf304 Completely untested -encore parameter for the map command; inverts cvar value. 2019-04-28 19:26:11 +01:00
Steel Titanium
5461f860f9 Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into expose-numlaps 2019-04-27 22:34:53 -04:00
James R
848bb10c36 Move some cvars out of D_ClientServerInit and save them 2019-04-27 17:30:39 -07:00
TehRealSalt
9629fb3216 Modify the first shade of Byzantium 2019-04-26 22:32:31 -04:00
wolfy852
db2935d45a Fix boost -> drift -> release sliptides not showing the effect when turning right 2019-04-26 19:26:22 -05:00
wolfy852
50b00d37e0 Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 18:27:41 -05: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
TehRealSalt
183e75ff53 Final v1 colors
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
2019-04-26 18:18:53 -04:00
James R
fc8ebe83fc Force of habit 2019-04-26 13:08:35 -07:00
James R
aa4ce2b2d1 Check error on select 2019-04-26 13:06:26 -07:00
James R
4d739fe7a5 Unfuck MS connecting and error reporting
Reconnect if the socket is closed.
Report the proper error from SO_ERROR and report an error from getsockopt.
2019-04-26 12:59:21 -07:00
wolfy852
096bed6a4d Merge remote-tracking branch 'remotes/pub/next' into v1 2019-04-26 05:53:26 -05: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
Latapostrophe
2350405ad3 Terminology changes 2019-04-23 23:49:46 +02:00
Sal
35c954ecc4 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
5619e63e39 Fix SPB being way too fast in current sections where the player has no control 2019-04-22 20:40:17 -05:00
wolfy852
85a15847e5 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
e62fcc8148 Fix mangled comment 2019-04-22 19:27:42 -04:00
Latapostrophe
0f43546ada Add option to turn off the PLAY default md2 2019-04-22 11:29:44 +02:00
Steel Titanium
445bb0b99b New IntermissionThinker hook 2019-04-22 00:29:47 -04:00