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

7350 commits

Author SHA1 Message Date
Jaime Passos b0ffe7ed70 Update v_video.c 2019-12-12 23:30:09 -03:00
Jaime Passos 4e814cd424 FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos 228b29e23b HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos ca83bafae8 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
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
fickleheart a188cd5db8 Add boss target assist and finally organize camera options 2019-12-12 00:48:15 -06:00
James R 0ff421d001 Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
fickleheart efec52c48a Fix input turning still happening with centered view 2019-12-11 22:47:09 -06:00
Jaime Passos c578cee0b1 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
fickleheart 34706515ca Make locked input turn act the same as normal turning 2019-12-11 21:34:32 -06:00
fickleheart a0ecb4b71d Fix the console spam issue AGAIN 2019-12-11 21:20:07 -06:00
fickleheart a830a20c52 [pink text] nter View 2019-12-11 21:12:38 -06:00
fickleheart f1b5a2b2d3 Move Z-targeting behavior to Center View 2019-12-11 21:09:23 -06: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
fickleheart f74d7163e6 Fix RVZ camera stuff 2019-12-11 01:26:43 -06:00
fickleheart 2ab83bac60 Run camera movement in the camera options menu 
It's really nice to see adjustments reflected in real time.
 2019-12-10 23:18:46 -06:00
fickleheart 69b623e086 Add option to always turn with input while locked 
Uhhh also camera options scrolls now.
 2019-12-10 22:01:17 -06:00
fickleheart cdf5287fcc Turn camera with strafe keys in camlock while charging spindash 2019-12-10 21:34:57 -06:00
fickleheart a89f8e91f7 Change defaults and factors of simplecam options 2019-12-10 21:24:43 -06:00
fickleheart 054d51dac6 Make input turn speed tween by lateral momentum, not total 2019-12-10 21:14:50 -06:00
Jaime Passos f51253a0a8 Tilted water 2019-12-10 17:01:19 -03:00
fickleheart 2b70b4bf36 TODO 2019-12-10 09:08:30 -06:00
fickleheart 72cf5d9927 Don't flood directionchar commands!!! 2019-12-10 08:17:41 -06:00
fickleheart 194e77a6f0 Give spindash turn a separate slider 2019-12-10 08:07:41 -06:00
fickleheart e1d4e2edcb Suspend directionchar while holding cam reset 
This should make it completely clear that thok will face
the camera while it's held.
 2019-12-10 07:58:50 -06:00
fickleheart 08ab15b1b9 Disable thok camera snap 2019-12-10 07:54:27 -06:00
fickleheart 2fa1e75016 I'm hilarious 2019-12-09 22:45:34 -06:00
fickleheart a3961efc43 Draw crosshair in Simple mode while holding cam reset 
I think this gives extra indication that abilities face toward
the camera now.
 2019-12-09 22:12:19 -06:00
fickleheart 2a9819947e Disable all new camera behavior if playstyle is not Simple 2019-12-09 22:09:58 -06:00
fickleheart b5f7f5f732 Replace direction toggles with a playstyle selection 
It's kinda ugly right now...
 2019-12-09 22:06:50 -06:00
fickleheart 834a3bf334 Port deadzone configuration from Kart 
I don't feel like getting out my gamepad, so I'll trust
that this works.
 2019-12-09 20:39:05 -06:00
fickleheart 3735134948 Fix smoothing into input-based camera rotation 2019-12-09 20:31:19 -06:00
fickleheart 27996ada04 Scale down turn values (and increase defaults to compensate) 
This allows more granularity in menu sliders while limiting the
maximums to reasonable amounts.
 2019-12-09 20:26:12 -06:00
fickleheart e4626e9396 Lock camera behind player when holding cam reset 
This also disables abilitydirection movement temporarily.
 2019-12-09 20:21:32 -06: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
fickleheart c99b137298 Fix abilitydirection camera breaking minecarts 2019-12-08 20:47:11 -06: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
fickleheart 0cad5021a9 Make input turn slow down when moving slowly 2019-12-08 18:26:20 -06: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
fickleheart a30623e4ed Default to no turn-facing since it looks like controller drift 2019-12-08 15:54:37 -06:00
fickleheart e92d7eca8e Shift camera sideways toward player angle 2019-12-08 15:54:16 -06:00
fickleheart 4784eb68fa Don't do thok camera snap in replays 2019-12-08 15:49:10 -06:00
fickleheart 575b5027e8 Don't snap thok if the player is holding a camera control 2019-12-08 15:22:51 -06:00
fickleheart c94d7895df Make cam_rotspeed affect non-mouse turn speed 
10 remains the default and is vanilla behavior.
 2019-12-08 15:17:46 -06:00
fickleheart eee0d42b1f Make first-person and directionchar-off work as expected 2019-12-08 15:05:44 -06:00
fickleheart ebd2861593 Add menu options for new camera controls 
Crank everything down to zero and set ability direction
to "Camera", and you're back to base 2.2 behavior.
 2019-12-08 14:43:25 -06:00
fickleheart 36fa94a22c Automatically rotate camera to reflect player actions 2019-12-08 14:35:50 -06:00
fickleheart 075f751f67 Add cvar to use abilities in input direction 2019-12-08 14:17:48 -06:00
fickleheart 32c9c912ab Consolidate G_BuildTiccmd 2019-12-08 13:27:11 -06: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