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
James R 53c7df4818 Merge branch 'map-command-no-mapheaderinfo' into 'master' 
Let the map command warp to maps without a level header

See merge request STJr/SRB2!528
 2019-12-15 16:59:03 -05:00
James R adc87640d9 Merge branch 'cmake-fixes' into 'master' 
Various cmake adjustments

See merge request STJr/SRB2!538
 2019-12-15 16:58:45 -05:00
fickleheart 1f88c70d6a Fix RVZ autocam AGAIN 2019-12-15 13:33:21 -06:00
Sryder a093c76cfb Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone 2019-12-15 15:47:45 +00:00
Monster Iestyn eb179e4d6a Remove anti-Tails restriction for the Allow super Pandora's Box cheat. 
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
 2019-12-15 15:40:56 +00:00
Sryder 76d59330f7 Port the deadzone cvar stuff from kart. 
Add menu items for deadzone.
 2019-12-15 15:36:13 +00:00
Sryder b17bf5d836 Use Scaled Radial Deadzones, instead of Axial deadzones. 
Additionally fixes some weird padscale 0 stuff that was flipped.
This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
 2019-12-15 14:37:30 +00:00
Eidolon d63ad82dc5 [cmake] Remove srb2dd target 2019-12-15 00:47:58 -06:00
Eidolon 11f5911943 [cmake] Use same executable names as Makefile 2019-12-15 00:39:04 -06:00
fickleheart a885380e8a Add analog deadzone option separate from digital deadzones 2019-12-14 19:41:54 -06:00
fickleheart 3db7e48c73 [POTENTIALLY RISKY] Show target arrow above lock-on target 
My judgement on "is this netgame-safe" is "Gunslinger's
targeting spawns this only for the local player, so maybe".
 2019-12-14 19:21:11 -06:00
fickleheart 7fd2153c08 Realign camera options menu options 2019-12-14 19:20:19 -06:00
fickleheart 0702e366b6 Allow setting center view to a toggle 2019-12-14 19:17:41 -06:00
fickleheart a812ddd88e Fix turn-to-input jerk when braking sideways 2019-12-14 19:04:29 -06:00
Jaime Passos 4d87bcca13 Move position of R_PlaneRipple in the file so this looks more organised 2019-12-14 19:50:40 -03:00
Jaime Passos 871ebef332 Merge remote-tracking branch 'origin/master' into ripple2 2019-12-14 19:36:54 -03:00
James R 14674223e8 Merge branch 'opengl-is-a-bad-renderer' into 'master' 
OpenGL fixes

See merge request STJr/SRB2!519
 2019-12-14 16:48:50 -05:00
James R 64eb89fc56 Merge branch 'portalcullsector' into 'master' 
Restore portal culling code that went gone by pure accident

See merge request STJr/SRB2!523
 2019-12-14 16:47:51 -05:00
James R e5714db75c Merge branch 'software-drawers-refactor' into 'master' 
Optimize Software drawers

See merge request STJr/SRB2!533
 2019-12-14 16:47:27 -05:00
James R c1d54007e4 Fix C90 error from NOHW 2019-12-14 13:30:10 -08:00
James R 2a22adaa60 Oops C90 2019-12-14 12:55:11 -08:00
fickleheart 0047dba279 Fix float cvars saving wrong when set to max 2019-12-13 23:05:36 -06:00
fickleheart bc2ed52625 Double sensitivity and halve default of turn to input 2019-12-13 22:55:34 -06:00
fickleheart 252b77c651 Scale angle-related camera turns by player speed 
They also operate at full when idle, too.
 2019-12-13 22:30:04 -06:00
fickleheart 097fc48f52 Even MORE tta changes: 
- All automatic turning is suspended upon manual rotation
- Dest angle uses drawangle again for rolling only
 2019-12-13 20:30:56 -06:00
fickleheart fdc3347e22 More turn-to-angle changes 2019-12-13 20:19:38 -06:00
fickleheart f82f1513ba Tweaks to camera shifting 2019-12-13 20:17:31 -06:00
fickleheart 022a44fb01 Don't turn-to-ability while climbing 2019-12-13 19:49:56 -06:00
fickleheart a03ab5e294 Patch slight camera turn when airbraking 2019-12-13 19:37:01 -06:00
fickleheart 1a60f7a2ad Fix wacky CEZ2 platform camera 2019-12-13 19:30:19 -06:00
James R 8a23ff0bc8 Handle log file in parent properly 2019-12-13 16:51:49 -08:00
fickleheart 87ad91a2be LMAO right stick checking used the wrong value 2019-12-13 17:35:48 -06:00
James R 553ad46c74 Add this back for Windoodoo because I'm an idiot 2019-12-13 15:04:31 -08:00
Jaime Passos 4c13190b48 Merge remote-tracking branch 'origin/master' into software-drawers-refactor 2019-12-13 19:22:47 -03:00
Jaime Passos 7f092b884b Initialise the variable, obviously 2019-12-13 19:04:36 -03:00
Jaime Passos a27a225a81 Remove SPANDRAWFUNC_MMX, as it's not needed anymore. 2019-12-13 19:02:36 -03:00
Jaime Passos 6720279969 Separate non-powers-of-two draw routines into its own file 2019-12-13 13:11:56 -03:00
Jaime Passos fa58c1fb26 stuff 2019-12-13 12:26:47 -03:00
James R c415d80e19 Merge branch 'dashmode-shader' into 'master' 
Add TC_DASHMODE color shader

See merge request STJr/SRB2!526
 2019-12-13 01:58:18 -05:00
James R d64a7defed Merge branch 'toomanyflats-fix' into 'master' 
Fix Ploadflat closing the game with "Too many flats in level" error message

See merge request STJr/SRB2!529
 2019-12-13 01:57:55 -05:00
fickleheart c41b2e7456 Suspend turn-to-angle when rotating the camera 2019-12-13 00:52:48 -06:00
fickleheart 098c99a834 Adjust how turn-to-angle tweens 2019-12-13 00:34:34 -06:00
James R 8bea7f6dbc Rename signal caught message to be more obvious 2019-12-12 22:01:16 -08:00
James R 838850ffc1 Fix signal handler setup error reporting 2019-12-12 21:57:54 -08:00
fickleheart bc4b1e1abe Allow switching lockon targets with turn buttons 2019-12-12 23:52:13 -06:00
James R 35053adfb2 Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-12 21:30:35 -08:00
James R 72ee91702c Kill child when wait fails, so I_Error exits both 2019-12-12 21:21:25 -08:00
James R f34886850f Fix idiot mistake 2019-12-12 21:20:51 -08:00
fickleheart d14fa39d7a Expand options for aim assist 
This will need a lot of testing to ensure each type
works properly.
 2019-12-12 23:03:51 -06:00
fickleheart 4941ef4aac Don't turn strafe keys into turn when locked onto something 2019-12-12 22:13:44 -06:00
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