stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 19:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
11780 commits 172 branches 41 tags 285 MiB
Commit graph

11780 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
kaysrishaq
a73f468ea4 Don't check empty string for duplicate name 2020-07-12 12:02:49 -04:00
Kays Ishaq
6e4b14588c Update lua_infolib.c 2020-07-12 11:12:16 -04:00
Hannu Hanhi
ec13272d8c Adjust model uvs when used sprite texture changes 2020-07-12 18:04:56 +03:00
kaysrishaq
a734129eae lua_isboolean -> lua_toboolean 
solves bugged set field accessible
 2020-07-12 10:07:32 -04:00
Nev3r
2cdfb8ffc6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02: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
kaysrishaq
74cfeaff30 A bit of cleaning 2020-07-12 07:56:25 -04:00
kaysrishaq
0f9e3554e2 various color fixes 2020-07-12 07:39:52 -04:00
GoldenTails
7015e656ce Expose P_RailThinker to Lua. 2020-07-12 00:36:22 -05:00
GoldenTails
572bafa0f9 Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility 2020-07-11 21:59:54 -05:00
GoldenTails
da3ab1a14c Ok fiiineee, I'll support 2.2 2020-07-11 21:59:54 -05:00
GoldenTails
a2635b2b86 The only "use" that I had to change to "spin" after a manual half hour search 2020-07-11 21:59:54 -05:00
GoldenTails
1f1589384a Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails
999d8018ca Oops! Missed a couple... 2020-07-11 21:59:54 -05:00
GoldenTails
8b140b1831 Replace 'use' with 'spin' in game control constants 2020-07-11 21:59:54 -05:00
GoldenTails
8616823d7d Remove another unneeded comment 2020-07-11 21:59:54 -05:00
GoldenTails
7b4dee87e6 Remove unneeded comment 2020-07-11 21:59:54 -05:00
GoldenTails
457714e480 Remove 2 characters of whitespace 
This is what I get for using find+replace I guess lol
 2020-07-11 21:59:54 -05:00
GoldenTails
465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?) 
I'd use `next-major` but it doesn't exist lol
 2020-07-11 21:59:54 -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
James R
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
James R
479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
James R
2f30e81fdd ADD to the buffer size 
(cherry picked from commit bae37aea2c1b1ffab22f79e27415914f7e25fc89)
 2020-07-11 17:41:09 -07:00
James R
ab3878e282 masterserver_token is back 
(cherry picked from commit e7d949aeb2b9ef2297287ba35f9296684078f184)
 2020-07-11 17:41:09 -07:00
James R
0b5062d31c Set timeout on HMS connections 
(cherry picked from commit fcbe4e668f1ac79811d1ab2fb9cfd44729e56e93)
 2020-07-11 17:41:09 -07:00
James R
f32d91cc57 Resize response body buffer as needed 
(cherry picked from commit 85fef2655cc78c9453aed423f5a1df6011ce3262)
 2020-07-11 17:41:09 -07:00
James R
4e1d54c332 It's not always GCC, but it probably is gcc (I hope) 2020-07-11 12:45:35 -07:00
sphere
e95265a7fa Comment out unused border patch variables, so GFZFLR01 isn't required anymore. 2020-07-11 12:11:26 +02:00
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