James R
f336b1e979
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
fef15be0af
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
b973b43271
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-25 10:31:55 -05:00
James R
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Zachary McAlpin
08e9efee76
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-11 15:02:31 -05:00
GoldenTails
9aa68f524e
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
715cb857f5
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
7bdea21435
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-29 15:32:59 -05:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Louis-Antoine
06060c02d3
Add a command to list current file transfers
2020-05-20 00:24:53 +02:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Zachary McAlpin
61562683c2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
Louis-Antoine
9ec4ba3824
Add a minimum delay between connections
2020-04-24 14:05:15 +02:00
Zachary McAlpin
31b19f69a2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
b8d40a5783
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
21353f1209
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
SteelT
bd058ecc4b
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
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
0a54c40ff4
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
2052ee1144
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
766ca2f5a5
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
0e56202d63
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
f97187f59b
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 2b16971137
2020-03-12 22:31:48 -05:00
Zachary McAlpin
7ec241c59e
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit bef49f5660
2020-03-12 22:31:39 -05:00
Zachary McAlpin
bef49f5660
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
2b16971137
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
Monster Iestyn
f4cb6e1f5e
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
2cace6e147
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
7d77600e71
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
d3ed5ad44f
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
678935f26a
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
290cd9d08e
Same here
2020-02-23 16:46:45 -03:00
Jaime Passos
1b8e172af3
Consider Co-Op here as any campaign gametype
2020-02-23 16:45:01 -03:00
Jaime Passos
b622f539ff
Always allow skin switching in friendly gametypes
2020-02-23 16:40:52 -03:00
SwitchKaze
6415e10216
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
0362f53e9b
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
James Hale
56b67a3b4f
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
Louis-Antoine
778715f611
Cleanup code a little
2020-02-22 02:21:27 +01:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Tatsuru
3022e38d15
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
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
132e8f82d5
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
James R
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
James R
d5ced42f06
Remove Player 0
2020-02-01 18:22:03 -08:00
