Commit graph

1230 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
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Monster Iestyn
d5030f8a02 Begin work on adding access to polyobjects in Lua:
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01: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
d78befc713 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e4b7257ec9 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
7cbc9add07 Kill NOHS
(cherry picked from commit a79316b375)
2020-08-31 16:06:40 -07:00
James R
1818693d71 Fix NOGME compiling
(cherry picked from commit d52a35e5b6)
2020-08-31 16:04: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
288a6c1431 Merge branch 'fix-file-downloading' into 'next'
Fix bug where SRB2 would check size of disk from current directory instead of srb2home

See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
SteelT
7cd1b99fdb Quit on error fix 2020-08-18 22:45:57 -04:00
GoldenTails
2a27628232 Fix bug where SRB2 would check size of current directory instead of srb2home
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05: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
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Sryder
b84fe5212e Makefile was linking i_thread.o twice 2020-08-15 14:51:40 +01:00
Sally Coolatta
631f698432 Cleanup
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
f12501dfb6 SDL files 2020-08-15 06:02:39 -04:00
James R
4acc3e6d0c Strip a few more instances of SONIC ROBO BLAST 2 KART 2020-08-14 22:18:51 -07:00
Jaime Passos
cb3660331a Refactor renderer switching 2020-08-14 22:27:16 -03:00
James R
7be58ca3ee Use AsciiChar to get the input from windows console window 2020-08-13 21:57:36 -07:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3 Merge remote-tracking branch 'public/master' 2020-08-12 18:55:43 -04:00
SteelT
0fed8c2ee3 Merge sdl/hwsym_sdl.c 2020-08-10 15:28:15 -04:00
SteelT
fd000248b7 Merge sdl/i_video.c 2020-08-10 13:03:41 -04:00
James R
b771ff2426 Add http-mserv to fuck
(cherry picked from commit 8e493bddc3)
2020-08-09 23:34:16 -07:00
James R
8e493bddc3 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
James R
fa18f819b0 Merge branch 'clipboard-crash-fix-2' into 'next'
Fix buffer overrun in I_ClipboardPaste (resolves #205)

Closes #205

See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next'
Kill CD support

See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
2e3b0ae4c8 Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
Jaime Passos
ed068a7664 Fix buffer overrun in I_ClipboardPaste 2020-08-08 15:36:01 -03:00