ca88db00cd
Create P_CeilingzAtPos function
2020-09-30 07:56:57 +01:00
e593610862
Fix NOHW compiling
2020-08-31 16:09:41 -07:00
6c2370f894
Kill NOHS
...
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
2aab765b36
Fix NOGME compiling
...
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
2020-08-31 16:04:09 -07:00
8d9b16df8c
Merge branch 'makefile-detect-system' into 'master'
...
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
89451d97fa
Merge branch 'default-warningmode' into 'master'
...
Use WARNINGMODE by default
See merge request STJr/SRB2!1122
2020-08-28 22:49:24 -04:00
6f51c68c72
Makefile: add WINDOWSHELL=1 for the Windows detect
2020-08-20 20:19:50 -07:00
f92026f98b
Makefile: automatically detect system to compile for, if no system was specified
...
This should work for mingw and linux so far.
2020-08-18 18:01:59 -07:00
9495e6354f
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
2020-08-18 16:45:00 -07:00
f0bf06aee2
Is it GCC is it gcc, is it????
...
(cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)
2020-08-18 16:37:19 -07:00
ec8fddf70c
Merge branch 'missing-gcc-flags' into 'master'
...
Add missing GCC version flags to the Makefile
See merge request STJr/SRB2!1087
2020-07-25 20:31:49 -04:00
4059c6a654
Update LATEST_GCC_VERSION too
2020-07-24 02:33:39 -07:00
00943e9e82
Add missing GCC version flags to the Makefile
2020-07-24 02:32:10 -07:00
d013dd0d9c
Merge branch 'masterserver' into 'master'
...
Fix the Master Server so it works
See merge request STJr/SRB2!856
2020-07-24 05:20:30 -04:00
3253ffbbc8
Merge branch 'cmake-adjustments' into 'master'
...
CMAKE additions: SDL Mixer X, *.debug adjustments, CPACK adjustments, CCACHE
See merge request STJr/SRB2!992
2020-07-13 12:40:13 -04:00
a02306b674
Fix small inconsistency
2020-07-12 19:38:38 -05:00
66929c3c62
Allow multiple ports to host under one IP address.
2020-07-12 19:38:24 -05:00
5f85c72279
Fix the Master Server so it works
...
Instructions:
1. In SQL, create an account called "srb2_ms" @ "localhost" (or your hostname).
2. Grant the account full priviledges to "srb2_ms" (the database).
3. Compile, and run using the sh script provided.
That's all I'm telling you, I don't want this to become rampant.
2020-07-12 19:38:15 -05:00
4985d94386
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
6f8dfb6fca
Merge branch 'version-prep-is-a-stinky-butt-head' into 'master'
...
Automate some of the version numbers nonsense
See merge request STJr/SRB2!1054
2020-07-12 18:45:51 -04:00
2ce30d2dd5
Merge branch 'gcc-detect-case' into 'master'
...
I guess GCC isn't always "GCC"
See merge request STJr/SRB2!1057
2020-07-11 20:42:19 -04:00
4e1d54c332
It's not always GCC, but it probably is gcc (I hope)
2020-07-11 12:45:35 -07:00
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
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
99e0c48f7b
Fix a lot of stuff related to the version automation
2020-07-10 22:39:46 -07:00
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
e22964ee0a
I screwed up
2020-07-10 23:16:18 -04:00
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
db6fc75b4f
Update player.dta hash
2020-07-10 20:53:42 -04:00
778089458c
Merge branch 'next' into 226-prep
2020-07-10 20:06:16 -04:00
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
f8aefc2fd3
Revert "Fix computation of very high pings"
...
This reverts commit 82dbe95e22
2020-07-11 01:55:40 +02:00
d9483dabfd
Merge branch 'next' into 226-prep
2020-07-10 19:11:28 -04:00
759f9171a2
Update patch.pk3 hash again
2020-07-10 19:09:49 -04:00
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
d87c874559
Fix GL y-shearing ignoring a Y-flipped transform
2020-07-10 19:19:51 -03:00
dcd56a7fe3
Update patch.pk3 hash and Srb2win.rc
2020-07-10 18:13:01 -04:00
958d397cdb
Merge branch 'marathoninfo' into 'next'
...
Marathon Run adjustments
See merge request STJr/SRB2!1048
2020-07-10 17:54:51 -04:00
307125e84e
Update version number
2020-07-10 17:29:03 -04:00
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
0e3af0a600
Merge branch 'bruhcorezone2' into 'next'
...
Bruh Core Zone 2
See merge request STJr/SRB2!1047
2020-07-10 17:16:53 -04:00
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
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
1956e9e670
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
2020-07-10 21:24:25 +01:00
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
ad57426713
Adjust model uvs to power of two texture if sprite texture is used
2020-07-10 23:05:21 +03:00
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
b442b5a916
Merge branch 'master' into next
2020-07-10 09:48:27 -04:00
cbd44cdeb1
let stop uploading 2 artifacts
2020-07-10 09:47:24 -04:00
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
Snu