thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5623 commits 1 branch 12 tags 205 MiB
Commit graph

372 commits

Author SHA1 Message Date
mazmazz
95c2f34278 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
a436313987 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz
1dd464b17d Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
a25c755a6b Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
Digiku
15c9404f91 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku
77182e9278 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
Latapostrophe
47a329807a Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
mazmazz
98b59f3f9d Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
Latapostrophe
1b8be7f1a4 Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Latapostrophe
9e49a9ca5d Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Latapostrophe
09dbb6d631 Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
Monster Iestyn
d46e2ef51b Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
mazmazz
8207f126f4 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz
2cd851652a Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
mazmazz
6a87980afd Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
mazmazz
a51130a8b9 Better rewrite for addons draw adjustment 2018-12-17 10:59:27 -05:00
mazmazz
e88db2e2b1 Use labs for long value 2018-12-16 19:47:02 -05:00
mazmazz
8bd3f38dd2 Remove FIXUPO0 GCC pragma 2018-12-16 19:39:16 -05:00
mazmazz
492d1ba749 Wstrict-overflow adjustment 2018-12-16 19:38:46 -05:00
TehRealSalt
edd3259cf4 2.2 backport of jump/spin axes 
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
 2018-12-16 17:45:49 -05:00
mazmazz
77456cd593 Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
mazmazz
2237aa1d07 Uncomment Secrets menu toggle when exiting Addons 2018-12-16 15:52:01 -05:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
mazmazz
6bdff246a8 Compile fixes; enable PK3 support in addons menu 
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
 2018-12-15 21:44:39 -05:00
mazmazz
b6d1cca4da Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz
ede6b183b1 Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
Monster Iestyn
b32f5830ed Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn
dfdba01591 Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
2c557d668a Merge branch 'joystick-juggling' into 'master' 
Joystick juggling

See merge request STJr/SRB2!355
 2018-12-04 11:51:55 -05:00
Digiku
d6dd0c8fef Merge branch 'joystick-juggling-two' into 'next' 
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
 2018-12-03 22:59:19 -05:00
Steel Titanium
c31c80d216 One small change 2018-12-03 13:32:24 -05:00
mazmazz
861b35dea4 Revert "Make pause key bring up the menu if it's a joy button" 
This reverts commit 44bec22793.
 2018-12-03 13:11:48 -05:00
mazmazz
4ad7cdc684 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz
44bec22793 Make pause key bring up the menu if it's a joy button 
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
 2018-12-03 13:10:27 -05:00
mazmazz
24ff6bc279 Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
3a72325355 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz
a6ce80e9f4 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz
00fb8d4853 Remap menu actions to better joy keys 2018-12-03 13:10:12 -05:00
mazmazz
8aa4575bc1 Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
mazmazz
ec361ee6ac Add gc_screenshot and gc_recordgif from Kart 2018-12-03 11:31:48 -05:00
mazmazz
0e52208384 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
mazmazz
8fd8fca5f7 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
Monster Iestyn
bc35851417 add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus 2018-12-02 21:52:30 +00:00
Monster Iestyn
6cdcd8ea0f make menu respond to joystick axis events without joyscale having to be 0 2018-12-02 21:18:28 +00:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Steel Titanium
058dedb2ab Fix up controller menu support 2018-12-01 20:13:14 -05:00
Wolfy
cabe9871e3 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00