stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-10 02:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
15082 commits 181 branches 42 tags 186 MiB
Commit graph

1101 commits

Author SHA1 Message Date
sphere
860767aa65 Merge branch 'increasemaxunlockables' into 'next' 
Increase maximum unlockables

Closes #770

See merge request STJr/SRB2!1988
 2023-07-14 22:47:37 +00:00
spherallic
009e1ef157 Merge branch 'next' into fullscreen-toggle 2023-07-14 15:30:14 +02:00
spherallic
70b69552f9 Add toggle for invcolor background, plus: 
- Renamed Amethyst to Crystal
- Moved some of the new colors
- Tweaked a couple of invshades
 2023-06-20 20:06:42 +02:00
spherallic
853c9958d7 Remove unfinished sprite rotation 2023-06-20 20:06:42 +02:00
spherallic
c9b6693c76 Allow pausing & rotation of player sprites in player setup 2023-06-20 20:06:02 +02:00
spherallic
766c346df5 Add grid view for skincolors 2023-06-20 20:03:13 +02:00
spherallic
4cd85b5228 Support PgUp/PgDn for color select, similar to sound test & addons menu 2023-06-20 20:03:13 +02:00
Lach
647e6aac12 Simplify the way skincolors' invshades are used 2023-06-20 20:03:13 +02:00
spherallic
99f0933986 Change how SR_MainMenu is initialized. 2023-06-13 01:53:50 +02:00
spherallic
1cc870485d Increase unlockable limits: 
- MAXUNLOCKABLES from 32 to 80
- MAXEXTRAEMBLEMS from 16 to 48
- COMPAT_GAMEDATA_ID is used to account for the old values to prevent
losing records.
- Also fixes linedef actions 319/320.
 2023-06-13 01:53:50 +02:00
sphere
c2c27bf356 Merge branch 'ipv6' into 'next' 
Fix IPv6

See merge request STJr/SRB2!1612
 2023-06-12 23:43:46 +00:00
sphere
0dea372336 Merge branch 'the_elder_skyscroll' into 'next' 
Rewrite F_SkyScroll to fix overflows

Closes #1008

See merge request STJr/SRB2!1985
 2023-06-12 23:36:37 +00:00
Gustaf Alhäll
7c75f61be7
Fix buffer overflow when displaying a scrolling background 2023-06-03 13:05:33 +02:00
Sally Coolatta
3b15d9b4fe Make the level select behave more identically to G_LoadGame 
Noticed some oddities with D_MapChange here with very rarely not changing player position when the map is loaded.
 2023-06-02 16:06:49 -04:00
Sally Coolatta
897b81b840 Don't load game from pause level select without save slot 2023-06-02 16:06:48 -04:00
Sally Coolatta
9b6a47783d Show the level select option used to start the level in the pause menu. 
Previously, level select only appeared in the SP pause menu if you load a complete save file.

Now, entering the game through an Extras menu level select shows that level select. Simply makes it more convenient, as you don't need to exit to the main menu again whenever you want to get to another level from an unlocked level select.

Tested all ways you can start a new map from the menu that I can think of (New Save File, Complete Save File, Mid-game Save File, several different Level Select types, custom Warp, Record Attack, Marathon, Tutorial), and could not smuggle wrong level selects into any.
 2023-06-02 16:06:47 -04:00
Sally Coolatta
903a47966d Swap hints & level select on multiplayer pause menu 
This makes it consistent with SP's pause menu order. (Although admittedly I prefer how the other order looks.)
 2023-06-02 16:06:47 -04:00
Sally Coolatta
122ddade61 Draw level stats on pause & emblem hints menus in multiplayer 2023-06-02 16:06:46 -04:00
Sally Coolatta
49fa46d80e Online emblems 
Currently, emblems share with everyone. Will add an option to toggle this.
 2023-06-02 16:06:43 -04:00
SteelT
1d9bcad797 Merge branch 'next' into ipv6 2023-06-02 14:09:13 -04:00
Zwip-Zwap Zapony
ba014b84a7 Rewrite M_DrawStaticBox 2023-05-28 22:56:18 +02:00
Zwip-Zwap Zapony
b2313aa4bd Rewrite F_SkyScroll to fix overflows 2023-05-25 14:55:21 +02:00
MascaraSnake
e4933b3e94 Merge branch 'allow-modified-saving' into 'next' 
[SUGOI] Allow saving in modified games.

See merge request STJr/SRB2!1749
 2023-05-24 05:04:26 +00:00
Gustaf Alhäll
6896080f4f
fixup! Implement support for native keyboard layout 2023-05-23 17:40:13 +02:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next' 
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
 2023-04-12 17:50:01 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
James R
07e4497320 Add COM_LUA to a bunch of commands 
These commands be run from Lua:

- add
- addfile
- addfolder
- archivetest
- ban
- banip
- causecfail
- cecho
- cechoduration
- cechoflags
- changeteam
- changeteam2
- charability
- charspeed
- cheats
- clearbans
- clearscores
- connect
- countmobjs
- csay
- demote
- devmode
- displayplayer
- downloads
- drop
- droprate
- dumplua
- echo
- exitgame
- exitlevel
- gametype
- getallemeralds
- getplayernum
- god
- gravflip
- help
- hurtme
- isgamemodified
- jumptoaxis
- kick
- listwad
- login
- manual
- map
- mapmd5
- masterserver_update
- memdump
- memfree
- mod_details
- motd
- noclip
- nodes
- notarget
- numnodes
- numthinkers
- objectplace
- password
- pause
- ping
- playintro
- promote
- quit
- reloadbans
- resendgamestate
- resetcamera
- resetemeralds
- restartaudio
- retry
- rteleport
- runsoc
- savecheckpoint
- say
- sayteam
- sayto
- scale
- screenshot
- serverchangeteam
- setcontinues
- setlives
- setrings
- showbanlist
- showmap
- showscores
- showtime
- skynum
- startmovie
- stopdemo
- stopmovie
- suicide
- teleport
- toggle
- togglemodified
- toggletwod
- tunes
- version
- vid_info
- vid_modelist
- vid_nummodes
- weather
 2023-03-15 17:22:56 -07:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
spherallic
94396a9f9d Merge branch 'next' into fullscreen-toggle 2023-03-02 12:14:42 +01:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next" 
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
 2023-01-26 19:26:28 -06:00
Eidolon
5827a19b89 Revert "Merge branch 'controller-fixes' into 'next'" 
This reverts commit 71736f358f, reversing
changes made to 4e3f78784a.
 2023-01-26 19:24:52 -06:00
Eidolon
bbd4cff75c Revert "Merge branch 'gamepadtweaks' into 'next'" 
This reverts commit 96bfd8cea7, reversing
changes made to 24f9ec4ec4.
 2023-01-26 19:24:21 -06:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging" 
This reverts merge request !1920
 2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
LJ Sonic
dfdbdee0a8 Move netcode console variables to appropriate files 2023-01-07 15:57:04 +01:00
spherallic
ca8842fa45 Merge branch 'next' into gamepadtweaks 2023-01-04 09:01:55 +01:00
Eidolon
c270cca55f Always swallow pad axis events when menu is active 
This prevents axis events from trickling out of the menu and taking
effect in G_Responder when they aren't hitting the digital deadzone
needed to be mapped into internal menu key events.
 2023-01-03 14:39:15 -06:00
LJ Sonic
4660d3cab6 Move client connection handling to a new file 2022-12-31 21:37:35 +01:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
sphere
e401f77524 Merge branch 'extend-ip-textbox' into 'next' 
Extend the length of the Connect via IP textbox.

See merge request STJr/SRB2!1410
 2022-12-31 09:06:28 +00:00
LJ Sonic
05d232c029 Delete netcode 
Just kidding, I just deleted NONET
 2022-12-30 15:07:57 +01:00
spherallic
d7606fd85a { 2022-12-27 13:48:42 +01:00
spherallic
f5ede24775 Fix gamepad being unable to skip tutorial prompt 2022-12-27 11:44:56 +01:00
spherallic
1964869c69 Remove redundant control axes & cleanup 2022-12-22 01:40:33 +01:00
spherallic
b772c3a00d Remove "controls per key" option 2022-12-22 00:02:30 +01:00
spherallic
7abdab09bd Check double usage per-player, remove 2.1 code 2022-12-21 23:51:24 +01:00
Eidolon
696e2ab909 Merge branch 'gamepad-refactor' into next 
Some hacks from the snake minigame patch have been removed as they are
no longer needed.

See STJr/SRB2!1870

# Conflicts:
#	src/g_game.c
#	src/g_input.c
 2022-12-08 20:00:41 -06:00
spherallic
ba1bad7a96 Merge branch 'next' into fullscreen-toggle 2022-11-24 21:41:06 +01:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
Sally Coolatta
d3ff5342dd Minor adjustments 2022-11-16 11:14:32 -05:00
Sally Coolatta
947dbda045 Use savemoddata for ultimate file check 2022-11-16 11:14:32 -05:00
Sally Coolatta
f082acbbdb Don't allow Record Attack in cheated games 2022-11-16 11:14:31 -05:00
Sally Coolatta
a22fa1c455 Compromise on cheats setting modified game 
Instead of modifying the game, cheats now set a separate "cheats were used in this session" variable, which returns some of the old behavior.

HOWEVER, cheats will STILL allow spawning / collecting emblems & unlocking unlockables. Cheats will purely prevent saving progress. (It was always frustrating that devmode would make debugging unlockable features harder...)

Lastly, the function to set no-saving was exposed to Lua (`G_SetUsedCheats(silent)`). Just thought it'd be useful for large-scale gamedata-using mods that want to add their own cheat commands.
 2022-11-16 11:14:31 -05:00
Sally Coolatta
1b43cdddd5 Allow saving in modified games. 2022-11-16 11:14:29 -05:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code 
Implements the SDL Game Controller API, haptics, and axis bindings.
 2022-11-14 00:37:08 -03:00
Eidolon
6709100997 Merge branch 'emblem-drawing-hud' into 'next' 
Various changes to emblem drawing (menu changes only)

See merge request STJr/SRB2!1810
 2022-11-12 23:37:22 +00:00
Eidolon
147b3c925e Ensure st_time does not exceed 2.0 2022-11-12 11:45:10 -06:00
Eidolon
24ab858684 Merge branch 'fix-negative-lives-crash' into 'next' 
Fix a crash when scrolling away from a save file with a negative lives count.

See merge request STJr/SRB2!1822
 2022-11-11 23:11:44 -06:00
ashifolfi
60ab28c1ab improved down arrow check + t->b/b->t looping 2022-11-11 22:57:17 -06:00
ashifolfi
4c08daa01f remove down arrow at bottom of addon list 2022-11-11 22:57:17 -06:00
ashifolfi
e12db019d6 fix addon menu down arrow always being visible 2022-11-11 22:57:17 -06:00
Eidolon
12c2ddb115 Merge branch 'uncappedrevengeance' into next 
Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c
 2022-11-08 21:13:50 -06:00
Eidolon
62b142f136 Uncap room list ellipsis animation 2022-11-07 20:08:33 -06:00
Eidolon
3c5855b64a Uncap sound test 2022-11-07 19:48:42 -06:00
GoldenTails
3244d6586d Fix a crash when scrolling away from a save file with a negative lives count. 2022-10-02 19:08:01 -05:00
spherallic
a85b820b44 Don't skip map completion emblems when skipping record attack emblems. 2022-09-17 00:59:35 +02:00
spherallic
4f744bc06f Various changes to emblem drawing: 
- Emblems in a row now have a little bit of spacing between them.
- Score/time/ring emblems are drawn only once in the pause menu.
- Record Attack & NiGHTS Mode show in-level emblems as well.
 2022-09-17 00:47:08 +02:00
spherallic
ef35084d95 Merge remote-tracking branch 'public/master' into next 2022-09-08 16:52:54 +02:00
spherallic
f564090c80 Two small renderer switching changes: 
- Allow renderer switching in resolution menu
- Fix "(F10)" suffix not being shown on the renderer option
 2022-09-07 14:00:56 +02:00
spherallic
541e2a4fe6 Merge branch 'next' into fullscreen-toggle 2022-09-07 13:48:52 +02:00
Jaime Ita Passos
07011a7044 Stop -Waddress warnings 2022-08-11 04:24:24 -03:00
Eidolon
bd73256390 Fix Marathon Mode menu for uncapped 2022-05-03 18:18:08 -05:00
Eidolon
f0d7d8467f Refactor timing code even more 
System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.
 2022-05-01 00:32:46 -05:00
Eidolon
e79654a33a Completely refactor timing system 
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.

This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
 2022-04-30 16:33:23 -05:00
Sally Coolatta
7c41564362 Fix multiplayer character select 2022-04-28 20:44:22 -05:00
Eidolon
4095ef599b Delta time choose player menu animations 2022-04-26 20:56:35 -05:00
Eidolon
a56a57b3d1 Misc changes after Kart cherry-picks 2022-04-26 20:56:32 -05:00
Sally Coolatta
c186d6402b Lots of FPS stuff 
- Disabled VSync, due to the numerous problems it has.
- Instead, added an FPS cap.
- Frame interpolation is now tied to fpscap != 35.
- By default, the FPS cap is set to the monitor's refresh rate.
- Rewrote the FPS counter.

(This also consolidates several more commits ahead of this
fixing various issues. -eid)
 2022-04-26 20:56:32 -05:00
Eidolon
056abd0461 Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll 2022-04-26 20:31:38 -05:00
Eidolon
c330c05718 Add smooth rendering to save select screen 2022-04-26 20:31:38 -05:00
Eidolon
61efef2fa9 Add smooth level platter under interpolation, renderdeltatics 
`renderdeltatics` can be used as a standard delta time in any place,
allowing for smooth menus. It will always be equal to `realtics`
when frame interpolation is turned off, producing consistent
framerate behavior everywhere it is used.
 2022-04-26 20:31:38 -05:00
Eidolon
722b04518d Place Frame Interpolation in "Experimental" video options header 
This seems like an appropriate way to describe the feature for now.
 2022-04-26 20:31:38 -05:00
sphere
20b73dedfe Merge branch 'multimare-grades' into 'next' 
Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu

Closes #71

See merge request STJr/SRB2!1762
 2022-03-21 21:58:54 +00:00
sphere
c0a21ccbf3 Merge branch 'levelplatternames' into 'next' 
Level platter name improvements

See merge request STJr/SRB2!1730
 2022-03-21 21:57:03 +00:00
SteelT
3eaae066ef Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu 
Fixes #71
 2022-03-08 21:06:01 -05:00
spherallic
0c7abd88fe Merge branch 'next' into fullscreen-toggle 2022-03-08 23:50:40 +01:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
f077021591 Clean up renderer toggle at SteelT's suggestion. 2022-02-19 15:15:06 +01:00
spherallic
7d1faf7e2c Handle invalid resolutions, make Backspace work in resolution menu. 2022-02-19 12:12:04 +01:00
spherallic
599644e885 Update resolutions menu, remove M_CentreText. 2022-02-05 11:32:48 +01:00
spherallic
5fdc0b889b Replace F10's near-useless game quit option with a renderer toggle. 2022-02-04 14:50:45 +01:00
spherallic
0cfc75070d Improved support for separate resolutions: 
- Windowed mode resolution can now be changed via the resolutions menu.
- F11 can also be used while in this menu.
- Removed usewindowedres cvar for ease of use.
- When starting in windowed mode, use the correct resolution.
 2022-02-04 14:42:10 +01:00
spherallic
e64775c867 Check V_ThinStringWidth instead of strlen for level platter names. 2022-02-02 23:16:12 +01:00
spherallic
f5d4eb3e7a Turn F11 into a fullscreen toggle, and process it inside menus as well. 2022-01-31 14:39:51 +01:00
sphere
f8532d4ad1 Merge branch 'blentran-update' into 'next' 
Blentran - updated

See merge request STJr/SRB2!1656
 2022-01-11 21:53:49 +00:00
sphere
f9d2fd9ce5 blentran part 1: Flag changes & semibright support. 2022-01-04 14:26:03 +01:00
spherallic
d9410e3e6a fix compile warnings (this really puts the mess in message) 2021-12-30 16:29:37 +01:00
spherallic
0a38fef147 Several changes to default control settings: 
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
 2021-12-29 19:29:36 +01:00
spherallic
b830fee2e3 Allow changing the master server address while hosting a netgame. 2021-12-26 21:30:36 +01:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next' 
Raise addon limit

See merge request STJr/SRB2!1465
 2021-12-02 22:50:46 +00:00