stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
9170 commits 171 branches 41 tags 312 MiB
Commit graph

9170 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
ffbca6a646 Revert "Lua 'global' keyword, only for functions for now because I'm tired" 
This reverts commit db4dc10100.
 2020-01-17 14:54:22 -08:00
James R
c097101e48 Make functions implicit local 2020-01-17 06:08:23 -08:00
James R
db4dc10100 Lua 'global' keyword, only for functions for now because I'm tired 2020-01-17 06:06:29 -08:00
James R
ba5424791c Remove the stupid implicit global warning that is now impossible to trigger 2020-01-17 04:35:55 -08:00
James R
cba8f77e5b Uhhhhhhhh 2020-01-17 04:32:54 -08:00
James R
7ecaadba7e Make implicit Lua global variables local 2020-01-17 04:27:39 -08:00
James R
d96719da67 No memory leak please 2020-01-12 20:52:05 -08:00
James R
bff6875b95 Merge branch 'fangpogo' into 'next' 
Make Fangboss' player pogo a little less bullshit.

See merge request STJr/SRB2!676
 2020-01-12 17:54:02 -05:00
James R
2b95ea0135 Merge remote-tracking branch 'origin/master' into next 2020-01-12 14:17:52 -08:00
James R
2bb8b85754 Merge branch 'split-emblem-hints' into 'next' 
"Symmetrical"-ish Emblem Hint pages

See merge request STJr/SRB2!670
 2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony
66c9e8e3aa Fix "symmetrical"-ish emblem hints for ERRORMODE 
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
 2020-01-12 23:09:27 +01:00
LJ Sonic
6eba68bc3b Merge branch 'fix-node-player-mixups' into 'master' 
Fix node player mixups

See merge request STJr/SRB2!684
 2020-01-12 15:57:20 -05:00
James R
70bd7132c5 Merge branch 'egg2pogo' into 'next' 
Egg Slimer Pogo Bruh Moment (resolves #112)

See merge request STJr/SRB2!674
 2020-01-12 15:43:24 -05:00
James R
34b42507d1 Merge branch 'targetproblem' into 'next' 
Homing Targetting Issues

See merge request STJr/SRB2!671
 2020-01-12 15:43:08 -05:00
LJ Sonic
2c0bdc71b0 Merge branch 'refactor-kicks' into 'fix-node-player-mixups' 
Replace all instances of XD_KICK with a SendKick function

See merge request STJr/SRB2!682
 2020-01-12 15:41:18 -05:00
LJ Sonic
34f73ec083 Merge branch 'fix-node-player-mixups' into 'master' 
Fix node numbers being used in place of player numbers

See merge request STJr/SRB2!681
 2020-01-12 15:40:25 -05:00
James R
50d1226224 Merge branch 'you-cant-escape-console' into 'master' 
Open the console in menus and draw backpic correctly

See merge request STJr/SRB2!665
 2020-01-12 15:38:51 -05:00
James R
5d6d6a7d4d Merge branch 'escape-console' into 'master' 
Let Escape close the console

See merge request STJr/SRB2!664
 2020-01-12 15:38:35 -05:00
Louis-Antoine
e9108de365 Replace all instances of XD_KICK with a SendKick function 2020-01-12 19:43:04 +01:00
Louis-Antoine
5b34923352 Fix node numbers being used in place of player numbers 2020-01-12 18:34:08 +01:00
Monster Iestyn
c7ab065b0a Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
toaster
a5ad02eab9 Make Fangboss' player pogo a little less bullshit by having an actually sensible calculation instead of trying to be smart. 
The old behaviour was trying way too hard to be smart and as a consequence made the hitbox way too huge.
 2020-01-11 17:08:08 +00:00
toaster
e938f16fef Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????) 2020-01-11 16:40:42 +00:00
MascaraSnake
661c44b260 Merge branch 'udmf-vslopes' into 'next' 
Add textmap vertex slope support

See merge request STJr/SRB2!633
 2020-01-11 10:02:51 -05:00
toaster
926cbc4141 Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place. 2020-01-11 14:41:37 +00:00
Zwip-Zwap Zapony
e6ddfc7cdf Make >5 <10 emblem hints appear "symmetrical"-ish 
With more than 5 but less than 10 emblem hints,
only put half of the hints on each side of the hint menu,
instead of putting e.g. 5 on the left and 1 on the right.
 2020-01-11 14:59:10 +01:00
Nev3r
afcaa94cd0 Clarify ambiguity regarding mapthing-based vertex slopes. 2020-01-11 08:53:29 +01:00
James R
fef72c6009 Merge branch 'unsigned-bruh' into 'next' 
Fix incorrect cast

See merge request STJr/SRB2!669
 2020-01-11 02:26:52 -05:00
MascaraSnake
2046f524c7 Fix incorrect cast 2020-01-10 23:32:31 +01:00
James R
0345a32c37 Merge branch 'brickblockbustin' into 'next' 
Brick Block Bustin

See merge request STJr/SRB2!666
 2020-01-10 16:02:59 -05:00
James R
e1303a2b5c Merge branch 'orbital-flickering' into 'master' 
Don't give player translucency when looking down with the orbital camera

See merge request STJr/SRB2!659
 2020-01-10 16:02:44 -05:00
James R
dc151fc7a4 Merge branch 'accurate-papersprites' into 'master' 
Accurate papersprite projection

See merge request STJr/SRB2!657
 2020-01-10 16:02:23 -05:00
James R
407b00b22b Merge branch 'showconditionset' into 'next' 
Showconditionset

See merge request STJr/SRB2!651
 2020-01-10 15:59:37 -05:00
James R
2491046bc2 Merge branch 'morehints' into 'next' 
Allow for 10 emblem hints on a map by poking the drawer a bit.

See merge request STJr/SRB2!650
 2020-01-10 15:59:22 -05:00
James R
a16c444166 Merge branch 'playerthink-hook' into 'next' 
PlayerThink Hook

See merge request STJr/SRB2!557
 2020-01-10 15:58:30 -05:00
MascaraSnake
ba7a1c0375 Some minor cleanup 2020-01-10 19:56:29 +01:00
MascaraSnake
e532efa5d0 Merge branch 'stars-fix' into 'next' 
Add MT_FLINGNIGHTSSTAR mobj type

See merge request STJr/SRB2!663
 2020-01-10 13:34:43 -05:00
MascaraSnake
023624ebb7 Merge branch 'minor-ogl-improvements' into 'next' 
Minor OpenGL improvements

See merge request STJr/SRB2!661
 2020-01-10 13:32:37 -05:00
MascaraSnake
f691b2255b Merge branch 'extratextoffs' into 'next' 
Fix snapping of extra multiplayer text. (Resolves #101)

See merge request STJr/SRB2!667
 2020-01-10 13:31:57 -05:00
toaster
cbbc76b673 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
toaster
80b801e91e Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually. 2020-01-10 11:43:41 +00:00
James R
2459ca255f Factor z distance into camera translucency 2020-01-10 00:04:17 -08:00
James R
ef3d462eb7 Let the console open in menus 2020-01-09 22:42:00 -08:00
James R
48dd6b0580 Show Sonic's ass if con_backpic. No wait, I mean crop the backpic... 2020-01-09 22:39:01 -08:00
James R
3179797331 Let Escape close the console 2020-01-09 22:16:46 -08:00
James R
5c60f8b529 Merge branch 'software-fov' into 'master' 
Software FOV

See merge request STJr/SRB2!662
 2020-01-10 00:33:24 -05:00
James R
feb0fc2ee9 Merge branch 'orbital-disappearing' into 'master' 
Don't clip player MD2 when looking straight down with the orbital camera

See merge request STJr/SRB2!658
 2020-01-10 00:33:14 -05:00
James R
ced5ca81a4 Merge branch 'rollout_consistency' into 'next' 
Rollout Rockonsistency

See merge request STJr/SRB2!655
 2020-01-09 16:20:34 -05:00
Alam Ed Arias
71c2ee3850 whitespace cleanup 2020-01-09 16:19:12 -05:00
James R
57a31077e7 Merge branch 'public_hexang' into 'next' 
Hexafaceted sprite angle support.

See merge request STJr/SRB2!652
 2020-01-09 16:14:49 -05:00