Commit Graph

8348 Commits

Author SHA1 Message Date
James R c285000c56 Change default log filename to not use a space
bleh
2019-12-23 15:34:27 -08:00
James R d9d13764e6 -logfile to let the user change the log file name 2019-12-23 15:31:50 -08:00
MascaraSnake 1e13604007 Merge branch 'flats-in-walls' into 'master'
Flats in walls

See merge request STJr/SRB2!548
2019-12-22 17:44:50 -05:00
James R 2ed5617c5f Merge branch 'better-deadzone' into 'master'
Better Deadzones

See merge request STJr/SRB2!541
2019-12-20 17:33:29 -05:00
James R c50fe1874d Merge branch 'random-port' into 'master'
Choose a random port as a client

See merge request STJr/SRB2!554
2019-12-20 17:33:12 -05:00
Alam Ed Arias 1771c7c8ce Revert "Travis yflip error"
This reverts commit 2a9a2c0f02.
2019-12-19 10:25:54 -05:00
Alam Ed Arias a66fd274a1 Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer 2019-12-19 10:24:04 -05:00
James R 843d9b9f0a -clientport (it's back!) and -serverport, which is an alias to -port
If you ever need to, you can change the client port number.
2019-12-18 15:47:47 -08:00
James R 4e32101289 Use a pointer for port_name
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
2019-12-18 15:43:29 -08:00
James R f584b61c93 Use a random port when connecting 2019-12-18 15:34:55 -08:00
Jaime Passos 141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
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
James R 00e2c420f6 Merge branch 'dont-be-mean-to-tails-plz' into 'master'
Don't be mean to Tails plz (Pandora's Box Super cheat fix)

See merge request STJr/SRB2!540
2019-12-15 16:58:24 -05: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
James R 4daf9666a2 Merge branch 'ripple2' into 'master'
Tilted ripple

See merge request STJr/SRB2!524
2019-12-14 17:52:54 -05: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
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
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
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
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