stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 05:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
11955 commits 173 branches 41 tags 305 MiB
Commit graph

11955 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
00ceca8cc6 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
4985d94386 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R
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
James R
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
James R
839f086216 A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
Kays Ishaq
e849c9898e move dupenum declaration to beginning of block 2020-07-12 19:05:27 -04:00
James R
b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
ada06910dc Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
4b3d6f04f8 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails
df1fd0c456 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails
4710e4f07c Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails
6d3a2919a2 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00
GoldenTails
27c25bfa1e Expose P_SceneryXYMovement to Lua. 
Ironically this seems slightly more advanced than P_RingXYMovement...
 2020-07-12 18:02:50 -05:00
GoldenTails
6ac3d62321 Expose P_RingXYMovement to Lua. 
Ever wanted to move like a ring horizontally?
 2020-07-12 18:02:50 -05:00
GoldenTails
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
James R
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
James R
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
James R
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
James R
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
Monster Iestyn
ed70675df3 added some helpful comments, remove duplicate code 2020-07-12 22:37:36 +01:00
Monster Iestyn
b8a794e37f socklen_t isn't actually needed in either i_tcp.c or mserv.c if NONET is on! 
(also added some more tabbing)
 2020-07-12 22:29:15 +01:00
Monster Iestyn
0f4487eb68 * i_tcp.c: merge these three ifndef USE_WINSOCK blocks together 
* mserv.c: added i_tcp.c's USE_WINSOCK macros so socklen_t isn't redundantly defined if Winsock 2 is used
 2020-07-12 22:24:10 +01:00
Monster Iestyn
e133d8ec37 i_tcp.c: SCOUW2 and SCOUW7 haven't been defined since we got rid of Doom Legacy's makefiles for UnixWare 2/7 (which are ANCIENT), so get rid of them! 2020-07-12 22:08:35 +01:00
Monster Iestyn
43e53368b5 added tabbing to some of the preprocessor code in i_tcp.c and mserv.c to make it easier to read them (and to allow me to understand what I need to do for the next commit) 2020-07-12 21:31:25 +01:00
Monster Iestyn
8a032256bf don't define __USE_MINGW_ANSI_STDIO in makefiles 
(according to modern MinGW versions, defining this macro directly is deprecated)
 2020-07-12 21:02:24 +01:00
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