toaster
4502604007
Special saves!
...
All this refactoring, just to resolve #162 . Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.
Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...
One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 19:00:47 +01:00
Nev3r
8063814f1c
Merge branch 'shaderless-support-next' into 'next'
...
Backwards compatibility for shaderless hardware
See merge request STJr/SRB2!1003
2020-06-18 13:49:09 -04:00
Hannu Hanhi
9477d372b9
Backwards compatibility for shaderless hardware
2020-06-18 17:39:34 +03:00
SteelT
bff6b19056
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
SteelT
5a52f9cbf4
Merge branch 'sal-oglshaderport' into 'next'
...
OpenGL shaders
See merge request STJr/SRB2!724
2020-06-17 18:53:04 -04:00
Steel Titanium
8365d975d3
A even more better fix for this
2020-06-17 18:40:56 -04:00
Steel Titanium
1e655fb2c1
Better fix for may be used uninitialized, maybe fixes GCC 4.x
2020-06-17 18:23:54 -04:00
Steel Titanium
3946309ece
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
Steel Titanium
d3d5496a78
Fix facecolor may be used uninitialized.
2020-06-17 14:09:49 -04: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
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
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
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
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
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
Lachlan Wright
614a98bd9d
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Lachlan Wright
590dfca582
Merge branch 'fix-continuing-mouse' into 'next'
...
Fix mouse being grabbed in continue screen
See merge request STJr/SRB2!983
2020-06-08 05:25:24 -04:00
mazmazz
a5f7f9a534
Fix OPENMPT deprecation error, openmpt_module_ctl_set
2020-06-08 00:09:29 -04:00
mazmazz
2cefe82950
Fix OSX null-pointer-arithmetic error
2020-06-08 00:08:07 -04:00
Hannu Hanhi
0e521922c6
Change some unsigned ints to UINT32
2020-06-07 21:32:52 +03:00
Hannu Hanhi
abe13651d0
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
MascaraSnake
de7a806ec3
Merge branch 'nospinmovecut' into 'next'
...
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
Hannu Hanhi
da98ea242e
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
SteelT
db32b01222
Merge branch 'renderstats' into 'sal-oglshaderport'
...
Render stats
See merge request STJr/SRB2!914
2020-06-07 12:29:58 -04:00
SteelT
176361de1e
Merge branch 'shader-skywalls' into 'sal-oglshaderport'
...
Fix outdated sky wall code in shader branch
See merge request STJr/SRB2!906
2020-06-07 12:28:07 -04:00
sphere
82200d80a9
Fix mouse being grabbed in the continue screen.
2020-06-07 00:40:33 +02:00
Monster Iestyn
28550b221a
Merge branch 'master' into next
2020-06-06 20:50:12 +01:00
Monster Iestyn
d2fefb6b9a
use void rather than VOID, because the logging init code isn't exclusively Win32, whoops
2020-06-06 20:49:12 +01:00
Monster Iestyn
7e562a3ca5
Merge branch 'master' into next
2020-06-06 20:35:48 +01:00
Monster Iestyn
982d1db5d8
Merge branch 'cppcheck-fixes' into 'master'
...
Cppcheck fixes
See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
lachwright
f68a95016e
Merge branch 'next' into nospinmovecut
2020-06-07 02:45:26 +08:00
Monster Iestyn
a4d7ff3c6d
Merge branch 'master' into next
2020-06-06 17:39:43 +01:00
Monster Iestyn
56b8ea3587
added liolib.c to the VC10 project files, since it was missing from them
2020-06-06 17:38:35 +01:00
MascaraSnake
50b47a1b25
Merge branch 'translucent-splat-planes' into 'next'
...
Allow transparent parts in translucent FOF and PolyObject planes
See merge request STJr/SRB2!978
2020-06-06 04:35:06 -04:00
Monster Iestyn
71d4eb015a
Merge branch 'polyrotate-turnobjs-sync' into 'next'
...
Sync turnobjs for polyrotate_t thinkers in netgames
See merge request STJr/SRB2!979
2020-06-04 17:20:08 -04:00
Monster Iestyn
9e4ed738b7
Sync turnobjs for polyrotate_t thinkers in netgames
2020-06-04 21:31:26 +01:00
Monster Iestyn
cb7423b97e
sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean
2020-06-03 20:47:49 +01:00
Monster Iestyn
b11d58aef5
clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
...
(though that said we don't officially care about the win32 folder files anymore)
2020-06-03 20:47:49 +01:00
Monster Iestyn
5349a0bf62
V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?)
2020-06-03 20:47:49 +01:00
Monster Iestyn
bb1a2dbba7
sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code
2020-06-03 20:47:49 +01:00
Monster Iestyn
8092d30376
Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t
2020-06-03 20:47:49 +01:00
Monster Iestyn
7340442839
P_XYMovement: initialise slopemom to all zeros
2020-06-03 20:47:49 +01:00
