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

7434 commits

Author SHA1 Message Date
Jaime Passos a138a3ab5f Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos 08794559f0 Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos 01399c7076 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos ff348fb60a Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos d80bfb4e94 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos 08d4a36f63 Texture blending port 
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
 2019-12-12 21:22:36 -03:00
James R 6dcdb8d951 Move everything to i_system.c 
This also simplifies things; SDL isn't initialized in the parent process.
 2019-12-12 15:08:27 -08:00
Jaime Passos 6c3111d809 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
James R 55f3f27b55 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Steel Titanium eb787c2b59 Move S_InitMusicDefs call outside of the check. 
As far as I know, this is competely safe.
 2019-12-12 16:32:40 -05:00
Jaime Passos 3bebfb279e Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos 58a08504c8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos a4b0195430 Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos 9246526e8a Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer 2019-12-12 17:39:18 -03:00
Jaime Passos f077d17301 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos db61d1a705 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos bf520b9e33 Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Steel Titanium 4af0cfae36 Init MUSICDEFs if started game with music off and toggled on 2019-12-12 15:17:50 -05:00
Jaime Passos b7c7529e75 Don't reset the FOV 2019-12-12 17:06:04 -03:00
Jaime Passos 08e3caf9bb Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos 792750ee48 Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
James R 7c383e4a1f nix: Fork before game code and wait to catch signals and coredumps 
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
 2019-12-11 23:46:57 -08:00
James R 0ff421d001 Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
Jaime Passos c578cee0b1 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
Jaime Passos 3ca0fbf5c3 da ba dee da ba die 2019-12-12 01:29:59 -03:00
Jaime Passos ea129f701c Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
Jaime Passos e01eb19044 Sad! 2019-12-11 22:11:00 -03:00
Jaime Passos 0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
James R 7a59ade63d Merge branch 'garbage' into 'master' 
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
 2019-12-11 19:19:29 -05:00
James R 6464df9876 Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright 8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos 37679bb44e Organise 2019-12-11 13:26:28 -03:00
Jaime Passos 9340557d2d Update f_wipe.c 2019-12-11 13:09:27 -03:00
Jaime Passos 43946d9826 Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Jaime Passos be13f463f0 Update r_plane.c 2019-12-11 12:36:54 -03:00
Jaime Passos dedd5527da Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Jaime Passos f531a8971f Update m_menu.c 2019-12-10 23:40:15 -03:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos f51253a0a8 Tilted water 2019-12-10 17:01:19 -03:00
James R 4f9e227830 Cvar and menu option to let user increase turn speed 
cam_turnmultiplier and cam2_turnmultiplier.

"Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera
Turning Speed" is now an option.
 2019-12-09 16:30:03 -08:00
Jaime Passos 4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos 5c02bc59db Speed up level loading 
Don't flush every texture just because the palette MAY have changed
 2019-12-08 22:28:13 -03:00
Jaime Passos c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos 7f58002e12 Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos 25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias d8eccc2921 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias 1d0cd586ba P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias 623629b04a OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias 35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos d74f2a003b HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly 
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
 2019-12-08 04:40:29 -03:00
Jaime Passos 4c808cb7e2 Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading 2019-12-08 04:32:25 -03:00
Jaime Passos d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos 964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos 40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
James R d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00
James R cadaecbfcf memset this or the stupid masterserver (used to) show garbage bytes 
Also for security I guess...
 2019-12-07 15:47:18 -08:00
mazmazz 2a9a2c0f02 Travis yflip error 2019-12-07 14:30:51 -05:00
mazmazz 0d41a55071 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -05:00
Jaime Passos 69c08f93bb Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake 79b04c5872 One more asset hash change 2019-12-07 14:17:26 +01:00
toaster 0bd1399c52 Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
Alam Ed Arias d02648450a Let fix that GCC warning 2019-12-06 18:12:50 -05:00
James R 53cfba1f42 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake 0d22970c78 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake f6563c85ed Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake 239242f513 Merge branch 'stretch-credits' into 'master' 
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
 2019-12-06 17:19:17 -05:00
MascaraSnake 78de32b623 Merge branch 'creditweak' into 'master' 
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
 2019-12-06 17:18:54 -05:00
Steel Titanium 5f9f255f77
Correct comment 2019-12-06 17:10:14 -05:00
toaster 66bd864592 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright 8f2d81ec74 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake a0ebb32912 Merge branch 'introskiptext' into 'master' 
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
 2019-12-06 16:48:29 -05:00
MascaraSnake a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
MascaraSnake f3fd5a50cb Merge branch 'signpost-cleanup' into 'master' 
Signpost fixes

See merge request STJr/SRB2Internal!602
 2019-12-06 15:58:46 -05:00
toaster 674fcd7923 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake f4c89c2dac Merge branch 'analogfixes' into 'master' 
Small analog mode fixes

See merge request STJr/SRB2Internal!604
 2019-12-06 15:32:10 -05:00
Steel Titanium f304931ac4
get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium 86cd363d16
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium f02418e70c
Fix copy+paste goof 2019-12-06 15:21:41 -05:00
Jaime Passos fcc4427de6 Update r_patch.h 2019-12-06 17:07:57 -03:00
Jaime Passos c4518cce9d Update r_patch.c 2019-12-06 17:05:36 -03:00
MascaraSnake 201cdef381 Merge branch 'f12fix' into 'master' 
Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
 2019-12-06 15:01:28 -05:00
Alam Ed Arias 1f183e1c1f Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake e105c2f749 Merge branch 'undo_double' into 'master' 
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
 2019-12-06 14:28:41 -05:00
Jaime Passos d7bfe7d652 Merge branch 'lt-extraneous-parameters' into 'master' 
Remove unnecessary function parameters from title card code

See merge request STJr/SRB2Internal!603
 2019-12-06 14:22:39 -05:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
lachwright 2e77970526 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08:00
lachwright 4a26aec031 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
lachwright e7574957bc Hopefully fix F12 issues 2019-12-07 01:52:40 +08:00
toaster 6e8299f39d Update comments in the config on when main assets/patch.pk3 hashes have been updated (I know MS is going to update the hashes again later, but this'll still be valid to have done then). 2019-12-06 17:38:23 +00:00
toaster fd6ecb4425 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster 1684cf76bd Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster 9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). 
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
 2019-12-06 17:14:51 +00:00
lachwright c4f48ee979 Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
MascaraSnake c468ae5239 Merge branch 'rockcrumblefix' into 'master' 
Edit some rock crumble states to match new sprites.

See merge request STJr/SRB2Internal!601
 2019-12-05 17:10:34 -05:00
MascaraSnake 69da1a7733 Merge branch 'perfectra' into 'master' 
Record Attack perfect bonus stuff

Closes #457

See merge request STJr/SRB2Internal!607
 2019-12-05 17:02:38 -05:00
MascaraSnake bbc5d33266 Merge branch 'notutclear' into 'master' 
Fix clearing maps/unlockables causing crashes and hangs.

See merge request STJr/SRB2Internal!609
 2019-12-05 17:02:10 -05:00
MascaraSnake 87843365fc Merge branch 'nightslevsel' into 'master' 
NiGHTS Attack left-right level selection

See merge request STJr/SRB2Internal!608
 2019-12-05 16:53:21 -05:00
MascaraSnake 6393542dc3 Merge branch 'wordwrapfix' into 'master' 
Fix V_WordWrap and the new additional text colour codes.

See merge request STJr/SRB2Internal!612
 2019-12-05 16:32:30 -05:00
MascaraSnake adfbf3630c Merge branch 'tailsbubblefix' into 'master' 
Tails Bubble Fix

See merge request STJr/SRB2Internal!606
 2019-12-05 16:20:24 -05:00
MascaraSnake 114753e2fe Merge branch 'paperfix2' into 'master' 
Another potential papersprite crash fix

Closes #456

See merge request STJr/SRB2Internal!605
 2019-12-05 16:19:33 -05:00
Alam Ed Arias c0ec90901e frameFrame is unsigned, let set it to 0xFF 2019-12-05 15:50:44 -05:00
toaster b2e9e8fb18 Fix V_WordWrap and the new additional text colour codes. 2019-12-05 19:43:37 +00:00
Jaime Passos 7765dd538c Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 16:26:50 -03:00
Jaime Passos ed34cb8d79 Change st_overlay to cv_showhud.value 2019-12-05 16:25:19 -03:00
toaster 7bd5d291ce Fix unlockable checklist literally hanging if any unlockables are cleared. 2019-12-05 18:40:30 +00:00
Alam Ed Arias 3120c99eeb Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
Alam Ed Arias 0ca87560ab Fix building libpng and zlib with MSVC 2019-12-05 12:33:18 -05:00
Alam Ed Arias f1d2968c19 Merge branch 'public_next' into private 2019-12-05 11:18:33 -05:00
Alam Ed Arias b1571f81b1 Merge branch 'master' into next 2019-12-05 10:52:17 -05:00
Alam Ed Arias 0a24c82346 Fix building with MSVC 2019-12-05 10:51:55 -05:00
toaster 7f6c98f046 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00:00
toaster 848d7ad819 Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack. 2019-12-05 11:12:35 +00:00
toaster 2b5957fd1c Fix #457 and another bug I just realised in one fell swoop. 
That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
 2019-12-05 09:47:29 +00:00
toaster 25eacbffb8 Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay. 
Should resolve both #440 and #458, which are two sides of the same issue - target being overwritten.
 2019-12-05 09:36:58 +00:00
toaster 7c7f258c2d Another potential papersprite crash fix, but way more confident about this one. 2019-12-05 09:28:28 +00:00
lachwright cffc6a0e46 Fix diagonal input acceleration and glide directioning in analog mode 2019-12-05 15:59:16 +08:00
Jaime Passos 13c6b38b13 Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2 2019-12-05 02:03:09 -03:00
lachwright 28fbdab3d4 Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode 2019-12-05 12:58:44 +08:00
Jaime Passos c0cc742fb8 Remove unnecessary function parameters from title card code 2019-12-05 01:58:19 -03:00
Jaime Passos b5d5749bfb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 01:48:58 -03:00
Jaime Passos 7384522aef Fix Continue game state wipes 2019-12-05 01:47:51 -03:00
lachwright fdf3944f60 Merge branch 'master' into signpost-cleanup 2019-12-05 12:37:03 +08:00
lachwright 8ddfdf2d0f Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
sphere d1b456b893 Edit some rock crumble states to match new sprites. 2019-12-05 02:22:25 +01:00
Jaime Passos 6adb957f0f Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
MascaraSnake e6f1b82cc4 Merge branch 'minusoneframes' into 'master' 
Minus One Frames

See merge request STJr/SRB2Internal!593
 2019-12-04 17:15:51 -05:00
MascaraSnake 6b344b9ddf Merge branch 'freemipmapcolormap-momento-irmao' into 'master' 
Fix FreeMipmapColormap yet again

See merge request STJr/SRB2Internal!597
 2019-12-04 17:10:06 -05:00
MascaraSnake a7884e479a Merge branch 'timeoverrings' into 'master' 
Time Over rings (resolves #446).

Closes #446

See merge request STJr/SRB2Internal!596
 2019-12-04 17:09:32 -05:00
MascaraSnake 6928763961 Merge branch 'nullplayerslopelaunch' into 'master' 
Fix slope launch with NULL player causing SIGSEGV.

See merge request STJr/SRB2Internal!595
 2019-12-04 17:07:04 -05:00
MascaraSnake 01da9f7f16 Merge branch 'tokenultimate' into 'master' 
Fix tokens not spawning in ultimate mode

See merge request STJr/SRB2Internal!594
 2019-12-04 17:06:43 -05:00
MascaraSnake 5662f8de00 Merge branch 'credits-update' into 'master' 
Credits update

See merge request STJr/SRB2Internal!484
 2019-12-04 16:59:46 -05:00
MascaraSnake 6a811515db Merge branch 'have_png-compile-fix' into 'master' 
NO_PNG_LUMPS compile fix

See merge request STJr/SRB2Internal!598
 2019-12-04 16:59:13 -05:00
MascaraSnake 77d446cc04 Merge branch 'spsmshgular' into 'master' 
sfx_spsmsh (hhz spikeball) is now singular

Closes #451

See merge request STJr/SRB2Internal!599
 2019-12-04 16:58:56 -05:00
toaster fe0b92d01a sfx_spsmsh (hhz spikeball) is now singular 2019-12-04 20:32:46 +00:00
Jaime Passos 81cfca29d8 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Jaime Passos b646922967 fix Ploadflat warning 2019-12-04 15:41:29 -03:00
Jaime Passos 839251633c fix ErrorIfPNG errors 2019-12-04 15:26:51 -03:00
toaster e8ac1c391c Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value. 2019-12-04 17:32:47 +00:00
Alam Ed Arias c432f86624 change from shifting bits to multi for a OLD video function marco 2019-12-04 10:43:33 -05:00
Alam Ed Arias 0751f8987a Libs: move pngconf.h out of top level libpng source folder 2019-12-04 10:41:54 -05:00
toaster 7f82d7451d Fix slope launch with NULL player causing SIGSEGV. 2019-12-04 12:13:27 +00:00
Steel Titanium 41210708e2 Merge branch 'fade-timeout-fix' into 'master' 
Temporary fix for the fade timeout

See merge request STJr/SRB2Internal!592
 2019-12-03 20:19:33 -05:00
toaster c843f22a24 Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion. 2019-12-03 23:21:36 +00:00
MascaraSnake 20c1a0158d Added Sev to the Art section of the credits 2019-12-04 00:07:56 +01:00
MascaraSnake c2577b6eb3 Added more people to the credits and reorganized them slightly 2019-12-04 00:02:47 +01:00
MascaraSnake 602ba32ecc A few more credits additions/adjustments 2019-12-03 22:22:48 +01:00
toaster e75490c99d Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites. 
Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.
 2019-12-03 21:05:05 +00:00
MascaraSnake 7a8d1b4d4b Merge branch 'creditsart' into 'master' 
New credits art + credits header support

See merge request STJr/SRB2Internal!591
 2019-12-03 14:28:51 -05:00
Louis-Antoine 84e7672cca Temporary fix for the fade timeout 2019-12-03 12:02:14 +01:00
MascaraSnake 0c048d2667 Merge branch 'tailsbotdetect' into 'master' 
Attempt to detect Tailsbot and Sonic spawning on top of each other

See merge request STJr/SRB2Internal!584
 2019-12-03 02:20:30 -05:00
MascaraSnake f9460434f8 Merge branch 'savedatareorder' into 'master' 
Savedata load order of operations change

See merge request STJr/SRB2Internal!583
 2019-12-03 02:18:06 -05:00
MascaraSnake c30886a47f Merge branch 'botregrab' into 'master' 
Allow re-grabbing Tails AI mid-flight (resolves #428)

Closes #428

See merge request STJr/SRB2Internal!590
 2019-12-03 02:17:37 -05:00
MascaraSnake c1d5f411e0 Merge branch 'paperfixes' into 'master' 
Nail a likely culprit in papersprite rendering resolving #427 and #375.

Closes #427 and #375

See merge request STJr/SRB2Internal!589
 2019-12-03 02:16:26 -05:00
MascaraSnake ab400e926a Merge branch 'emeraldfall' into 'master' 
Fix emerald coordinate overflow in failed SS tally (resolves #421).

Closes #421

See merge request STJr/SRB2Internal!586
 2019-12-03 02:15:47 -05:00
MascaraSnake ba0dc5c884 Merge branch 'ideyagun' into 'master' 
Ideyagun (resolves #406).

Closes #406

See merge request STJr/SRB2Internal!582
 2019-12-03 02:15:26 -05:00
Alam Ed Arias b5738620c1 Fixup compiling errors 2019-12-02 12:12:26 -05:00
lachwright be3d7b7dcd - Remove y coordinate from struct for credits_pics 
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
 2019-12-02 22:24:05 +08:00
toaster 2bc67bf813 Allow re-grabbing Tails AI mid-flight (resolves #428) 2019-12-01 13:31:33 +00:00
toaster f21ebaea0c Nail a likely culprit in papersprite rendering for #427 and #375. 2019-12-01 13:21:41 +00:00
MascaraSnake ae2594e5ce Merge branch 'metalfix' into 'master' 
Boss Scream fix

See merge request STJr/SRB2Internal!581
 2019-12-01 02:26:24 -05:00
MascaraSnake 97fdc5aaf0 Merge branch 'introfix' into 'master' 
Fix intro's BRITEGG/DARKEGG scale

See merge request STJr/SRB2Internal!580
 2019-12-01 02:25:22 -05:00
sphere ec3548c7f4 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
toaster f662ef9454 Fix emerald coordinate overflow in failed SS tally (resolves #421). 2019-11-30 20:02:51 +00:00
sphere d9a88ec10c Promote some programmers, add Blade & CoatRack to texture artists. 2019-11-30 18:23:57 +01:00
toaster 515600c4d0 Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods). 2019-11-30 16:54:51 +00:00
mazmazz be44f0701e Clean up music error messages 2019-11-30 11:53:45 -05:00
toaster 6e278c1138 Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly. 2019-11-30 15:52:41 +00:00
toaster 3267a98fe9 Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
toaster 9d442ae6ea Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
toaster 2eb8e6be49 ...why is Metal overwriting his movecount to spawn explosions? 2019-11-30 14:37:21 +00:00
lachwright 6613286f1c Fix intro's BRITEGG/DARKEGG scale 2019-11-30 22:07:21 +08:00
MascaraSnake e664e8b7f3 Merge branch 'jumphood' into 'master' 
Jumphood

See merge request STJr/SRB2Internal!573
 2019-11-30 06:53:15 -05:00
lachwright d46f022837 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
toaster 85e3180056 Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA. 2019-11-30 10:31:18 +00:00
toaster 0d4158bbd0 Fix the flung Brak not being removed on deathpits. 2019-11-30 10:29:51 +00:00
MascaraSnake 0d433b9e51 Merge branch 'brakyeet' into 'master' 
This Black Eggman? ***YEET*** (resolves #399)

Closes #399

See merge request STJr/SRB2Internal!575
 2019-11-30 05:21:55 -05:00
MascaraSnake b22e8c809f Merge branch 'goldstatue' into 'master' 
Gold statue MTF_EXTRA

See merge request STJr/SRB2Internal!576
 2019-11-30 05:19:27 -05:00
toaster c2bd91af50 Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly. 2019-11-30 10:12:45 +00:00
MascaraSnake 23b0b03d4d Merge branch 'spd' into 'master' 
Deton alert sound

See merge request STJr/SRB2Internal!491
 2019-11-30 05:04:10 -05:00
MascaraSnake c72f501042 Merge branch 'sandtnoflip' into 'master' 
S&T no flip

See merge request STJr/SRB2Internal!571
 2019-11-30 05:03:07 -05:00
MascaraSnake 6bbc412eac Merge branch 'finalcountdown' into 'master' 
The final countdown (resolves #400).

Closes #400

See merge request STJr/SRB2Internal!574
 2019-11-30 04:03:07 -05:00
MascaraSnake 8a3c7da1d2 Merge branch 'mapinter' into 'master' 
Intermission Buffer Clear On Map Command (no funny name today)

See merge request STJr/SRB2Internal!570
 2019-11-30 04:02:44 -05:00
MascaraSnake 3bddd4365a Merge branch 'newintro' into 'master' 
New intro graphics

See merge request STJr/SRB2Internal!524
 2019-11-30 04:01:51 -05:00
lachwright 916fec2c41 Make INTRO4 display at high res 2019-11-30 12:31:23 +08:00
lachwright d88eef3e95 Merge branch 'master' into newintro 2019-11-30 12:30:12 +08:00
toaster 339907fd5d This Black Eggman? ***YEET*** 
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
 2019-11-29 21:55:25 +00:00
toaster fdcc8c912a Actually, wait; this is way better and cleaner. 2019-11-29 20:41:13 +00:00
toaster ed0529b9d5 Match final countdown timer to timer (resolves #400). 2019-11-29 20:35:59 +00:00
toaster 0db38d213b Make Cobalt-picked sound effect audible from far away, like the original. 2019-11-29 20:04:14 +00:00
toaster de34298bbd Merge branch 'master' into spd 2019-11-29 19:19:55 +00:00
toaster 1fa87611f7 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster 92f8c002f3 Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396). 2019-11-29 19:11:17 +00:00
toaster 960ee7fe72 Don't flip P1 of a two-character save card, for aesthetique reasons. 2019-11-29 15:58:37 +00:00
toaster cbc49882bc Fix screen buffer not being cleared if a map command is used during the intermission. 2019-11-29 15:25:55 +00:00
MascaraSnake bc00380aa4 Merge branch 'endelinger' into 'master' 
Endelinger (resolves #384).

Closes #384

See merge request STJr/SRB2Internal!569
 2019-11-28 16:10:04 -05:00
MascaraSnake ebcb17d607 Merge branch 'sleepwalkin' into 'master' 
Sleepwalkin (resolves most of #382)

Closes #382

See merge request STJr/SRB2Internal!567
 2019-11-28 16:08:40 -05:00
James R ccbb122143 Holy shit 2019-11-28 12:10:57 -08:00
MascaraSnake 2495e58bdb Merge branch 'campokes' into 'master' 
Camera pokes (resolves #359, #363, and #383).

Closes #359, #363, and #383

See merge request STJr/SRB2Internal!566
 2019-11-28 14:21:18 -05:00
toaster f5dd0c5c3b Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out (resolves #384). 2019-11-28 19:11:12 +00:00
MascaraSnake 546c54b390 Merge branch 'mpspecfix2' into 'master' 
Counting spheres (resolves #378).

Closes #378

See merge request STJr/SRB2Internal!564
 2019-11-28 13:54:47 -05:00
Louis-Antoine ec69195fc9 Keep counting players as finished even after dying 2019-11-27 17:32:02 +01:00
toaster 803b22a3e7 Change required for Tails' tails to behave like falling sprite. 2019-11-27 13:54:13 +00:00
toaster 7ff218efaf Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382). 2019-11-27 13:47:38 +00:00
toaster ae84246721 Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383). 2019-11-27 13:37:03 +00:00
LJ Sonic c29540a201 Merge branch 'exit-move-lj' into 'master' 
No more drowning with exitmove now.

See merge request STJr/SRB2Internal!563
 2019-11-27 08:17:22 -05:00
toaster bcbf5e7c38 Correct tutorialmode case doubling up on camerascale. 2019-11-27 12:54:00 +00:00
toaster 7ff4a9b1e7 Make camerascale have no effect in 2D mode (resolves #359 and resolves #363). 2019-11-27 12:31:23 +00:00
toaster a3050063cd Resolve #378, because I knew as soon as I saw that issue name that it was my fault. 2019-11-27 09:03:21 +00:00
MascaraSnake 9a1dd06776 Merge branch 'continuequestionmark' into 'master' 
Continue?

See merge request STJr/SRB2Internal!562
 2019-11-26 17:24:25 -05:00
MascaraSnake c8c52315fa Merge branch 'burningpoint' into 'master' 
Burning points (resolves #373).

Closes #373

See merge request STJr/SRB2Internal!561
 2019-11-26 17:24:22 -05:00
MascaraSnake 3aa72c5553 Merge branch 'ballstuck' into 'master' 
BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374)

Closes #374

See merge request STJr/SRB2Internal!560
 2019-11-26 17:24:20 -05:00
MascaraSnake 07afb52a2a Merge branch 'deadstuff' into 'master' 
Matters of mortality

See merge request STJr/SRB2Internal!558
 2019-11-26 17:24:17 -05:00
MascaraSnake b98b56670e Merge branch 'bottweaks' into 'master' 
Bot fixes

See merge request STJr/SRB2Internal!557
 2019-11-26 17:24:15 -05:00
MascaraSnake e49e91c355 Merge branch 'unslide' into 'master' 
Unslide (resolves #369).

Closes #369

See merge request STJr/SRB2Internal!556
 2019-11-26 17:24:12 -05:00
toaster c55a6cb3f8 MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this 2019-11-26 17:10:59 -05:00
toaster d56a117a93 Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer. 2019-11-26 18:25:36 +00:00
toaster fa01a32a7f Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373). 2019-11-26 17:56:42 +00:00
toaster 613ae0c9f8 Resolve #374. 2019-11-26 17:06:30 +00:00
toaster f50feb1639 Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.) 2019-11-26 12:37:57 +00:00
toaster b71cf97cac * Prevent that GOD AWFUL random camera turn that happens sometimes during the fade after you die (when you input camera turn stuff after death) by locking the camera during PST_REBORN. 
* Remove whitespace in P_DeathThink.
 2019-11-26 12:33:56 +00:00
toaster f1387a07a1 Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage. 2019-11-26 12:30:32 +00:00
toaster 6ac44415fb Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. 
Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
 2019-11-26 11:55:31 +00:00
toaster e8b3f84741 Prevent Tailsbot from considering flight when Sonic is exiting. 2019-11-26 11:53:49 +00:00
toaster 1dee1da7e3 Fix issue where you can get stuck in pain frames after stepping up, or after sliding (resolves #369). 2019-11-26 10:11:52 +00:00
Jaime Passos 67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake 05ee9c8a21 Merge branch 'paperslid' into 'master' 
SMOOTH PAPERCOLLISION TIME!!!!!!!!

Closes #273

See merge request STJr/SRB2Internal!554
 2019-11-25 17:07:56 -05:00
MascaraSnake 4c1c87df39 Merge branch 'xtrafix' into 'master' 
Stop being so XTRA (resolves #362).

Closes #362

See merge request STJr/SRB2Internal!552
 2019-11-25 17:02:32 -05:00
MascaraSnake 34baf101aa Merge branch 'nightsnoforce' into 'master' 
Charsel tweaks

See merge request STJr/SRB2Internal!551
 2019-11-25 16:54:27 -05:00
MascaraSnake 1128660c5c Merge branch 'fix-play-sfx-exec-part2' into 'master' 
Fix the "play sound from nowhere as long as you're in the tagged areas" behavior

See merge request STJr/SRB2Internal!553
 2019-11-25 16:54:08 -05:00
MascaraSnake 73bb913ec9 Merge branch 'paperprojection' into 'master' 
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
 2019-11-25 16:53:48 -05:00
MascaraSnake 858df0c704 Merge branch 'charlock' into 'master' 
Charlock (resolves #345).

Closes #345

See merge request STJr/SRB2Internal!528
 2019-11-25 16:44:38 -05:00
MascaraSnake f1584efe80 Merge branch 'unglue-metalsonic' into 'master' 
Unglue Metal Sonic after floating onto a platform

Closes #344

See merge request STJr/SRB2Internal!526
 2019-11-25 16:44:18 -05:00
MascaraSnake 8adcea56c3 Merge branch 'minusflip' into 'master' 
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
 2019-11-25 16:43:49 -05:00
MascaraSnake aaea0f095c Merge branch 'knuxstuff' into 'master' 
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
 2019-11-25 16:41:56 -05:00
MascaraSnake f54eeb82b7 -Fix player being able to push up spikes 
-Minor tweaks to make paper collision slightly more reliable
 2019-11-25 22:35:40 +01:00
toaster 64cda33d6d SMOOTH PAPERCOLLISION TIME!!!!!!!! 
resolves #273, damn i feel good
 2019-11-25 20:12:42 +00:00
Nev3r 1b360d2cd8 Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor. 2019-11-25 20:30:06 +01:00
toaster ef556ca6d5 Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check). 
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
 2019-11-25 18:52:38 +00:00
MascaraSnake 8596445de6 Merge branch 'statisticase' into 'master' 
Statisticase (resolves #339).

Closes #339

See merge request STJr/SRB2Internal!531
 2019-11-25 13:21:09 -05:00
MascaraSnake 3a12c13e50 Merge branch 'nightsmode-menu-fix' into 'master' 
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353)

Closes #353

See merge request STJr/SRB2Internal!539
 2019-11-25 13:20:31 -05:00
MascaraSnake e48f4170fc Merge branch 'springroll' into 'master' 
Spring roll (Resolves #336).

Closes #336

See merge request STJr/SRB2Internal!543
 2019-11-25 13:20:16 -05:00
MascaraSnake bdc0075ee0 Merge branch 'speclook' into 'master' 
Speclook (resolves #340).

Closes #340

See merge request STJr/SRB2Internal!529
 2019-11-25 13:20:00 -05:00