Jaime Passos
f55b4bf6ad
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
James R
cb9db74044
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
James R
469e5a7c9b
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
James R
699407dbb0
I'm an idiot
2019-12-24 11:14:21 -08:00
James R
7db16e230b
Merge branch 'fixsignalhandler' into 'master'
...
Handle signals correctly on linux
See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
Jaime Passos
98f903b311
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-19 17:09:47 -03:00
Alam Ed Arias
37a264c30e
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
2019-12-19 10:24:04 -05:00
Jaime Passos
81ed4b38fc
Fix missing "-" prefix on "-software" cmdline parm
2019-12-17 18:04:05 -03:00
Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
Jaime Passos
db7242c240
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
Eidolon
de12308eb8
[cmake] Use same executable names as Makefile
2019-12-15 00:39:04 -06:00
James R
bc939a2211
Merge branch 'opengl-is-a-bad-renderer' into 'master'
...
OpenGL fixes
See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
James R
cbf3c24297
Handle log file in parent properly
2019-12-13 16:51:49 -08:00
James R
ff73055b56
Add this back for Windoodoo because I'm an idiot
2019-12-13 15:04:31 -08:00
Jaime Passos
b47cc01f50
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
James R
a9679eb440
Rename signal caught message to be more obvious
2019-12-12 22:01:16 -08:00
James R
e13853e9ba
Fix signal handler setup error reporting
2019-12-12 21:57:54 -08:00
James R
6f2324d8df
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-12 21:30:35 -08:00
James R
648f5221c7
Kill child when wait fails, so I_Error exits both
2019-12-12 21:21:25 -08:00
James R
11910e844c
Fix idiot mistake
2019-12-12 21:20:51 -08:00
James R
5d9cd1c72a
Move everything to i_system.c
...
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00
James R
ff41ba7979
nix: Fork before game code and wait to catch signals and coredumps
...
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.
"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-11 23:46:57 -08:00
James R
b701baca6d
Move I_ShutdownConsole to I_ShutdownSystem
2019-12-11 22:10:22 -08:00
Jaime Passos
740f095219
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-12 01:39:46 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
042f14236b
Speed up level loading
...
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
4ccc854a90
Die
2019-12-08 22:12:56 -03:00
mazmazz
126dbc4a82
Deployer fixes for 2.2.0
2019-12-07 13:56:05 -05:00
Steel Titanium
147960f4db
Correct comment
2019-12-06 17:10:14 -05:00
MascaraSnake
fffd385151
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Alam Ed Arias
f36fa64b57
Not dealing with size_t mess with SDL code
2019-12-06 14:42:47 -05:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Alam Ed Arias
c1b29fb1a1
Merge branch 'public_next' into private
2019-12-05 11:18:33 -05:00
Alam Ed Arias
2982082dbf
Fix building with MSVC
2019-12-05 10:51:55 -05:00
Steel Titanium
25712d9500
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
toaster
f7c5774b7e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
Jaime Passos
e32238f0b5
GIF recording
2019-11-10 00:21:48 -03:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
91d2beebfa
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
MascaraSnake
f5f21db2f4
Merge branch 'window-focus-music' into 'master'
...
Window focus options for playing sounds/music
See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
James R
cd1ad44539
Console variables to toggle music/sound playing when the window is unfocused
...
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
2019-10-23 17:21:09 -07:00