stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-19 17:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
8604 commits 172 branches 41 tags 280 MiB
Commit graph

8604 commits

This branch
This branch
All branches
Author SHA1 Message Date
SteelT
4b1a402731 Merge branch 'key-out-of-range' into 'master' 
Don't set controls to keys of array bounds

See merge request STJr/SRB2!723
 2020-01-24 18:45:19 -05:00
SteelT
7d740efc78 Merge branch 'player2-turn-fix' into 'master' 
Fix "cam2_turnmultiplier"

See merge request STJr/SRB2!711
 2020-01-24 17:04:06 -05:00
SteelT
72996a50bf Merge branch 'ploadflat-bruh-bruh' into 'master' 
Fix P_AddLevelFlatRuntime again

See merge request STJr/SRB2!717
 2020-01-24 17:00:09 -05:00
SteelT
9a414ff5ab Merge branch 'fix-mouse-controls-setup' into 'master' 
Fix mouse in controls setup menu

See merge request STJr/SRB2!706
 2020-01-24 16:58:06 -05:00
James R
3d9466e5f5 Semantics 2020-01-23 13:57:39 -08:00
James R
f0daea39d4 Don't set controls to keys out of array bounds 
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
 2020-01-22 22:19:00 -08:00
James R
2373a0aa83 Actually actually match the old behavior and check existing levelflats in P_AddLevelFlatRuntime BRUH 2020-01-21 16:47:47 -08:00
SteelT
a6d49eaaa7
Merge pull request #447 from ConfusionAlphaX/local-resynch-fix 
Fix title screen broken when leaving during resynch
 2020-01-21 19:09:15 -05:00
James R
d90c0b8fbd Don't check "Too many flats in level" with P_AddLevelFlatRuntime 
Also moved the debug down in case anyone uses that.
 2020-01-21 15:35:07 -08:00
James R
9cd101c68d Revert "Fix Ploadflat closing the game with "Too many flats in level" error message" 
This reverts commit ea129f701c.
 2020-01-21 15:35:07 -08:00
Zwip-Zwap Zapony
c1097813f4 Fix "cam2_turnmultiplier" 
In splitscreen stuff, player 2's "cam2_turnmultiplier" implementation
was wrong compared to player 1's "cam_turnmultiplier"
This commit makes player 2's multiplier work just like player 1's does
 2020-01-20 16:14:20 +01:00
Confusion
ad505a6fe7 Fix title screen broken when leaving during resynch 2020-01-19 17:55:22 +03:00
Louis-Antoine
512435c59f Fix mouse in controls setup menu 2020-01-18 20:18:20 +01: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
James R
e4f0fa46f5 Dumbass NONET stuff... 2020-01-16 18:07:28 -08: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
daab7a0d21 Merge remote-tracking branch 'origin/master' 2020-01-16 20:17:05 -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
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
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
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
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
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
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
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
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