James R
|
84d9aa93c7
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-07-11 17:41:46 -07:00 |
|
James R
|
3ebaedc695
|
ADD to the buffer size
(cherry picked from commit 3cdc6d07d0)
|
2020-07-11 17:41:09 -07:00 |
|
James R
|
44e1b6cd22
|
masterserver_token is back
(cherry picked from commit 44af4705bb)
|
2020-07-11 17:41:09 -07:00 |
|
James R
|
63ca2cb5ff
|
Set timeout on HMS connections
(cherry picked from commit 42484ae5ca)
|
2020-07-11 17:41:09 -07:00 |
|
James R
|
3aa4d2bfa8
|
Resize response body buffer as needed
(cherry picked from commit a73e4f135e)
|
2020-07-11 17:41:09 -07:00 |
|
James R
|
38ce80317d
|
It's not always GCC, but it probably is gcc (I hope)
|
2020-07-11 12:45:35 -07:00 |
|
sphere
|
421541a8bb
|
Comment out unused border patch variables, so GFZFLR01 isn't required anymore.
|
2020-07-11 12:11:26 +02:00 |
|
Nev3r
|
33176f3787
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-11 08:47:32 +02:00 |
|
James R
|
f15ec07aee
|
Merge remote-tracking branch 'origin/master' into next
|
2020-07-10 23:04:50 -07:00 |
|
James R
|
d06eb9dc5f
|
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
|
9ecfafc6fe
|
Merge branch 'bubbleshieldoverhaul' into 'next'
Bubble Shield overhaul
See merge request STJr/SRB2!1046
|
2020-07-11 01:56:53 -04:00 |
|
James R
|
71189da020
|
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
|
1e8a17d5bb
|
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 |
|
James R
|
f4989f36bd
|
Fix a lot of stuff related to the version automation
|
2020-07-10 22:39:46 -07:00 |
|
James R
|
d92afe87a0
|
Automate VERSION/SUBVERSION; move version related definitions to version.h
CMake support. Srb2win.rc still needs touchy, whatever.
|
2020-07-10 22:20:33 -07:00 |
|
Steel Titanium
|
2b63f1af4d
|
I screwed up
|
2020-07-10 23:16:18 -04:00 |
|
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 |
|
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 |
|
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 |
|
GoldenTails
|
54901c3c15
|
Whose idea was it to make the aPNG speed 1/2x by default?!
|
2020-07-08 18:14:11 -05:00 |
|
lachwright
|
c5d74a1859
|
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
|
2020-07-09 05:56:11 +08: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 |
|
Lachlan Wright
|
a050f04cd0
|
Merge branch 'remove-tricks' into 'next'
Remove Software tricks
See merge request STJr/SRB2!1036
|
2020-07-07 13:47:33 -04:00 |
|