stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
12691 commits 172 branches 41 tags 285 MiB
Commit graph

12691 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steel Titanium
a34be0e370 Reduce code duplication by creating get_zlib_error function 
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
 2020-06-17 14:19:19 -04:00
Steel Titanium
d3d5496a78 Fix facecolor may be used uninitialized. 2020-06-17 14:09:49 -04:00
lachwright
7d92631d97 Whoops, forgot hu_stuff.c 2020-06-17 05:27:42 +08:00
lachwright
edfd64877c Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
lachwright
e403de7459 Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00
lachwright
29738fcdd0 Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain 2020-06-17 01:46:36 +08:00
lachwright
38e2c999c5 Platform fixes 2020-06-14 12:17:30 +08:00
MascaraSnake
88aad41310 Remove unnecessary options from quicksand FOF again 2020-06-12 18:22:16 +02:00
MascaraSnake
698c18bd40 Remove temporary splat rendering special case 2020-06-12 17:57:24 +02:00
MascaraSnake
06b581dcdf Trim down options for the bobbing FOF preset types 2020-06-12 17:48:43 +02:00
MascaraSnake
5f9af65aa0 Revamp alpha setup for the remaining FOFs 2020-06-12 16:45:18 +02:00
Zachary McAlpin
6eccc7030d I forgot to pop the error handler 2020-06-12 07:50:57 -05:00
Zachary McAlpin
965d42f974 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-12 07:32:44 -05:00
MascaraSnake
6521496d8a Revamp alpha setup for bobbing FOFs 2020-06-12 10:53:27 +02:00
MascaraSnake
3317827151 Revamp alpha setup for bustable FOFs 2020-06-12 10:31:26 +02:00
MascaraSnake
f4e28f5cc4 Revamp alpha setup for quicksand FOFs 2020-06-12 10:23:16 +02:00
MascaraSnake
cc6820187c Handle splat flag for laser FOFs 2020-06-12 10:17:52 +02:00
MascaraSnake
cadb03fd12 Revamp alpha setup for laser FOFs 2020-06-12 10:03:27 +02:00
MascaraSnake
d6a104f8a5 Revamp alpha setup for custom FOFs 2020-06-12 09:57:56 +02:00
MascaraSnake
ac549eddeb Revamp alpha setup for crumbling FOFs 2020-06-12 09:28:41 +02:00
MascaraSnake
1ad8f75538 Revamp alpha setup for water FOFs 2020-06-12 09:00:06 +02:00
Nev3r
2322644488 Merge branch 'dofile' into 'next' 
Add dofile() to Lua

See merge request STJr/SRB2!969
 2020-06-12 02:32:16 -04:00
MascaraSnake
8dd3c78b05 Add FOF flag for splat flat rendering 2020-06-12 08:27:10 +02:00
MascaraSnake
a79862285e Step 1 in refactoring FOF alpha setup: Pass alpha value to FOF adding functions as a parameter 2020-06-12 08:16:50 +02:00
Steel Titanium
b056bf1d6c Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
SteelT
c810ea3945 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolor bugfixes

See merge request STJr/SRB2!971
 2020-06-11 20:08:50 -04:00
Zachary McAlpin
0d70e16b0b Updated LUAh_GameQuit to use new error handler 2020-06-11 15:11:01 -05:00
Zachary McAlpin
08e9efee76 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
lachwright
fad82265e0 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
LJ Sonic
38a8fe2baa Merge branch 'better-download' into 'next' 
Improvements to the in-game file downloader

See merge request STJr/SRB2!976
 2020-06-11 13:02:13 -04:00
mazmazz
8fc414536f CMAKE: Move launch-c into more sensible location 2020-06-10 15:08:09 -04:00
LJ Sonic
7ffee074d8 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/d_clisrv.c
 2020-06-10 07:57:49 -04:00
LJ Sonic
bc2edb2ae4 Merge branch 'snake' into 'next' 
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
 2020-06-10 07:38:37 -04:00
Zachary McAlpin
291479e3e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
mazmazz
46b383acda CMAKE: Fix toggle fullscreen breakage due to missing define 
This is lazy. The correct solution is to eliminate the define in the program code
 2020-06-09 17:32:14 -04:00
MascaraSnake
03cf0c6e3b Merge branch 'udmf-next' into udmf-fofs-mkii 2020-06-09 22:10:30 +02:00
MascaraSnake
a76c8af60c Compiling fix 2020-06-09 22:10:02 +02:00
mazmazz
36e17006b7 CMAKE: Fix OS X ccache scripts 2020-06-09 11:12:52 -04:00
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
 2020-06-09 09:50:02 +02:00
MascaraSnake
d07c376f6d Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
Steel Titanium
2abdc86537 Fix these "may be used uninitialized in this function" errors with batching 2020-06-08 20:18:32 -04:00
Steel Titanium
3dd89f67fa Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium
62d73968e2 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
SteelT
ce17cc4855 Merge branch 'ogl-batching' into 'sal-oglshaderport' 
OpenGL draw call batching

See merge request STJr/SRB2!986
 2020-06-08 18:10:18 -04:00
SteelT
405f1550a5 Merge branch 'shaders-224-next-merge' into 'sal-oglshaderport' 
Shaders next merge

See merge request STJr/SRB2!985
 2020-06-08 18:07:53 -04:00
mazmazz
01ff46326f Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Digiku
70eb5ba634 Merge branch 'buffer-offset-fix' into 'master' 
Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
 2020-06-08 11:56:48 -04:00
Digiku
a41e68362e Merge branch 'openmpt-deprecated-fix' into 'master' 
Fix OPENMPT deprecation error, openmpt_module_ctl_set

See merge request STJr/SRB2!990
 2020-06-08 10:37:46 -04:00
Lachlan Wright
191e2e094d Merge branch 'fix-spawn-desynch' into 'next' 
Fix desynch when a player spawns

See merge request STJr/SRB2!977
 2020-06-08 05:25:41 -04:00