GoldenTails
6d3a2919a2
Expose P_ZMovement to Lua.
...
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
27c25bfa1e
Expose P_SceneryXYMovement to Lua.
...
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
6ac3d62321
Expose P_RingXYMovement to Lua.
...
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
fe67781d68
Expose P_XYMovement to Lua.
...
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
James R
bc2f83ec05
Merge branch 'p-rail-thinker-lua-exposure' into 'next'
...
Expose P_RailThinker to Lua.
See merge request STJr/SRB2!1059
2020-07-12 18:54:28 -04:00
James R
6c875a8097
Merge branch 'marathoninfo2' into 'next'
...
Marathon Run fixes (Resolves #184 )
Closes #184
See merge request STJr/SRB2!1061
2020-07-12 18:47:38 -04:00
James R
f1a5f5952b
Merge branch 'fix-required-flat' into 'next'
...
Comment out unused border patch variables.
See merge request STJr/SRB2!1055
2020-07-12 18:42:42 -04:00
Monster Iestyn
d40022d75f
Merge branch 'ogl-sort-crash-fix' into 'next'
...
Fix crash by handling precip mobjs correctly in ogl sprite sorting
See merge request STJr/SRB2!1062
2020-07-12 15:44:58 -04:00
Hannu Hanhi
3a488c243f
Fix translucency comparison from previous commit
2020-07-12 22:23:15 +03:00
Hannu Hanhi
9909746718
Fix crash by handling precip mobjs correctly in ogl sprite sorting
2020-07-12 21:50:00 +03:00
toaster
0a625d3e19
Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from.
2020-07-12 19:00:58 +01:00
toaster
e1a217dc10
Two minor fixes for Marathon Mode.
...
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184 )
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
2020-07-12 13:00:08 +01:00
GoldenTails
7015e656ce
Expose P_RailThinker to Lua.
2020-07-12 00:36:22 -05:00
James R
84373b1726
Merge branch 'opengl-blending-fix' into 'next'
...
Fix ASTBlendPixel outputting empty pixels sometimes
See merge request STJr/SRB2!945
2020-07-11 20:57:30 -04:00
James R
6c3663812b
Merge branch 'ogl-linkdraw' into 'next'
...
MF2_LINKDRAW support for OpenGL
See merge request STJr/SRB2!1031
2020-07-11 20:52:11 -04:00
sphere
e95265a7fa
Comment out unused border patch variables, so GFZFLR01 isn't required anymore.
2020-07-11 12:11:26 +02:00
James R
6a54e5f4a6
Merge remote-tracking branch 'origin/master' into next
2020-07-10 23:04:50 -07:00
James R
8bcc2662d1
Merge branch 'netid-take-2' into 'next'
...
Use ordered id for netvars instead of shitty hash
See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
James R
df98601b12
Merge branch 'bubbleshieldoverhaul' into 'next'
...
Bubble Shield overhaul
See merge request STJr/SRB2!1046
2020-07-11 01:56:53 -04:00
James R
f336b1e979
Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master'
...
Adds the branch name into the version command printout when outside of DEVELOP mode.
See merge request STJr/SRB2!981
2020-07-11 01:48:38 -04:00
James R
5cebf5c7bf
Merge branch 'makefile-detect-version' into 'master'
...
Detect GCC version in Makefile
See merge request STJr/SRB2!1002
2020-07-11 01:47:50 -04:00
Steel Titanium
e22964ee0a
I screwed up
2020-07-10 23:16:18 -04:00
SteelT
cb13550bdb
Merge branch '226-prep' into 'next'
...
2.2.6 preparation
See merge request STJr/SRB2!1050
2020-07-10 21:12:35 -04:00
Steel Titanium
db6fc75b4f
Update player.dta hash
2020-07-10 20:53:42 -04:00
Steel Titanium
778089458c
Merge branch 'next' into 226-prep
2020-07-10 20:06:16 -04:00
LJ Sonic
3668c37d10
Merge branch 'revert-ping-fix' into 'next'
...
Revert "Fix computation of very high pings"
See merge request STJr/SRB2!1053
2020-07-10 19:58:40 -04:00
Louis-Antoine
f8aefc2fd3
Revert "Fix computation of very high pings"
...
This reverts commit 82dbe95e22
2020-07-11 01:55:40 +02:00
Steel Titanium
d9483dabfd
Merge branch 'next' into 226-prep
2020-07-10 19:11:28 -04:00
Steel Titanium
759f9171a2
Update patch.pk3 hash again
2020-07-10 19:09:49 -04:00
SteelT
bc138c5482
Merge branch 'gl-shearing-flip-fix' into 'next'
...
Fix GL y-shearing ignoring a Y-flipped transform
See merge request STJr/SRB2!1051
2020-07-10 19:07:16 -04:00
Jaime Passos
d87c874559
Fix GL y-shearing ignoring a Y-flipped transform
2020-07-10 19:19:51 -03:00
Steel Titanium
dcd56a7fe3
Update patch.pk3 hash and Srb2win.rc
2020-07-10 18:13:01 -04:00
toaster
958d397cdb
Merge branch 'marathoninfo' into 'next'
...
Marathon Run adjustments
See merge request STJr/SRB2!1048
2020-07-10 17:54:51 -04:00
Steel Titanium
307125e84e
Update version number
2020-07-10 17:29:03 -04:00
Nev3r
6c6f16e158
Merge branch 'ogl-model-spr-uv-fix' into 'next'
...
Fix models that use sprite textures
See merge request STJr/SRB2!1049
2020-07-10 17:17:52 -04:00
Nev3r
0e3af0a600
Merge branch 'bruhcorezone2' into 'next'
...
Bruh Core Zone 2
See merge request STJr/SRB2!1047
2020-07-10 17:16:53 -04:00
toaster
217ac14ac5
Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.
2020-07-10 21:36:37 +01:00
toaster
4c9cdcca0d
Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't.
2020-07-10 21:27:34 +01:00
toaster
1956e9e670
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
2020-07-10 21:24:25 +01:00
toaster
8a5069156f
Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners.
2020-07-10 21:16:28 +01:00
Hannu Hanhi
ad57426713
Adjust model uvs to power of two texture if sprite texture is used
2020-07-10 23:05:21 +03:00
toaster
205d4c8d20
Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.
2020-07-10 20:30:16 +01:00
Hannu Hanhi
5fdc4578db
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-10 21:14:57 +03:00
Snu
be8f0853ef
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
...
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Alam Ed Arias
b442b5a916
Merge branch 'master' into next
2020-07-10 09:48:27 -04:00
Alam Ed Arias
cbd44cdeb1
let stop uploading 2 artifacts
2020-07-10 09:47:24 -04:00
Snu
d392c59935
Changed Bubble Shield functionality
2020-07-10 05:59:10 +01:00
Lachlan Wright
12ea5398c8
Merge branch 'restore-supergold' into 'next'
...
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
See merge request STJr/SRB2!1042
2020-07-09 12:37:31 -04:00
Lachlan Wright
867728ca16
Merge branch 'custom-color-fixes' into 'next'
...
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
Closes #179 and #182
See merge request STJr/SRB2!1043
2020-07-09 12:37:16 -04:00
Lachlan Wright
abccc1bf34
Merge branch 'fix-apng-delay-consvar' into 'next'
...
Whose idea was it to make the aPNG speed 1/2x by default?!
See merge request STJr/SRB2!1044
2020-07-09 12:36:56 -04:00
