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

9209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos 7adc108a2a typoe 2020-01-17 00:34:31 -03: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
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 51f1f4f2b1 Also check ALTTITLE 2020-01-16 16:46:31 -08:00
James R 90c9a467f3 Bah it's a new year! 2020-01-16 16:45:52 -08: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
James R f9dd5056c6 musicdef-2.2.1 for converting 2.2.0 MUSICDEF to new format 2020-01-16 16:36:10 -08: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
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
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
James R 06105f6d8f Merge branch 'flats-in-walls-fix' into 'master' 
Prefer textures on walls, not flats

See merge request STJr/SRB2!687
 2020-01-15 23:37:41 -05: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 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 acb3372644 Merge branch '@moderator' into 'next' 
Kill adminplayer for good

See merge request STJr/SRB2!686
 2020-01-13 16:47:49 -05: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 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 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
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