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

10798 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hannu Hanhi
b03e7f63c5 Fix shader comment 2020-07-19 16:07:53 +03:00
Hannu Hanhi
92ebbdfc10 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi
c1cf41fb0c Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
James R
7c2f81e4ed Merge branch 'next-lc-uint16' into 'next' 
Fix skincolor-related memory leak

See merge request STJr/SRB2!1066
 2020-07-16 22:01:07 -04:00
James R
fa90ff6bae Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
James R
d6b831053f Merge branch 'fix-lib_freeslot' into 'next' 
Fix lib_freeslot

See merge request STJr/SRB2!1064
 2020-07-14 18:32:10 -04:00
James R
30d27ded6e Merge branch 'minor-lua-fixes' into 'next' 
Minor Lua Fixes (CONS_Printf and mobj_t.valid)

See merge request STJr/SRB2!1065
 2020-07-14 18:32:00 -04:00
SwitchKaze
734033250d Fix skincolor-related memory leak 2020-07-14 17:09:31 -05:00
kaysrishaq
7f9175033d minor lua fixes 
minor lua fixes
 2020-07-14 01:34:57 -04:00
kaysrishaq
29a116ba81 Fix lib_freeslot 2020-07-13 18:56:07 -04:00
James R
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
kaysrishaq
f541c37ebc Fix formatting 
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
 2020-07-13 15:16:49 -04:00
James R
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
GoldenTails
a02306b674 Fix small inconsistency 2020-07-12 19:38:38 -05:00
GoldenTails
66929c3c62 Allow multiple ports to host under one IP address. 2020-07-12 19:38:24 -05:00
GoldenTails
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
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
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
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
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