734033250d
Fix skincolor-related memory leak
2020-07-14 17:09:31 -05:00
893ff0fa19
Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust
2020-07-14 20:30:56 +03:00
7f9175033d
minor lua fixes
...
minor lua fixes
2020-07-14 01:34:57 -04:00
29a116ba81
Fix lib_freeslot
2020-07-13 18:56:07 -04:00
34bd0d9fe7
Merge branch 'various-color-fixes' into 'next'
...
Various color fixes
See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
f541c37ebc
Fix formatting
...
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
2020-07-13 15:16:49 -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
f5c5ec000d
Use SRB2VERSION here...
2020-07-13 08:59:41 -07:00
93615b07be
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07: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
00ceca8cc6
Merge remote-tracking branch 'origin/master' into next
2020-07-12 17:11:22 -07:00
4985d94386
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
42b0ab1851
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
5bcc821a7d
Merge branch 'remove-glide-2' into 'next'
...
Remove references to the Glide API
See merge request STJr/SRB2!1037
2020-07-12 19:10:34 -04:00
839f086216
A few more instances of "gr" to purge
2020-07-12 16:09:43 -07:00
e849c9898e
move dupenum declaration to beginning of block
2020-07-12 19:05:27 -04:00
b9a24001d8
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
ada06910dc
Expose P_MovePlayer to Lua.
2020-07-12 18:02:50 -05:00
4b3d6f04f8
Expose P_PlayerZMovement to Lua.
...
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
df1fd0c456
Expose P_SceneryZMovement to Lua.
...
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
4710e4f07c
Expose P_RingZMovement to Lua.
...
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
6d3a2919a2
Expose P_ZMovement to Lua.
...
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
27c25bfa1e
Expose P_SceneryXYMovement to Lua.
...
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
6ac3d62321
Expose P_RingXYMovement to Lua.
...
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
fe67781d68
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
bc2f83ec05
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
6c875a8097
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
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
f1a5f5952b
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
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
3a488c243f
Fix translucency comparison from previous commit
2020-07-12 22:23:15 +03:00
9909746718
Fix crash by handling precip mobjs correctly in ogl sprite sorting
2020-07-12 21:50:00 +03:00
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
a73f468ea4
Don't check empty string for duplicate name
2020-07-12 12:02:49 -04:00
6e4b14588c
Update lua_infolib.c
2020-07-12 11:12:16 -04:00
ec13272d8c
Adjust model uvs when used sprite texture changes
2020-07-12 18:04:56 +03:00
a734129eae
lua_isboolean -> lua_toboolean
...
solves bugged set field accessible
2020-07-12 10:07:32 -04:00
2cdfb8ffc6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-12 14:59:38 +02:00
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
74cfeaff30
A bit of cleaning
2020-07-12 07:56:25 -04:00
0f9e3554e2
various color fixes
2020-07-12 07:39:52 -04:00
7015e656ce
Expose P_RailThinker to Lua.
2020-07-12 00:36:22 -05:00
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
da3ab1a14c
Ok fiiineee, I'll support 2.2
2020-07-11 21:59:54 -05:00
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
1f1589384a
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05:00
999d8018ca
Oops! Missed a couple...
2020-07-11 21:59:54 -05:00
8b140b1831
Replace 'use' with 'spin' in game control constants
2020-07-11 21:59:54 -05:00
SwitchKaze