Commit graph

13824 commits

Author SHA1 Message Date
James R
f8b659e4bd Merge branch 'various-color-fixes' into 'next'
Various color fixes

See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
kaysrishaq
9916f468a7 Fix formatting
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
2020-07-13 15:16:49 -04:00
James R
4982a79ca4 Use SRB2VERSION here... 2020-07-13 08:59:41 -07:00
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
3a34fa8561 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
6efedfc756 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R
2182018930 Merge branch 'p-xymovement-lua-exposure' into 'next'
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
16ce826caf A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
Kays Ishaq
639de75fc1 move dupenum declaration to beginning of block 2020-07-12 19:05:27 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
a913a8a652 Expose P_PlayerZMovement to Lua.
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2 Expose P_SceneryZMovement to Lua.
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae Expose P_RingZMovement to Lua.
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170 Expose P_ZMovement to Lua.
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
1fb799203c Expose P_SceneryXYMovement to Lua.
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
0bbd08f980 Expose P_RingXYMovement to Lua.
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
12bae0cb24 Expose P_XYMovement to Lua.
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
James R
6e8c1e237a Merge branch 'p-rail-thinker-lua-exposure' into 'next'
Expose P_RailThinker to Lua.

See merge request STJr/SRB2!1059
2020-07-12 18:54:28 -04:00
James R
a7c9f5d182 Merge branch 'marathoninfo2' into 'next'
Marathon Run fixes (Resolves #184)

Closes #184

See merge request STJr/SRB2!1061
2020-07-12 18:47:38 -04:00
James R
94484a0569 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
James R
386aab2688 Merge branch 'fix-required-flat' into 'next'
Comment out unused border patch variables.

See merge request STJr/SRB2!1055
2020-07-12 18:42:42 -04:00
Hannu Hanhi
107391f81c Fix translucency comparison from previous commit 2020-07-12 22:23:15 +03:00
Hannu Hanhi
3b46ffb422 Fix crash by handling precip mobjs correctly in ogl sprite sorting 2020-07-12 21:50:00 +03:00
toaster
90b46ebfe6 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
f5fe73571b Don't check empty string for duplicate name 2020-07-12 12:02:49 -04:00
Kays Ishaq
01d6f45642 Update lua_infolib.c 2020-07-12 11:12:16 -04:00
kaysrishaq
009f163847 lua_isboolean -> lua_toboolean
solves bugged set field accessible
2020-07-12 10:07:32 -04:00
Nev3r
d57d2959e0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02:00
toaster
de1257d524 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
2ee8418eab A bit of cleaning 2020-07-12 07:56:25 -04:00
kaysrishaq
be8f10d039 various color fixes 2020-07-12 07:39:52 -04:00
GoldenTails
e63c296e01 Expose P_RailThinker to Lua. 2020-07-12 00:36:22 -05:00
James R
1a10b098bb 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
6938812640 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
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