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

500 commits

Author SHA1 Message Date
Steel Titanium
2075b525a9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx 2019-07-22 22:22:12 -04:00
Steel Titanium
c35afa2c96 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium
af959ee309 Some fixup 2019-07-22 22:01:05 -04:00
Monster Iestyn
5ef4dda9b9 Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. 
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
 2019-07-15 20:25:57 +01:00
Monster Iestyn
d44a8ab78e Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn
a1e6f5bdb3 remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn
f6842a80b4 Fixes for menus: 
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
 2019-07-14 21:58:48 +01:00
Monster Iestyn
4da108748b Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks. 
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
 2019-07-08 21:17:40 +01:00
mazmazz
5b0f7d2850 Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
Monster Iestyn
e2859aab5d Merge branch 'titlemap-fix' into 'master' 
Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228
 2019-06-28 18:15:46 -04:00
Monster Iestyn
e63e36f5e4 Merge branch 'levelselect-tweaks' into 'master' 
Some small tweaks to level select

See merge request STJr/SRB2Internal!230
 2019-06-25 16:50:44 -04:00
toaster
6cf376a9b5 Support backspace for resetting various menu values, just like Kart. 2019-06-22 16:50:46 +01:00
toaster
6371de806b Improve rain/weather. 
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
 2019-06-22 16:50:30 +01:00
Nev3r
0e162f8f61 Add Sryder's orbital camera thing as an option. 2019-06-20 13:33:31 +02:00
Steel Titanium
58bb05be00 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04:00
toaster
6c6ed6a349 Fix Titlemap with mazmazz's fancy menu stuff 
Handled by changing some defaults.

Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please
 2019-06-10 15:43:47 -04:00
Steel Titanium
742c43cf1c Some small tweaks 2019-06-03 17:34:51 -04:00
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
27147a9e0b fix slipup of mine that would have prevented this thing compiling 2019-03-31 14:11:27 +01: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
8920693159 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
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
mazmazz
fa63ddda86 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
70d6845d6c 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
b2c02838c4 Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys() 2018-12-14 05:31:47 -05:00
mazmazz
e548f6f139 Don't override an already-active controller 
* Menu improvements to tell the user that they can't set a controller if it's already active
 2018-12-14 05:02:41 -05:00
mazmazz
3b6de810e1 Lots of changes to better support hotplugging and unstable device indexes 
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
 2018-12-14 03:58:07 -05:00
mazmazz
6694b7d679 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) 
(with log messages)
 2018-12-06 10:54:58 -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