Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Steel Titanium
058b41a834
Port netticbuffer from Kart
2020-07-19 15:24:27 -04:00
James R
71189da020
Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master'
...
Adds the branch name into the version command printout when outside of DEVELOP mode.
See merge request STJr/SRB2!981
2020-07-11 01:48:38 -04:00
GoldenTails
0fbcd7a5d2
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
2020-06-27 10:56:15 -05:00
Zachary McAlpin
fbe3c1a122
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-25 10:31:55 -05:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Zachary McAlpin
1b831c0bbe
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-11 15:02:31 -05:00
GoldenTails
663fcf5e61
Adds the branch name into the version command printout when outside of DEVELOP mode.
...
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
2020-06-06 04:12:27 -05:00
LJ Sonic
05e8d12427
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
Zachary McAlpin
8826eeeeb9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-29 15:32:59 -05:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Louis-Antoine
15d6a254e1
Add a command to list current file transfers
2020-05-20 00:24:53 +02:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Zachary McAlpin
81f651a81e
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
Louis-Antoine
ccf4bbe194
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
SteelT
2e25a5b56d
Merge branch 'viewpointswitch-fix' into 'next'
...
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
21cb05b1f7
Merge branch 'fix-playernode-crash' into 'next'
...
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Zachary McAlpin
564ecf4f0f
Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f
2020-03-15 10:34:43 -05:00
Zachary McAlpin
9ca79b4d8b
Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well
2020-03-15 00:54:06 -05:00
Zachary McAlpin
38d7ad3e6a
Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server
2020-03-15 00:28:41 -05:00
Zachary McAlpin
586c05389d
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 57dc2df60a
2020-03-12 22:31:48 -05:00
Zachary McAlpin
8b440bdafb
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit 39934f1844
2020-03-12 22:31:39 -05:00
Zachary McAlpin
39934f1844
Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
2020-03-12 20:51:16 -05:00
Zachary McAlpin
57dc2df60a
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
LJ Sonic
e0f3a5b8f5
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Jaime Passos
ea756fd557
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
48a9ea8d0e
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
1b9a6fed3e
Same here
2020-02-23 16:46:45 -03:00
Jaime Passos
990df8e8c0
Consider Co-Op here as any campaign gametype
2020-02-23 16:45:01 -03:00
Jaime Passos
1d5f9ed292
Always allow skin switching in friendly gametypes
2020-02-23 16:40:52 -03:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
Louis-Antoine
c785fc2132
Cleanup code a little
2020-02-22 02:21:27 +01:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Tatsuru
7f190f35f2
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
256c9a20db
Merge branch 'local-color-table' into 'master'
...
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
2020-02-16 23:58:11 -05:00
