stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9249 commits 172 branches 41 tags 280 MiB
Commit graph

747 commits

Author SHA1 Message Date
Jaime Passos
e617f35182 PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R
1dac3d174e Merge remote-tracking branch 'origin/master' into next 2019-12-26 15:35:53 -08:00
James R
414a066ec8 Merge branch 'turnmultiplier' into 'master' 
Option to increase the turning speed

See merge request STJr/SRB2!553
 2019-12-26 18:18:23 -05:00
Jaime Passos
03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos
3622829504 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
James R
3f339384c8 Merge branch 'hwrtexfix' into 'master' 
Fix model texture blending

See merge request STJr/SRB2!546
 2019-12-24 14:44:19 -05:00
GoldenTails
1f93ab0e0f Optimise further, play beep on cut/copy, play beep when paste is successful. 2019-12-23 18:53:41 -06:00
Jaime Passos
61b72203a8 Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
James R
3e2b28e162 Merge remote-tracking branch 'origin/master' into turnmultiplier 2019-12-22 21:26:36 -08:00
GoldenTails
ed847e831b Fix pasting going out of bounds and dash the possibility of memory leaks while pasting. 2019-12-20 20:28:30 -06:00
GoldenTails
a2faa975cb Allow Clipboard actions. 2019-12-20 16:39:19 -06: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
Jaime Passos
4e349cbd0f Remove W_UnlockCachedPatch calls to avoid crashing 2019-12-19 17:14:56 -03:00
Jaime Passos
79d5192b7c TOL/Level platter stuff 2019-12-18 13:24:10 -03:00
Jaime Passos
7807424633 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos
e359f802fd Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
a0971d0756 Put loadgame patch loading back in M_ReadSaveStrings 2019-12-17 15:56:56 -03:00
Jaime Passos
7e55dd31f5 fix menu spacing 2019-12-17 12:53:26 -03: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
fickleheart
a885380e8a Add analog deadzone option separate from digital deadzones 2019-12-14 19:41:54 -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
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
Jaime Passos
af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
fickleheart
a188cd5db8 Add boss target assist and finally organize camera options 2019-12-12 00:48:15 -06:00
Jaime Passos
3ca0fbf5c3 da ba dee da ba die 2019-12-12 01:29:59 -03: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
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
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
fickleheart
194e77a6f0 Give spindash turn a separate slider 2019-12-10 08:07:41 -06:00
fickleheart
2fa1e75016 I'm hilarious 2019-12-09 22:45:34 -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
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
c6769e7220 Die 2019-12-08 22:12:56 -03:00
fickleheart
e92d7eca8e Shift camera sideways toward player angle 2019-12-08 15:54:16 -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
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
2e77970526 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08: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
toaster
b76a1d3df7 * Don't iterate through the list twice to print "No hidden emblems on this map". 
* Make it "No hint available for this emblem" instead of "No hints available", which people may confuse as the first message (I know I did!)
 2019-12-05 19:26:31 +00:00
toaster
514616c546 Allow for 10 emblem hints on a map by poking the drawer a bit. 
This is a very small diff, but I can understand if you'd not feel comfortable having this until after 2.2.0.
 2019-12-05 19:09:41 +00: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
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
960ee7fe72 Don't flip P1 of a two-character save card, for aesthetique reasons. 2019-11-29 15:58:37 +00: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
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
toaster
f86b46640d Skip character select entirely if only one character is available on the list. 2019-11-25 17:06:06 +00:00
toaster
fc407cf6ce Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection. 2019-11-25 16:55:18 +00:00
toaster
5cf803f7d0 Allow character select for NiGHTS stages on the Secret Level Select now that every character has NiGHTS sprites. 
(think of this as the collorary to 358, not a direct change)
 2019-11-25 16:46:26 +00:00
Steel Titanium
d4a8fd8e64
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353) 2019-11-24 16:37:13 -05:00
toaster
fd657d2ff4 Fix bugs discovered in testing. 2019-11-24 15:06:37 +00:00
toaster
f602e5bfb7 "showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt. 2019-11-24 14:35:31 +00:00
toaster
508feaad9d Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00
MascaraSnake
5fe89e6e9b Merge branch 'ra-wipe-fix' into 'master' 
Fix RA fade (resolves #329)

Closes #329

See merge request STJr/SRB2Internal!521
 2019-11-23 18:16:09 -05:00
MascaraSnake
a24949cfa6 Merge branch 'menu-reordering' into 'master' 
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
 2019-11-23 17:51:46 -05:00
Jaime Passos
e850d42bc2 fix RA fade 2019-11-23 18:15:09 -03:00
sphere
de2a26bf5d Swap statistics and tutorial options in the 1 Player menu. 2019-11-22 21:00:03 +01:00
sphere
07221c50ce i'm a dumbass 2019-11-22 20:37:35 +01:00
sphere
e3aca4b647 restore secrets = 0, not sure why i changed that 2019-11-22 20:24:57 +01:00
MascaraSnake
f7c4ec1965 Merge branch 'mapvisitedupdate' into 'master' 
Intermission fixes/cleanup

See merge request STJr/SRB2Internal!509
 2019-11-22 14:11:31 -05:00
toaster
7ff616b26e Do a whole bunch of cleanup for mapvisited and intermission related things. 
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.

Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).

Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
 2019-11-21 16:10:28 +00:00
sphere
5a7ebb3ba6 Re-reorganize sound options. 2019-11-21 16:53:37 +01:00
sphere
b37c3a414a Remove unneeded HAVE_MIXERX checks. 2019-11-21 16:35:27 +01:00
sphere
f021d35e7e Move tutorial to the bottom of the 1 Player menu. 2019-11-21 02:43:07 +01:00
sphere
48c454553f Move SP and MP down if extras aren't unlocked yet. 2019-11-21 02:19:31 +01:00
sphere
9608021824 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
sphere
f587069d0e Reorganize sound options. 2019-11-21 01:14:09 +01:00
sphere
2d509eff47 Move the main menu options around. 2019-11-21 00:34:58 +01:00
Jaime Passos
1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
MascaraSnake
5649365c19 Merge branch 'titlecard-lowercase-support' into 'master' 
Lowercase support in titlecards

See merge request STJr/SRB2Internal!481
 2019-11-18 15:05:02 -05:00
Steel Titanium
2584241a44
Better ping implementation. 2019-11-17 20:22:47 -05:00
toaster
76897b560f Update end tally and sound test to accomodate new title font. 2019-11-17 14:56:05 +00:00
James R
82ad6685a6 Remove defaultname, since players are probably sure on their name change 2019-11-15 17:32:43 -08:00
Jaime Passos
c15ee65015 LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos
6be45ec241 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
Jaime Passos
d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
toaster
da1b4f2277 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
MascaraSnake
14477748be Merge branch 'stopclock' into 'master' 
Stop the clock!

See merge request STJr/SRB2Internal!450
 2019-11-13 14:39:59 -05:00
MascaraSnake
7cfc7b38c5 Merge branch 'forceskin_bs' into 'master' 
MP Charsel menu fixes

See merge request STJr/SRB2Internal!457
 2019-11-13 14:00:11 -05:00
toaster
7b640bc81e * Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention). 
* Use thinstring for Authors field on the screen.
 2019-11-13 13:44:00 +00:00
MascaraSnake
d591554a5d Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05:00
Jaime Passos
3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
Jaime Passos
c6253bb6f9 Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
MascaraSnake
66123b8165 Merge branch 'internal-md3-vanilla-c' into 'master' 
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
 2019-11-12 15:44:20 -05:00
MascaraSnake
b04452f7de Merge branch 'nonightsbot2' into 'master' 
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).

Closes #261

See merge request STJr/SRB2Internal!417
 2019-11-12 15:41:01 -05:00