stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-09 09:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
15966 commits 180 branches 42 tags 185 MiB
Commit graph

1167 commits

Author SHA1 Message Date
Logan Aerl Arias
10b3c58a3d Merge branch SRB2:next into ogl-palette-rendering 2024-01-02 00:00:11 +00:00
Logan Aerl Arias
4523364a40 Merge branch 'next' into ogl-palette-rendering 2024-01-01 18:22:35 -05:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
56325399cc Merge branch SRB2:next into playersetup-and-continue-lua 2023-12-31 17:10:47 +00:00
Logan Aerl Arias
28f982fdce Merge branch SRB2:next into pandoradev 2023-12-31 16:48:54 +00:00
Logan Aerl Arias
a343abed01 Merge branch SRB2:next into static-void-drawstaticbox 2023-12-31 16:44:10 +00:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Lactozilla
a266fbb6a0 Revert 6c701a9312 2023-12-26 17:53:38 -03:00
Logan Aerl Arias
6c701a9312 Revert "Merge branch 'native-keyboard-layout-support' into 'next'" 
This reverts merge request !1952
 2023-12-26 19:21:09 +00:00
Logan Aerl Arias
63a5361d3a Merge branch 'native-keyboard-layout-support' into 'next' 
Implement support for native keyboard layout

See merge request STJr/SRB2!1952
 2023-12-25 23:57:51 +00:00
Alam Ed Arias
015dbc5efa Merge remote-tracking branch 'Hanicef/register-dual-stack-servers' into IPv6 2023-12-12 20:38:41 -05:00
Alam Ed Arias
fdb7c7c847 Merge remote-tracking branch 'Hanicef/add-ipv6-indicator' into IPv6 2023-12-12 20:38:19 -05:00
Lach
c107c5bc6a Remove indent from relocated define 2023-11-29 20:21:28 +11:00
Lach
e412230ba9 Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu 2023-11-29 19:27:52 +11:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
Lactozilla
badc122286 Merge branch 'next' into more-sprite2 2023-11-26 22:36:01 -03:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Gustaf Alhäll
40f57de187
Add indicator for IPv6-enabled servers 2023-11-26 21:30:54 +01:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
5f5f8053fe Update sprite2 serialize 
Increase demo version
Fix code not using P_GetSkinSpritedef
Fix code not using correct data type for player sprite
 2023-11-13 11:46:55 -03:00
Gustaf Alhäll
c6cd14c156
Allow specifying interface for IPv6 addresses 2023-11-11 14:12:51 +01:00
Gustaf Alhäll
5deee87bd2
Fix keyhandler menus not blocking in-game movement 2023-11-04 19:12:23 +01:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
244cca8e9d Merge branch 'master' into font_drawer 2023-10-25 15:06:35 -04:00
Alam Ed Arias
f2fa2505cd Merge branch SRB2:next into native-keyboard-layout-support 2023-10-25 19:05:06 +00:00
Alam Ed Arias
43e8e42e09 Merge branch SRB2:next into static-void-drawstaticbox 2023-10-25 19:04:49 +00:00
Alam Ed Arias
47833469d1 Merge branch SRB2:next into pandoradev 2023-10-25 18:08:33 +00:00
Hannu Hanhi
a47e1fb272 Merge tag 'SRB2_release_2.2.13' into ogl-palette-rendering-merge13 
SRB2 release v2.2.13
 2023-09-23 19:38:27 +03:00
sphere
a373d96d07 Merge branch 'fix-overflow-scrolling-background' into 'next' 
Fix buffer overflow when displaying a scrolling background

See merge request STJr/SRB2!2010
 2023-09-20 16:10:56 +00:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next' 
Re-delete netcode

See merge request STJr/SRB2!2083
 2023-09-18 16:47:28 +00:00
SMS Alfredo
62525d34f1 Merge branch 'next' into pandoradev 2023-09-14 16:05:55 -05:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
sphere
fefdd7987c Merge branch 'title-animation-skip' into 'next' 
Allow input during title animation after the first time

See merge request STJr/SRB2!2122
 2023-09-05 22:23:57 +00:00
spherallic
85fc55bfc1 Prevent title input during negative finalecount 2023-09-05 19:38:45 +02:00
Zwip-Zwap Zapony
3faa29ded9 Fix the Record Attack background jumping 2023-09-01 22:36:15 +02:00
spherallic
ce721f9f78 Allow input during title animation after 1st play 2023-08-20 23:40:13 +02:00
Sally Coolatta
40c37ce4c2 Revert left/right movement 2023-08-20 12:05:58 -04:00
Sally Coolatta
9c8dd54751 Fix color grid not extending to the very bottom 2023-08-20 11:56:55 -04:00
Sally Coolatta
4d1e6df2d7 Fix color grid input bugs 
There's still some slight awkwardness trying to wrap downwards into uneven row grids, but this is significantly better and this already took up way more time than I wanted it to.
 2023-08-20 11:28:39 -04:00
Sally Coolatta
2f1db66e78 Fix drawing of final color 2023-08-20 07:37:10 -04:00
Lactozilla
0bb65166c9 Always allow changing color in multiplayer player setup menu 2023-08-15 03:49:31 -03:00
LJ Sonic
df0c8e0557 Merge remote-tracking branch 'origin/next' into netcode-rerefactor 2023-08-01 19:00:52 +02:00
Monster Iestyn
c9efaf3a1a fix warping from SP pause level select breaking if game was started with no save slot (such as from extras menu) 2023-08-01 17:52:06 +01:00
Monster Iestyn
fb00b65f41 ...you know what, just call G_LoadGame for SP_PauseLevelSelectDef in M_LevelSelectWarp too 2023-07-31 23:36:07 +01:00
LJ Sonic
d841bfb236 Move netcode console variables to appropriate files 2023-07-27 15:38:46 +02:00
LJ Sonic
e090f0e400 Move client connection handling to a new file 2023-07-27 15:38:43 +02:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
LJ Sonic
07bc922273 Delete netcode 
Just kidding, I just deleted NONET
 2023-07-27 15:34:05 +02:00
SMS Alfredo
285f7acbed Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked 2023-07-25 14:18:36 -05:00
Sally Coolatta
dded352293 Harsher replay menu 
Don't allow loading demos with invalid file lists at all. If you insist on doing this, it has to be done from the command line now.
 2023-07-25 09:43:10 -04:00
Sally Coolatta
77576c3c5d Allow Record Attack in modified games 
Replays now store & validate the add-on list before loading them. Custom characters can now be allowed in Record Attack.
 2023-07-25 08:45:42 -04:00
Sal
f46e6883ca Merge branch 'fullscreen-toggle' into 'next' 
Add fullscreen (and renderer) toggle & make windowed mode use a separate resolution

See merge request STJr/SRB2!1734
 2023-07-24 09:14:21 +00:00
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
spherallic
34abe808e4 Merge branch 'next' into font_drawer 2023-04-13 10:43:39 +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
66042ef8a1 Improved handling of multi-line strings: 
- Centered/right-aligned string drawing now properly handles newlines
- Measuring string width/height takes newlines into account
- String height also takes V_RETURN8 into account
- Cleaned up menu message code, removed now-redundant M_StringHeight
 2023-03-09 11:20:26 +01:00
spherallic
8228275cf8 Merge branch 'next' into font_drawer 2023-03-05 22:27:22 +01: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
spherallic
77f7374b98 Merge branch 'next' into font_drawer 2023-01-11 22:59: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