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

8109 commits

Author SHA1 Message Date
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
Tatsuru 3e3cb48feb This is stupid 2020-01-09 12:15:26 -03:00
Sally Cochenour 487e1b02f1 Remove smooth setting 
It got denied before for Software so I won't include it in the merge request :(
 2020-01-09 01:28:14 -05:00
fickleheart 7d2402ac62 Fix shadows under hiresscale characters 2020-01-08 23:33:43 -06:00
fickleheart 9e8d20504e Refactor shadow scale into an argument 2020-01-08 23:24:31 -06:00
fickleheart fa4b49d52c Refactor shadow floor finding code a bit 
I tried to fix ring shadows on polyobjects and got this in return:
https://media.discordapp.net/attachments/629477786943356938/664695818913185822/srb20156.png
 2020-01-08 23:19:52 -06:00
James R 66cf1be0d8 Don't clip player MD2 either! 2020-01-08 20:52:34 -08:00
James R 0f8c736188 Don't make player transparent if the orbital camera is looking straight down 2020-01-08 20:49:38 -08:00
fickleheart a7edf51cb9 Stop misusing papersprite vars for sprite skew 2020-01-08 21:52:10 -06:00
fickleheart ef4974ab4d Apply portal clipping to drop shadows too 2020-01-08 21:37:44 -06:00
fickleheart 8757194d73 Make ring shadows smaller and fix scale bug 2020-01-08 21:37:43 -06:00
fickleheart c078ab630d Fix more shadow crashes and save my sanity 2020-01-08 21:37:41 -06:00
fickleheart 9c49e020c3 FUCK IT, SLOPED SHADOWS NOW 2020-01-08 21:37:40 -06:00
fickleheart 5929b4797e This acursed crash-inducing typo spat in my face and called me a bitch 2020-01-08 21:37:39 -06:00
fickleheart c46c92d605 Prevent linkdraw sprites from connecting to shadows 2020-01-08 21:37:38 -06:00
fickleheart 48c1ce3ac3 Add render-based drop shadows to some objects 
Uses a hardcoded list for now. I was experiencing some
crashes with this, but the shadowyscale check seems to
have suppressed them.
 2020-01-08 21:37:36 -06:00
fickleheart ccc473917e Check for papersprites per-sprite instead of per-row 
In theory, should be a performance improvement. In practice idk
 2020-01-08 21:14:11 -06:00
fickleheart 1790891fd8 Reduce disappearance of vissprites close to the camera 2020-01-08 21:14:09 -06:00
fickleheart c0380a3052 Make papersprite projection completely correct in software 
I heard properpaper had some weird crashes? I couldn't reproduce
them no matter how hard I tried, but I added some bounds checking
to this version too just in case. Gotta get other people's help
to try to reproduce those.
 2020-01-08 21:14:07 -06:00
Zachary McAlpin 11d21dd950 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-08 18:52:56 -06:00
James R 735289502c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
toaster 004cfb45aa Allow Rollout Rocks that are being ridden to: 
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
 2020-01-08 22:36:29 +00:00
James R 74364b84f9 Revert "Oh right, the keywords..." 
This reverts commit a00dfcf420.
 2020-01-08 14:26:47 -08:00
toaster d89050f073 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang 
# Conflicts:
#	src/r_defs.h
 2020-01-08 21:47:47 +00:00
James R 7deb18bdc9 Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
James R 4d8c916ca1 Merge branch 'names-update' into 'master' 
Update copyright statements for changed names

See merge request STJr/SRB2!644
 2020-01-08 16:16:41 -05:00
James R 551df5f93a Merge branch 'state-fix' into 'next' 
Fix S_HAMMER being off by one

See merge request STJr/SRB2!654
 2020-01-08 16:15:55 -05:00
James R a63bd720b9 Merge branch 'next-newcontrols' into 'next' 
fcam simple controls but slightly less hacky

See merge request STJr/SRB2!647
 2020-01-08 16:15:47 -05:00
James R 117d5ab66f Merge branch 'highresscale-continue' into 'master' 
Apply skin's highresscale to continue screen

See merge request STJr/SRB2!645
 2020-01-08 16:15:15 -05:00
James R 6870492cf2 Merge branch 'more-opengl-fixes' into 'master' 
More OpenGL fixes plus masked PNG conversion

See merge request STJr/SRB2!619
 2020-01-08 16:14:51 -05:00
James R 3b90571987 Merge branch 'local-lua-commands' into 'next' 
Local Lua commands + no magic numbers

See merge request STJr/SRB2!602
 2020-01-08 16:14:30 -05:00
Steel Titanium 07dfc5cce7 Fix S_HAMMER being off by one 2020-01-08 16:00:02 -05:00
James R 8bc7b4c72d Give chat word jumping 2020-01-08 12:58:34 -08:00
James R 702b23ec3f Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
toaster 0b1108425d Hexafaceted sprite angle support (See merge request description coming soon). 
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
 2020-01-08 20:49:14 +00:00
toaster 377194b077 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset 
# Conflicts:
#	src/m_menu.c
 2020-01-08 20:00:50 +00:00
toaster d2da441a57 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints 
# Conflicts:
#	src/m_menu.c
 2020-01-08 19:18:35 +00:00
Sally Cochenour d49cd9755b Fullbright transparent planes 
(I disagree with this feature so hard but w/e)

(cherry picked from commit fe809b2734)
 2020-01-08 13:13:07 -05:00
Sally Cochenour 15075d4e1b More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software

(cherry picked from commit 74d7f256a7)
 2020-01-08 13:12:37 -05:00
Sally Cochenour 65a02b0f8f Increase precision of smooth contrast 
(cherry picked from commit 4c6664292e)
 2020-01-08 13:12:15 -05:00
Sally Cochenour ac365a0c81 Fake contrast 2020-01-08 13:11:53 -05:00
Sally Cochenour 6476a92817 Update blend textures to smooth out colors that have duplicate indices 2020-01-08 13:09:29 -05:00
James R 0d3c03ccd6 Left word jump (whoo that took long) 2020-01-08 02:54:17 -08:00
James R 9e703f935a Right word jump 2020-01-08 01:03:44 -08:00
MascaraSnake faac4ea545 Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore) 2020-01-08 09:28:37 +01:00
MascaraSnake 45404f7f27 Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-01-08 08:43:55 +01:00
MascaraSnake 031e7cfb82 Fix a condition in the flame jet thinkers I accidentally messed up 2020-01-08 08:43:36 +01:00
fickleheart 6211c80a69 Mixed code and declaration stuff 2020-01-08 00:22:17 -06:00
fickleheart 5abf0c24f9 oh god I forget why this is here but let's not remove it now 2020-01-08 00:21:03 -06:00
James R 0597d0ccbd Merge branch 'dashmode-tweaks' into 'next' 
Dashmode tweaks

See merge request STJr/SRB2!646
 2020-01-08 01:10:44 -05:00
fickleheart c133e645f7 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
lachwright 01b8bd21cc Dashmode tweaks: 
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
 2020-01-07 15:38:48 +08:00
James R fc1eff6eee Merge branch 'amyhearts-fix' into 'next' 
Fix NPC Amy's love hearts crashing if they didn't have a set fuse

See merge request STJr/SRB2!641
 2020-01-07 01:05:09 -05:00
lachwright e069e149d9 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
Tatsuru 360e8f28b4 ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Steel Titanium 808d731652 Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
MascaraSnake b95d1cef01 Merge branch 'ignore-glsegs' into 'next' 
Add missing glseg checks (and remove a superfluous one)

See merge request STJr/SRB2!642
 2020-01-06 17:08:32 -05:00
Alam Ed Arias 5b93230a94 Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias 21c224fce0 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake 759b1c82e2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
MascaraSnake 1cbf7aba0d Merge branch 'move-map-copying' into 'next' 
Reorder map loading

See merge request STJr/SRB2!635
 2020-01-06 04:24:39 -05:00
Alam Ed Arias 0fbc459243 cleanup whitespace 2020-01-05 21:49:07 -05:00
Tatsuru 07f9ddc45a Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru fce1313517 No comments 2020-01-05 23:19:52 -03:00
Tatsuru 664bce71de :amybruh: 2020-01-05 23:18:38 -03:00
James R 0bbc11c2a9 Merge branch 'lua-neatstuff' into 'next' 
Extra functionality for lua

See merge request STJr/SRB2!601
 2020-01-05 20:54:17 -05:00
Jaime Passos 03245b28fd Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos 9086b1851d Fix chroma key 2020-01-05 22:04:19 -03:00
James R ea3c36eb13 Merge branch 'fix-mouse-grabbing' into 'master' 
Fix mouse being grabbed even when not used

See merge request STJr/SRB2!639
 2020-01-05 18:46:13 -05:00
Louis-Antoine e847777a35 Fix mouse being grabbed even when not used 
The other way around this time.
 2020-01-06 00:40:28 +01:00
Louis-Antoine 88c8049c77 Revert "Fix mouse being grabbed even when not used" 
This reverts commit 6c85c4e1d3.
 2020-01-06 00:38:40 +01:00
James R 6af0249d01 Merge branch 'vgetcolorfixes' into 'master' 
Fix usage of V_GetColor

See merge request STJr/SRB2!638
 2020-01-05 17:12:21 -05:00
James R e4f88d142e Merge branch 'connect-ip-textbox' into 'master' 
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
 2020-01-05 17:06:45 -05:00
Jaime Passos d93adbacbb Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
Louis-Antoine 6c85c4e1d3 Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Jaime Passos deee2a0d6f I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile. 
Though, I left R_RainbowColormap alone.
 2020-01-05 03:20:05 -03:00
Jaime Passos 6d754821fb AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
MascaraSnake 18ccdd855a Merge branch 'remove-vertex-z-mk2' into 'next' 
Remove "z" from "vertex_t"

See merge request STJr/SRB2!636
 2020-01-04 19:31:16 -05:00
Alam Ed Arias 641ac72b3f Copy and Paste error 2020-01-04 18:34:16 -05:00
Alam Ed Arias 3bcf6b4b7e SpawnVertexSlops() is only used in p_slopes.c 2020-01-04 18:33:58 -05:00
Nev3r 72f23a1075 Add missing initialization on vertex heights for binary maps. 2020-01-04 23:01:01 +01:00
Nev3r a161bfa619 Merge branch 'remove-vertex-z-mk2' into udmf-vslopes 
# Conflicts:
#	src/lua_maplib.c
#	src/p_setup.c
#	src/r_defs.h
 2020-01-04 22:59:42 +01:00
Nev3r 9999be2d6e Remove vertex_t's z variable. 2020-01-04 18:29:02 +01:00
Nev3r 91222f7527 Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before. 
Adapt the rope hang snapping to the new function's form.
 2020-01-04 18:28:25 +01:00
fickleheart f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart f0e6a56b6b Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart 34fe284416 Fix camera stuff in splitscreen 2020-01-04 09:54:56 -06:00
fickleheart 794d74c4d7 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
Nev3r f207048ab2 Add Lua support for vertex heights. 2020-01-04 11:40:21 +01:00
Nev3r 49667689c1 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:27:31 +01:00
Nev3r 60999c7b84 Revert "Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components." 
This reverts commit c9294d1e32.
 2020-01-04 11:25:46 +01:00
Nev3r c9294d1e32 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:17:54 +01:00
MascaraSnake 1e42dc7ee5 Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else 2020-01-04 11:08:05 +01:00
Nev3r faf127ff88 Add vertex slope spawning function. 
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
 2020-01-04 10:39:45 +01:00
Nev3r 0b21a34ddd Add vertex height vars into the vertex struct, and their textmap parsing. 2020-01-04 10:24:42 +01:00
lachwright 5ce1695047 Merge branch 'next' into clear-sign-sprite 2020-01-04 14:50:17 +08:00
lachwright 6f5833f8b3 Randomize skin during signpost roulette 2020-01-04 14:49:44 +08:00
fickleheart eac8732bc8 Make holding both turn keys freeze camera direction (broke in merge) 2020-01-03 23:26:31 -06:00
MascaraSnake a6926e339f Merge branch 'no-compress' into 'next' 
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it

See merge request STJr/SRB2!628
 2020-01-03 16:38:42 -05:00
MascaraSnake 26bb0b3c67 Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it 2020-01-03 21:50:27 +01:00
Alam Ed Arias a26c5f5428 Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
MascaraSnake 7b5f2f09c0 Merge branch 'textmap-parser' into 'next' 
Textmap parser

See merge request STJr/SRB2!604
 2020-01-03 04:14:38 -05:00
lachwright da226139f1 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
Louis-Antoine b45ee059e3 Fix major issue 2020-01-03 02:58:23 +01:00
James R 12e87d58b4 Merge branch 'findvar' into 'next' 
CV_FindVar for Lua

See merge request STJr/SRB2!583
 2020-01-02 20:54:16 -05:00
LJ Sonic ff8cb3ddb0 Merge branch 'do-not-save-netvars' into 'master' 
Do not save netgame-synced console variables

See merge request STJr/SRB2!623
 2020-01-02 20:50:00 -05:00
LJ Sonic c6aec51d99 Merge branch 'ungrab-mouse-in-menus' into 'master' 
Let the mouse move freely when a menu is open or game is paused

See merge request STJr/SRB2!617
 2020-01-02 18:48:38 -05:00
Louis-Antoine 1845266bc8 Do not save netgame-synced console variables 
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
 2020-01-03 00:40:49 +01:00
Louis-Antoine 49934007d7 Add a "alwaysgrabmouse" console variable 2020-01-03 00:25:58 +01:00
MascaraSnake dc0c17dbb8 P_LoadExtendedSubsectorsAndSegs: Print size_t with %s 2020-01-02 22:28:32 +01:00
Louis-Antoine e0e5e83869 Revert "Ungrab mouse when watching a record" 
This reverts commit 17636ccc01.
 2020-01-02 20:29:51 +01:00
MascaraSnake 5ba179ad7c Fix two bugs in extended segs loading, and add some error checking while I'm at it 2020-01-02 09:51:07 +01:00
Nami ad610ba4aa Move MobjLineCollide up a bit to where we first know for sure that we hit a line 2020-01-01 19:38:48 -08:00
James R 9931f0d58f Merge branch 'thiccnames' into 'next' 
Allow 6-letter character names to be drawn with the thick font

See merge request STJr/SRB2!618
 2020-01-01 21:49:13 -05:00
James R 69dd8acf7f Merge branch 'sstailscarry-fix' into 'next' 
Fix MP Special Stages crashing if a player is being carried when it ends

See merge request STJr/SRB2!615
 2020-01-01 21:49:01 -05:00
James R 99f020adb6 Merge branch 'sound-slots' into 'next' 
Add slots for unused sounds and remove unused sound slots

See merge request STJr/SRB2!603
 2020-01-01 21:48:46 -05:00
Zachary McAlpin 93e9bb661e Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:54:47 -06:00
James R a358702700 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:53:18 -08:00
James R b9cecea25c Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
Louis-Antoine 3af00ac93e Minor code refactoring 2020-01-02 00:47:20 +01:00
Louis-Antoine 17636ccc01 Ungrab mouse when watching a record 2020-01-02 00:46:50 +01:00
Louis-Antoine 5bde4df439 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
Zachary McAlpin d62cd2ac06 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:39:13 -06:00
James R 0c40a466d8 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
Louis-Antoine 62397a36ec Grab mouse on game startup 2020-01-02 00:38:43 +01:00
MascaraSnake 02acf6222b P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code 2020-01-02 00:32:29 +01:00
Zachary McAlpin dc51ba6b64 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:11:19 -06:00
James R 85fbf4f571 Merge branch 'custom-gametype-serverinfo' into 'next' 
Gametype name in SERVERINFO

See merge request STJr/SRB2!610
 2020-01-01 17:52:46 -05:00
James R e9843590da Merge branch 'nohw-renderswitch' into 'master' 
NOHW V.S. Renderer Switching

See merge request STJr/SRB2!609
 2020-01-01 17:52:35 -05:00
MascaraSnake 2da9c3cf81 P_LoadTextmap: Bail out if certain mandatory fields are not set 2020-01-01 23:52:30 +01:00
James R 35fe2e7281 Merge branch 'quote-shenanigans' into 'master' 
Stuff I Broke: Commands

See merge request STJr/SRB2!607
 2020-01-01 17:52:21 -05:00
James R 01be810aee Merge branch 'warp-by-name' into 'master' 
Properly fix the issue that !528 tried to; let the -warp parameter work with map name

See merge request STJr/SRB2!596
 2020-01-01 17:51:21 -05:00
James R 48c83be89e Merge branch 'respawndelaygametyperule' into 'next' 
Gametype ruleset changes

See merge request STJr/SRB2!585
 2020-01-01 17:49:53 -05:00
Jaime Passos 874d4d01ee Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00