SteelT
665746f47e
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
3b6df8eecd
Update player.dta hash
2020-07-10 20:53:42 -04:00
Steel Titanium
04ec111365
Merge branch 'next' into 226-prep
2020-07-10 20:06:16 -04:00
LJ Sonic
9bd5da70f8
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
49ad2c7313
Revert "Fix computation of very high pings"
...
This reverts commit 8b78811651
2020-07-11 01:55:40 +02:00
Steel Titanium
6706dce882
Merge branch 'next' into 226-prep
2020-07-10 19:11:28 -04:00
Steel Titanium
7591f2ee7f
Update patch.pk3 hash again
2020-07-10 19:09:49 -04:00
SteelT
64538f97a1
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
fec258ccb8
Fix GL y-shearing ignoring a Y-flipped transform
2020-07-10 19:19:51 -03:00
Steel Titanium
f841fd3b1c
Update patch.pk3 hash and Srb2win.rc
2020-07-10 18:13:01 -04:00
toaster
25564e5cf5
Merge branch 'marathoninfo' into 'next'
...
Marathon Run adjustments
See merge request STJr/SRB2!1048
2020-07-10 17:54:51 -04:00
Steel Titanium
b53e6e834d
Update version number
2020-07-10 17:29:03 -04:00
Nev3r
455f8bdbe4
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
cca142f2af
Merge branch 'bruhcorezone2' into 'next'
...
Bruh Core Zone 2
See merge request STJr/SRB2!1047
2020-07-10 17:16:53 -04:00
toaster
7a8f44613c
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
517b243cb7
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
3c3143effa
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
2020-07-10 21:24:25 +01:00
toaster
bcf590328d
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
2ae0980d62
Adjust model uvs to power of two texture if sprite texture is used
2020-07-10 23:05:21 +03:00
toaster
1d0453c5d4
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
e63ad7d2bd
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-10 21:14:57 +03:00
Snu
b03a0ee735
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
ac69b100b0
Merge branch 'master' into next
2020-07-10 09:48:27 -04:00
Alam Ed Arias
107a1bae73
let stop uploading 2 artifacts
2020-07-10 09:47:24 -04:00
Sryder
ae249b2f67
Merge branch 'pathfind-shadowed-declaration' into 'master'
...
Fix shadowed declaration in pathfind code
See merge request KartKrew/Kart!294
2020-07-10 09:14:19 -04:00
Nev3r
9210b2ba0b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-10 11:47:16 +02:00
Snu
5f7175204f
Changed Bubble Shield functionality
2020-07-10 05:59:10 +01:00
James R
65550cc9b7
Make drift explode animation LONGER
2020-07-09 18:03:27 -07:00
Sryder
376f4d3116
Fix shadowed declaration in pathfind code
2020-07-10 01:32:46 +01:00
James R
dc83e6ee0b
Merge remote-tracking branch 'origin/master' into driftboost
2020-07-09 16:48:33 -07:00
James R
856eda9f95
Don't scale drift explosion
2020-07-09 16:48:21 -07:00
James R
f1648fbf5c
Followers compiler warnings
2020-07-09 16:39:47 -07:00
James R
8399079f35
Merge branch 'followme-internal' into 'master'
...
Followers
See merge request KartKrew/Kart!252
2020-07-09 19:15:37 -04:00
Latapostrophe
fb978f9b91
Merge branch 'v2-master' into followme-internal
2020-07-09 23:34:24 +02:00
Sryder
7d17046942
Merge branch 'flameshield-dist' into 'master'
...
Fix Flameshield in mapobjectscale maps.
See merge request KartKrew/Kart!292
2020-07-09 12:59:17 -04:00
Sryder
c6c81c7fab
Fix Flameshield in mapobjectscale maps.
...
FixedMul instead of FixedDiv
2020-07-09 17:54:28 +01:00
Lachlan Wright
ed1371e91c
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
c908461206
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
3dfb3ed6be
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
Sal
e81c192a9f
Merge branch 'replay-hut-addon-crash-fix' into 'master'
...
Fix replay hut menu crashing when trying to display missing skins 2 electric boogaloo
See merge request KartKrew/Kart!291
2020-07-09 02:05:13 -04:00
James R
e250796886
WIP "Drift explosion"
2020-07-08 21:30:34 -07:00
SteelT
d67ad1a08f
Fully fix replay hut crashing if addons isn't loaded.
2020-07-09 00:29:46 -04:00
James R
47a7c285de
Merge branch 'pathfind-realloc-fix' into 'master'
...
Pathfinding reallocation fix
See merge request KartKrew/Kart!290
2020-07-08 22:05:18 -04:00
GoldenTails
54901c3c15
Whose idea was it to make the aPNG speed 1/2x by default?!
2020-07-08 18:14:11 -05:00
Sal
5397594ceb
Merge branch 'i-am-jimita' into 'master'
...
Line feeds don't work when drawing strings
See merge request KartKrew/Kart!289
2020-07-08 18:54:01 -04:00
lachwright
c5d74a1859
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
2020-07-09 05:56:11 +08:00
Sryder
87069a86d8
Fix the cause of the waypoint debug message spam in Canyon Rush.
...
Not calling the indexchanged callback here meant that if K_BHeapSortDown didn't make any changes, the item at index 0 would never call the callback despite changing position.
2020-07-08 21:36:28 +01:00
Sryder
c7a00d4800
Update pointers to nodes when the nodesarray is reallocated.
...
Fixes crash in Gust Planet.
2020-07-08 18:01:47 +01:00
lachwright
a8a112393f
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
2020-07-09 00:00:21 +08:00
SteelT
5242d77c12
Merge branch '225-prep' into 'next'
...
2.2.5 preparation
See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
