Commit graph

506 commits

Author SHA1 Message Date
Steel Titanium
e656a7d92d Link with exchndl, instead of dynamically loading it.
It caused problems with crash reports not being made if the current working directory gets changed. Not even recommended anymore per the drmingw readme
https://github.com/jrfonseca/drmingw#exchndl
2020-09-17 15:59:02 -04:00
Sal
20f1e31e8f Merge branch 'save-renderer' into 'next'
Save renderer to file

See merge request KartKrew/Kart-Public!220
2020-09-11 11:59:51 -04:00
James R
33c11f1b0b Save chosen renderer to file, use on startup if no -software or -opengl parameter 2020-08-31 19:29:09 -07:00
James R
9ad0a0660c Just SetCurrentDirectory to the exe's folder on windoze 2020-08-31 01:23:56 -07:00
Sally Coolatta
528ed46661 Remove default dirs on Windows
Cause more issues than fixes. Still around for Linux.
2020-08-31 00:06:47 -04:00
Sal
4b9188b626 Merge branch 'discord-rpc-support' into 'next'
Discord Rich Presence

See merge request KartKrew/Kart-Public!207
2020-08-30 21:48:44 -04:00
Sally Coolatta
61d6ee0982 Misc changes to how the program runs
- Call DRPC_Init at the end of D_SRB2Main instead of in the middle
- Call Discord_RunCallbacks in D_SRB2Loop instead of G_Ticker
- Fix errorcount nums in I_Error, an old leftover from when Discord_Shutdown was not handled by I_AddExitFunction
2020-08-27 18:50:36 -04:00
James R
e4a522353f Say DEFAULTDIR not .srb2kart 2020-08-26 23:37:52 -07:00
James R
45af41ef0c Check DEFAULTDIR for srb2.srb after cwd 2020-08-26 20:20:40 -07:00
Sally Coolatta
54c487feff Merge branch 'next' into discord-rpc-support 2020-08-26 12:56:58 -04:00
James R
a79316b375 Kill NOHS 2020-08-24 17:58:39 -07:00
James R
6a14d9c1d4 Fix NOMIXER compiling 2020-08-24 17:55:42 -07:00
James R
d52a35e5b6 Fix NOGME compiling 2020-08-24 17:51:01 -07:00
Steel Titanium
5d5385f7a1 It's discord-rpc, not libgme 2020-08-23 17:45:31 -04:00
Steel Titanium
f20f0b2f19 Better CMake support
No idea if it compiles on Mac, it does on Linux though, at least for me.
2020-08-23 16:15:33 -04:00
Sally Coolatta
8c79d62b22 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta
1899b31fa7 Add envelope icon, add sounds 2020-08-22 04:54:08 -04:00
Steel Titanium
8ad5eaad2e GME cleanup and fixes
Just some stuff backported from SRB2 2.2, well mostly

get_zlib_error function to reduce code duplication

Return false if it fails to load the VGZ lump

Reduce redundant calls to gme_set_equalizer

Fix sometimes loading a VGZ crashing the game
2020-08-19 22:39:12 -04:00
James R
2492bfe335 Copy the saved wad directory to srb2path 2020-08-17 21:27:59 -07:00
James R
a29785aec3 Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found
Windows code goes brrr
2020-08-17 20:11:32 -07:00
Sally Coolatta
b5a378f850 Merge remote-tracking branch 'public/master' into discord-rpc-support 2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
James R
8e493bddc3 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
James R
0349cc4127 Merge remote-tracking branch 'origin/master' into http-mserv 2020-06-12 23:36:39 -07:00
Steel Titanium
52c8ba5d49 Fix opengl crashing on startup due to lack of checks
Also fixes the log file not being written to the home directory.
2020-05-23 16:21:26 -04:00
Sal
9e6933ff48 Merge branch 'nomixer-fix' into 'master'
Fix "NOMIXER" flag compiling

See merge request KartKrew/Kart-Public!159
2020-05-15 19:28:54 -04:00
James R
9056ca0525 Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07: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
James R
f29e5ebf26 Wait for threads before SDL_Quit (lol) 2020-04-27 18:03:10 -07:00
James R
3a54cbd7a1 Create cond if it doesn't exist when signaling 2020-04-27 18:01:27 -07:00
Steel Titanium
28e51c2d9e Support for http downloads
(cherry picked from commit 5e0eca9fe9)

(cherry picked just the libcurl stuff)
2020-04-26 20:01:15 -07:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Wolfy
98183fef6f Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
wolfs
fb0e699aec Merge branch 'fixsignalhandler-resurrection' into 'awful-mix'
2.2 signal handler

See merge request SinnamonLat/Kart-Public!11
2020-04-20 22:42:59 -04:00
James R
a4ef8dd401 Multithreading in my SRB2??? 2020-04-17 20:05:29 -07:00
wolfs
4a264ffba9 Merge branch 'http-downloads' into 'awful-mix'
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
6bf90fc441 Batching! 2020-04-12 03:09:07 +03:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04: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
Jaime Passos
c2aab97d10 fix conflict 2019-11-12 00:23:26 +01:00