lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9313 commits 1 branch 29 tags 122 MiB
Commit graph

8142 commits

Author SHA1 Message Date
James R 9a1cb0e30e Merge branch 'software-dropshadows' into 'next' 
Software dropshadows

See merge request STJr/SRB2!660
 2020-01-17 18:56:13 -05:00
James R 96c91ce716 Merge branch 'r_ispointinsubsector' into 'next' 
Add R_IsPointInSubsector to lua baselib

See merge request STJr/SRB2!700
 2020-01-17 18:24:04 -05:00
Jaime Passos 999094f2f6 backwards compat 2020-01-17 16:11:17 -03:00
Alam Ed Arias b09341383f Merge branch 'master' into next 2020-01-17 11:12:10 -05:00
Alam Ed Arias b38921ff53 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master' 
Fuck NONET

See merge request STJr/SRB2!699
 2020-01-17 11:11:02 -05:00
fickleheart f59ed6b2f4 DOUBLE DAMNIT 2020-01-17 00:34:57 -06:00
fickleheart d39d8506ca Let nerds turn off shadows 2020-01-17 00:20:10 -06:00
fickleheart 919661ff8f Give me a break 2020-01-17 00:18:00 -06:00
fickleheart 4ca44f2d57 Bosses need dropshadows too 2020-01-17 00:16:15 -06:00
fickleheart 9a4ad20947 DAMNIT 2020-01-17 00:13:13 -06:00
fickleheart f0843cba13 Let vissprites have shadows too 
fuck it, hopefully it works
 2020-01-17 00:13:05 -06:00
Jaime Passos 8bfdb52231 add R_IsPointInSubsector to lua baselib 2020-01-17 00:49:43 -03:00
Jaime Passos 7adc108a2a typoe 2020-01-17 00:34:31 -03:00
James R e4f0fa46f5 Dumbass NONET stuff... 2020-01-16 18:07:28 -08:00
James R b6f68be52c Merge branch 'credits-woopises' into 'next' 
Add missing name to the credits

See merge request STJr/SRB2!696
 2020-01-16 20:33:35 -05:00
James R 098e41e518 Merge branch 'larger-chat' into 'master' 
Larger chat

See merge request STJr/SRB2!691
 2020-01-16 20:33:09 -05:00
James R d4e0bfe87f Merge branch 'snac-bruh' into 'master' 
Try to set a 21 character name and SIGABRT

See merge request STJr/SRB2!689
 2020-01-16 20:32:58 -05:00
James R d7b6a3dd61 Merge branch 'mserv-is-dumb-and-what-else-is-new' into 'master' 
-bindaddr for mserv

See merge request STJr/SRB2!688
 2020-01-16 20:32:49 -05:00
Alam Ed Arias b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
Alam Ed Arias d9742afb45 Merge remote-tracking branch 'origin/next' into next 2020-01-16 20:17:58 -05:00
Alam Ed Arias daab7a0d21 Merge remote-tracking branch 'origin/master' 2020-01-16 20:17:05 -05:00
James R f93ddc3f37 Merge branch 'keywords-back-again' into 'next' 
Level header keywords

See merge request STJr/SRB2!656
 2020-01-16 20:05:24 -05:00
James R f8666d6cee Merge branch 'word' into 'master' 
Word jumping

See merge request STJr/SRB2!653
 2020-01-16 20:05:12 -05:00
James R 601d4aec34 Merge branch 'FALLTHRU' into 'next' 
FALLTHRU versus fallthru, which will win?

See merge request STJr/SRB2!692
 2020-01-16 19:59:00 -05:00
James R 1be648578f Merge branch 'clear-sign-sprite' into 'next' 
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
 2020-01-16 19:57:54 -05:00
James R 1f36bde25f Merge branch 'musicdef' into 'next' 
MUSICDEF parser changes.

See merge request STJr/SRB2!599
 2020-01-16 19:35:38 -05:00
Steel Titanium 54ec64062c Revert "Move to the end of the list" 
This reverts commit 32c65ae844.
 2020-01-16 19:20:05 -05:00
Steel Titanium 32c65ae844 Move to the end of the list 2020-01-16 18:59:39 -05:00
Steel Titanium 4c6edd87df Restore this that got removed shomehow 2020-01-16 14:31:36 -05:00
Steel Titanium 36511afda9 Add missing name to the credits 2020-01-16 14:28:47 -05:00
Sally Cochenour 4e481340ce OpenGL shadows 2020-01-16 12:37:32 -05:00
Alam Ed Arias 709489cab8 Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Alam Ed Arias 0134be8b78 please stop breaking clang 2020-01-16 12:05:21 -05:00
Sally Cochenour 28cd5b2f03 Merge remote-tracking branch 'fickle/software-dropshadows' into gl-dropshadows 2020-01-16 09:38:12 -05:00
James R 36b9549b23 Merge branch 'locale-liberation' into 'master' 
Locale liberation

Closes #113

See merge request STJr/SRB2!677
 2020-01-15 23:38:40 -05:00
James R 55cc978f40 Merge branch 'extra-life-jingle' into 'master' 
Optionally use a sound for 1-Up

See merge request STJr/SRB2!668
 2020-01-15 23:38:21 -05:00
Louis-Antoine 0197a83db7 bruh 2020-01-15 15:57:38 +01:00
Louis-Antoine ec5db89e55 Cleanup chat code a little 2020-01-15 15:48:03 +01:00
Louis-Antoine 9504ba96da Increase maximum and default chat width 2020-01-15 15:36:11 +01:00
James R 1489b4bcdd It's FALLTHRU not fallthru 
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
 2020-01-15 02:14:20 -08:00
James R 708ab6ff90 Update buffer for SendNameAndColor 2020-01-14 21:40:58 -08:00
James R 619efb3d4e And free addrinfo 
(cherry picked from commit 986c80fb13e7ae6900792de5b4b43327af7ca76c)
 2020-01-14 19:33:52 -08:00
James R af2d3cfd16 Let MS_Connect use -bindaddr 
And so now you really can host from multiple IP addresses.

(cherry picked from commit e56bf12537700af7b7fcd0d3b0e8586e41edddd1)
 2020-01-14 19:33:52 -08:00
James R 68b78f44d8 Load flats first so textures with the same name are prefered on walls 2020-01-13 15:21:35 -08:00
James R 0d6b6efe0f Refactor R_LoadTextures into something manageable (no goto!!) 2020-01-13 15:20:50 -08:00
James R 223edd8ee0 Merge branch 'disable-titlemap-in-netgames' into 'master' 
Disable title map when entering a netgame

See merge request STJr/SRB2!683
 2020-01-13 16:47:17 -05:00
James R 339ceafdf0 Remove adminplayer from SERVERINFO (PACKETVERSION 2) 2020-01-12 20:21:35 -08:00
James R 84ac743d73 Kill Lua adminplayer 2020-01-12 20:04: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 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 f6244ec9a4 Disable title map when entering a netgame 2020-01-12 20:08:41 +01: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
fickleheart 9e101fc2bb Limit shadow Y scale to prevent graphical bugs 2020-01-12 09:10:09 -06:00
fickleheart cfb9b3c234 Expose mobj->shadowscale to Lua 2020-01-11 18:28:15 -06:00
fickleheart ba8ff3d502 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
fickleheart 1b0a3d0fe3 Use dedicated shadow graphic 2020-01-11 17:56:49 -06:00
fickleheart 4e5f49c60d Fix player shadows while on rope hangs etc 2020-01-11 17:39:53 -06:00
fickleheart 27bd7e4a7f Merge remote-tracking branch 'upstream/next' into software-dropshadows 2020-01-11 17:09:57 -06:00
Monster Iestyn 1643e6623d whoops, forgot to do this 2020-01-11 20:24:43 +00:00
Monster Iestyn 9c8988ab57 Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff! 2020-01-11 18:48:47 +00: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
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
James R 134d1831e3 Menu option for 1upsound 2020-01-10 12:55:22 -08:00
James R 1113a13621 1upsound always plays a sound instead of jingle 2020-01-10 12:55:03 -08: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
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 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
MascaraSnake 682e683a71 Merge branch 'fakeplanes-colormap' into 'next' 
Don't create colormap data out of sidedef text for fake planes linedef

See merge request STJr/SRB2!648
 2020-01-09 15:04:33 -05:00
Tatsuru 10e9dd2c23 *bends over seductively to pick up whitespace* 2020-01-09 16:16:24 -03:00