Steel Titanium
813ccf71e5
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
2ede6dd29f
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
mazmazz
d944156744
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
Monster Iestyn
cad11a112d
fix slipup of mine that would have prevented this thing compiling
2019-03-31 14:11:27 +01:00
Monster Iestyn
5d059da843
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
mazmazz
5c308c5597
Fade out music upon dying or level change: 2.1 frontport
2019-03-15 04:21:17 -04:00
Monster Iestyn
ab4a1dda1e
Saving work made so far improving and optimizing addons menu code, also adding some macros and comments for readability
2019-02-28 21:52:01 +00:00
Monster Iestyn
811c82ba47
Fix goofup with addonsp patch unlock for loop from 2.1.13 merge
2019-02-28 15:48:27 +00:00
Monster Iestyn
974e3aa4f2
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Monster Iestyn
4b8b8f90f4
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
Steel Titanium
34920c2951
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
TehRealSalt
bcdfe2eb14
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
mazmazz
3753e1be28
Fixed Addons Menu icons for search bar
2019-01-08 01:31:44 -05:00
mazmazz
8d930c7f47
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
2019-01-07 23:06:47 -05:00
mazmazz
275070b608
Correct addons menu back color
2019-01-07 21:58:42 -05:00
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
Digiku
e42e1178ed
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
1dd2899521
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -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
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -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
mazmazz
0545c52970
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 06:05:31 -05:00
mazmazz
752fec8270
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 05:57:10 -05:00
mazmazz
da69539718
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 05:31:47 -05:00
