James R
66a6374dbe
Merge branch 'lua-polyobjects' into 'next'
...
Lua polyobjects
Closes #19
See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
Jaime Passos
0bf5237e0d
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
James R
c04d08460a
Merge branch 'slight-shader-cleanup' into 'next'
...
Shader code cleanup
See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
f133726df0
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
James R
6363162826
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
eaec5126a6
Merge branch 'ogl-driver-error' into 'next'
...
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
Jaime Passos
70cd48c9a2
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
James R
737ea51ace
Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera
2020-10-04 16:32:19 -07:00
Hannu Hanhi
e234eb8f87
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
2020-10-03 18:45:56 +03:00
James R
94415facfe
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
e42eb9aba8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 3883d44bb55c1b3baf18
2020-10-02 15:37:23 -07:00
lachwright
6fa06c4523
Update ICNS icon for macOS
...
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10:00
James R
70eec29992
Mute music instead of pausing if lose focus
2020-09-28 11:58:24 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
c9e3281b99
Merge remote-tracking branch 'origin/master' into tinnitus
2020-09-25 01:57:08 -07:00
James R
68bd632bac
You have entered the comedy area
2020-09-24 16:49:34 -07:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
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
