Commit graph

211 commits

Author SHA1 Message Date
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
362adf4576 Allow resuming the most recent file transfer 2020-05-19 11:28:24 +02:00
James R
37fc2496de Wait for threads before SDL_Quit (lol) 2020-05-13 17:25:52 -07:00
James R
3312743a66 Multithreading in my SRB2??? 2020-05-13 17:21:19 -07:00
James R
9056ca0525 Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Alam Ed Arias
2a116ac847 Tested to be compile with Mingw64 9.1.0
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07:00
Monster Iestyn
398770b952 Fix logging on Mac
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Hannu Hanhi
c5c45a1fb0 Implement I_GetTimeMicros without affecting I_GetTime behaviour details 2020-05-02 23:14:20 +03:00
Hannu Hanhi
e5531714df Render stats 2020-05-02 23:13:08 +03:00
James R
f29e5ebf26 Wait for threads before SDL_Quit (lol) 2020-04-27 18:03:10 -07:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
James R
a4ef8dd401 Multithreading in my SRB2??? 2020-04-17 20:05:29 -07:00
Sally Cochenour
896f752d94 Fix the compile errors I got
- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
2020-03-29 08:39:15 -04:00
James R
10a9a05cd8 symlink latest-log.txt on nix, copy to the real log file everywhere else
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
2020-03-24 15:49:08 -07:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Alam Ed Arias
848a144956 fread and fwrite use size_t, not int 2019-12-27 13:08:26 -05:00
James R
8311380146 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
James R
699407dbb0 I'm an idiot 2019-12-24 11:14:21 -08:00
James R
984281e85e Merge remote-tracking branch 'origin/master' into time 2019-12-24 11:02:31 -08:00
James R
908266f583 symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
James R
15ac2982c0 Handle log file in parent properly 2019-12-16 19:28:42 -08:00
James R
e0264d5fb1 Add this back for Windoodoo because I'm an idiot 2019-12-16 19:27:55 -08:00
James R
d29a598564 Rename signal caught message to be more obvious 2019-12-16 19:27:55 -08:00
James R
319c28db45 Fix signal handler setup error reporting 2019-12-16 19:27:55 -08:00
James R
5b960672e9 Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-16 19:27:54 -08:00
James R
8c0976a6cb Kill child when wait fails, so I_Error exits both 2019-12-16 19:27:54 -08:00
James R
18943a24db Fix idiot mistake 2019-12-16 19:27:54 -08:00
James R
e961a901e4 Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-16 19:27:53 -08:00
James R
c6a882f303 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-16 19:27:35 -08: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
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
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05: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
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
TehRealSalt
217f61897f K_PlayerForfeit on I_Quit
(I believe these are the only i_systems that matter?)
2019-10-02 11:47:56 -04:00
James R
246280045c Fix crash in TESTERS build if you try to record demo anyway 2019-09-27 19:20:55 -07:00
Steel Titanium
cecbf95002 Various of changes
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Alam Ed Arias
8a69d97a12 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04:00