Sally Coolatta
1c47841487
Remove default dirs on Windows
...
Cause more issues than fixes. Still around for Linux.
2020-08-31 00:06:47 -04:00
Sal
1aca163d12
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
c165b0761c
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
4c816f4059
Say DEFAULTDIR not .srb2kart
2020-08-26 23:37:52 -07:00
James R
6e3facf8f4
Check DEFAULTDIR for srb2.srb after cwd
2020-08-26 20:20:40 -07:00
Sally Coolatta
cb5ab33a93
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
James R
3437b0690a
Kill NOHS
2020-08-24 17:58:39 -07:00
James R
16fc87edcf
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
James R
0d57ba1d02
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
Steel Titanium
e58c9ac410
It's discord-rpc, not libgme
2020-08-23 17:45:31 -04:00
Steel Titanium
d9cbb69327
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
5de27be169
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
Sally Coolatta
3c128660b4
Add envelope icon, add sounds
2020-08-22 04:54:08 -04:00
Steel Titanium
e3f07b33bb
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
1bf0794d6a
Copy the saved wad directory to srb2path
2020-08-17 21:27:59 -07:00
James R
2a2d43a20b
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
f5bd9d097f
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
c8fa1dcfb5
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
James R
1a1c215a91
Add http-mserv to fuck
2020-08-09 23:32:43 -07:00
James R
9b3456a860
Merge remote-tracking branch 'origin/master' into http-mserv
2020-06-12 23:36:39 -07:00
Steel Titanium
3f3cb2c976
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
f0f4b7bc1e
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
233e6627de
Merge remote-tracking branch 'origin/master' into http-mserv
2020-05-12 17:50:32 -07:00
Alam Ed Arias
42f71c0278
Tested to be compile with Mingw64 9.1.0
...
(cherry picked from commit 5a79a446df
2020-05-11 18:43:24 -07:00
James R
8f3820db66
Wait for threads before SDL_Quit (lol)
2020-04-27 18:03:10 -07:00
James R
bdddeb9ecf
Create cond if it doesn't exist when signaling
2020-04-27 18:01:27 -07:00
Steel Titanium
ba989dce10
Support for http downloads
...
(cherry picked from commit 6fcc06bf72
2020-04-26 20:01:15 -07:00
Sally Cochenour
b2aebb81ec
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
Wolfy
0e78159ea1
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
ce1d017a73
Sky dome from SRB2
2020-04-22 00:18:58 +03:00
wolfs
f9dad05242
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
c472a9f50d
Multithreading in my SRB2???
2020-04-17 20:05:29 -07:00
wolfs
dcfaba2cc6
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
da2a640c6c
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
8001bb4154
Batching!
2020-04-12 03:09:07 +03:00
Steel Titanium
6fcc06bf72
Support for http downloads
2020-04-07 18:22:29 -04:00
James R
2a016332c4
Handle log file in parent properly
2019-12-16 19:28:42 -08:00
James R
f460e83846
Add this back for Windoodoo because I'm an idiot
2019-12-16 19:27:55 -08:00
James R
d0c41a8d55
Rename signal caught message to be more obvious
2019-12-16 19:27:55 -08:00
James R
a0d6dc30cb
Fix signal handler setup error reporting
2019-12-16 19:27:55 -08:00
James R
b83f41e089
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-16 19:27:54 -08:00
James R
a64dbe1016
Kill child when wait fails, so I_Error exits both
2019-12-16 19:27:54 -08:00
James R
c9830e5ab1
Fix idiot mistake
2019-12-16 19:27:54 -08:00
James R
9efe4d8445
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
2b837726eb
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
f22e767380
fix conflict
2019-11-12 00:23:26 +01:00
filpAM
fe4cbd7ba1
Fix "NOMIXER" flag compiling
2019-09-13 13:20:44 -04:00
Latapostrophe
ff04e0c103
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
de5e44cfbc
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
