stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
6750 commits 172 branches 41 tags 280 MiB
Commit graph

475 commits

Author SHA1 Message Date
Steel Titanium
81dec89aeb Merge branch 'next' into public-musicplus-libopenmpt 2019-06-03 15:36:50 -04:00
Steel Titanium
91767a7740 Merge branch 'master' into public-musicplus-libopenmpt 2019-05-20 21:33:10 -04:00
mazmazz
89ab777c40 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Monster Iestyn
2fb569857a 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
7346684bd8 Fade out music upon dying or level change: 2.1 frontport 2019-03-15 04:21:17 -04:00
Monster Iestyn
ae244d2af3 Fix goofup with addonsp patch unlock for loop from 2.1.13 merge 2019-02-28 15:48:27 +00:00
Monster Iestyn
7a0d8b408e 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
e6cb47e2f2 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
bce093fd06 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
0d1c501664 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
a050ed956a Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz
e02fd489a7 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz
e403d1bacc Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz
411b1b4f54 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
875aee60a0 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz
e9150b6645 Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
Digiku
c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
6166fad045 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -05:00
mazmazz
075f28b7c8 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
d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz
60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
Digiku
8d56c2f486 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
7a64e3d1a8 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
b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
mazmazz
8f596376a9 Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
Latapostrophe
1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Latapostrophe
c7060aa5ad 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
619dd9d08a 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
a72d79da54 Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
mazmazz
b57204fc12 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz
6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
mazmazz
7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
Latapostrophe
45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
mazmazz
b958f00f17 Better rewrite for addons draw adjustment 2018-12-17 10:59:27 -05:00
mazmazz
6dbe930997 Use labs for long value 2018-12-16 19:47:02 -05:00
mazmazz
2d2bd59099 Remove FIXUPO0 GCC pragma 2018-12-16 19:39:16 -05:00
mazmazz
296b678d7e Wstrict-overflow adjustment 2018-12-16 19:38:46 -05:00
TehRealSalt
c69cfefb6d 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
6d94568f4b Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
mazmazz
c3ff0b6d16 Uncomment Secrets menu toggle when exiting Addons 2018-12-16 15:52:01 -05:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
mazmazz
f0967520ed 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
37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz
b32f50648d Merge branch 'addons_menu' into 'master' 
Addons menu

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

See merge request STJr/SRB2!355
 2018-12-04 11:51:55 -05:00
Digiku
42cb597731 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
168647275c One small change 2018-12-03 13:32:24 -05:00
mazmazz
7ce092128b Revert "Make pause key bring up the menu if it's a joy button" 
This reverts commit 9de31cf2e7.
 2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz
9de31cf2e7 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
0bb113130b Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
3134d72c12 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz
78dde93f3e Remap menu actions to better joy keys 2018-12-03 13:10:12 -05:00
mazmazz
31f23fda8d Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece Add gc_screenshot and gc_recordgif from Kart 2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
mazmazz
d8e70c32e0 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
Monster Iestyn
978a28004d 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
13b0e9c3c5 make menu respond to joystick axis events without joyscale having to be 0 2018-12-02 21:18:28 +00:00
Monster Iestyn
33c1ac33f5 Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Steel Titanium
0f11116e7b Fix up controller menu support 2018-12-01 20:13:14 -05:00
Wolfy
b8ce51bff2 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
Monster Iestyn
cd57be640c Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
Digiku
fd891aa21d "Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk 2018-11-26 15:48:08 -05:00
mazmazz
ab47e83939 Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-25 19:03:22 -05:00
mazmazz
e2ca92a3db Remove unused menu hierarchy methods 2018-11-25 15:09:25 -05:00
mazmazz
eb95289ea4 Rearranged menu presentation methods 
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
 2018-11-25 15:08:12 -05:00
Steel Titanium
981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
edd98842d5 Added chasefreecam to menu 2018-11-22 17:32:03 -05:00
mazmazz
f926774ee1 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7 Adjust menu for movement and camera controls 2018-11-22 14:13:28 -05:00
mazmazz
dd1ecb04cf Change camera control names to Look 2018-11-22 11:28:32 -05:00
mazmazz
8a9c10e633 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-21 10:58:07 -05:00
mazmazz
74da082c75 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
mazmazz
5870d145b2 Draw connection screen correctly; make scroll speed inherit global setting 2018-11-20 18:13:18 -05:00
mazmazz
094ec7ce3c Performance improvements 
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
 2018-11-20 17:28:26 -05:00
Monster Iestyn
418943acdc change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
mazmazz
53b956f540 Mirror a wipe if it's forced off and the counter-wipe is specified 2018-11-18 04:39:34 -05:00
mazmazz
765e4b3134 Compiler fixes 2018-11-18 04:32:38 -05:00
mazmazz
3d1e5fa7e8 Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings) 2018-11-18 03:32:19 -05:00
mazmazz
3acabdab93 Fix MN_SPECIAL check for menu meta state 2018-11-18 03:19:07 -05:00
mazmazz
3c2d30072e Allow backgrounds for player select 2018-11-18 02:49:08 -05:00
mazmazz
758647fab2 More title screen features; menu meta state implementation (active and previous menu types) 
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
 2018-11-17 19:08:30 -05:00
mazmazz
d2bbddbed4 Implemented features 
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
 2018-11-17 01:21:21 -05:00
mazmazz
1e6369e8de Implement scrolling menu backgrounds 2018-11-16 18:26:26 -05:00
mazmazz
c4cddf8741 Menumeta iterators 2018-11-16 14:16:41 -05:00
mazmazz
15c0bab0c9 Title screen menu SOC 2018-11-16 12:07:47 -05:00
mazmazz
75dab7850f Refactor MM_ menu types to MN_ 2018-11-16 09:56:22 -05:00
mazmazz
b69756f5e5 Use bitshifting for menu IDs and hierarchy instead 2018-11-16 09:22:27 -05:00
mazmazz
9dab65fce0 Add MM menutype flags to menu defs 2018-11-15 19:41:27 -05:00
mazmazz
f2bfed7892 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-11-13 14:34:40 -05:00
mazmazz
3d7b185ea0 Check specifically for gcs_fps when starting tutorial 2018-11-13 01:57:51 -05:00
mazmazz
96da056f81 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
a0926b5314 First time tutorial prompt fixes 2018-11-12 19:10:41 -05:00
mazmazz
5200f55e40 Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-12 18:08:48 -05:00