Nev3r
|
9f06903d72
|
What the fuck was I thinking?
Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.
|
2020-07-11 11:01:05 +02:00 |
|
Nev3r
|
4013c0e0a1
|
Merge branch 'udmf-next' into udmf-multitag
|
2020-07-11 08:47:58 +02:00 |
|
Nev3r
|
a9dbf6daf6
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-11 08:47:32 +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 |
|
James R
|
99e0c48f7b
|
Fix a lot of stuff related to the version automation
|
2020-07-10 22:39:46 -07:00 |
|
James R
|
1757002ddb
|
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
|
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 |
|
Nev3r
|
ad55f5f872
|
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
|
2020-07-10 18:18:07 +02: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 |
|
Nev3r
|
710097a0ca
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-10 11:47:16 +02: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 |
|
GoldenTails
|
59bd6d45a3
|
Whose idea was it to make the aPNG speed 1/2x by default?!
|
2020-07-08 18:14:11 -05:00 |
|
lachwright
|
3226a5d699
|
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
|
2020-07-09 05:56:11 +08:00 |
|
lachwright
|
c28ed25628
|
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
|
2020-07-09 00:00:21 +08:00 |
|
SteelT
|
31364d2120
|
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
|
337ec7bf6c
|
Merge branch 'remove-tricks' into 'next'
Remove Software tricks
See merge request STJr/SRB2!1036
|
2020-07-07 13:47:33 -04:00 |
|
Lachlan Wright
|
b9a088b16f
|
Merge branch 'fix-autoexec-netvars' into 'next'
Fix autoexec file trying to set netvars when joining from command-line
See merge request STJr/SRB2!1040
|
2020-07-07 13:47:13 -04:00 |
|
Lachlan Wright
|
c8a34745e9
|
Merge branch 'm_rathon' into 'next'
M_RATHON header text
See merge request STJr/SRB2!1041
|
2020-07-07 13:46:53 -04:00 |
|
lachwright
|
994bf78fe2
|
Update Srb2win.rc
|
2020-07-08 00:48:01 +08:00 |
|
lachwright
|
129fd2e27b
|
Update patch.pk3 hash
|
2020-07-08 00:42:31 +08:00 |
|