Jaime Passos
ed068a7664
Fix buffer overrun in I_ClipboardPaste
2020-08-08 15:36:01 -03:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
James R
84d9aa93c7
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
Steel Titanium
29d6b5c758
Merge branch 'master' into next
2020-07-06 12:13:00 -04:00
Steel Titanium
06f76f07f4
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
lachwright
62183201c9
Allow macOS builds to be launched through Steam
2020-06-12 01:19:06 +08:00
Steel Titanium
468a9b96b7
Fix no previous prototype for TimeFunction
2020-06-08 19:56:24 -04:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03: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
SteelT
9ff6af856e
Resolve conflicts on the SDL interface files.
2020-05-29 16:17:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
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