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

366 commits

Author SHA1 Message Date
Nev3r
39ba20be6b Basic multiple thinker list implementation 
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 22:39:22 +02:00
James R
d00cc7cddb Prevent just anyone from skipping credits but allow admins 
exitlevel works too
 2019-03-25 16:19:40 -07:00
Monster Iestyn
2fb569857a Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
mazmazz
f18103a473 Declare exitfadestarted properly 2019-03-15 11:01:41 -04:00
mazmazz
773f9dc2ba Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
mazmazz
9ec98c588f Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
c021e29835 Restore MUSIC_RELOADRESET if block in g_game 2019-03-13 21:18:23 -04:00
mazmazz
47bd042a7e Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz
075f28b7c8 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
b3908755af Add CSV functionality to timedemo 
* Append timedemo trials to timedemo.csv
* Specify -csv <trialid> to toggle CSV behavior
* Specify -quit to immediately quit after timedemo
* Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row
 2018-12-29 04:51:00 -05:00
mazmazz
56892c13ab Add framecount to timedemo message 2018-12-28 22:59:54 -05:00
mazmazz
89c12a4ee8 Reset timedemo counters after wipe 2018-12-27 23:23:09 -05:00
mazmazz
a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
mazmazz
82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
Latapostrophe
b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Latapostrophe
619dd9d08a Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
Digiku
9525de2d83 Merge branch 'camera-backport' into 'next' 
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
 2018-12-20 16:57:23 -05:00
TehRealSalt
03a4bd8f53 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Latapostrophe
45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
TehRealSalt
e763eab6cd 2.2 camera changes backport 
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.

These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
 2018-12-16 18:18:59 -05:00
TehRealSalt
c69cfefb6d 2.2 backport of jump/spin axes 
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
 2018-12-16 17:45:49 -05:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Digiku
17e9188c89 Merge branch 'execversion' into '21-version' 
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
 2018-12-06 12:41:20 -05:00
mazmazz
70aa4ce18e Add alwaysfreelook2 and mousemove2 to config versioning 
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
 2018-12-06 11:59:34 -05:00
mazmazz
a802069313 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
mazmazz
aaf5d2e1dc Change 2p controller defaults 2018-12-06 05:26:28 -05:00
Digiku
42cb597731 Merge branch 'joystick-juggling-two' into 'next' 
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
 2018-12-03 22:59:19 -05:00
mazmazz
6ca1130551 Hardcode Screenshot, GIF, and Viewpoint to their F keys 2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4 thisjoyaiming fix for chasefreelook 2018-12-03 13:13:01 -05:00
mazmazz
7e523a1e35 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz
59cabea8bd Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00
mazmazz
6dd44ca1de Change PC axis defaults to 360-friendly values 2018-12-03 13:10:15 -05:00
mazmazz
31f23fda8d Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
Jimita
6d7689c1a7
Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC
54cae84849 Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
Monster Iestyn
cd57be640c Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
mazmazz
ab47e83939 Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-25 19:03:22 -05:00
Monster Iestyn
1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
eb95289ea4 Rearranged menu presentation methods 
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
 2018-11-25 15:08:12 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
17ff7e69a0 Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
mazmazz
f926774ee1 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-22 14:37:21 -05:00
mazmazz
2acad7ad86 Dont show Hold to Retry HUD when using Pause/Break key 2018-11-21 11:10:18 -05:00
mazmazz
8a9c10e633 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-21 10:58:07 -05:00
mazmazz
74da082c75 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
mazmazz
dcac157ccd Merge remote-tracking branch 'origin/master' into menu-execs 2018-11-20 18:31:30 -05:00
Monster Iestyn
b2c3a39a2f I forgot to do this earlier, welp 2018-11-20 21:17:46 +00:00
Monster Iestyn
224c0fccdb Merge branch 'public_next' 
# Conflicts:
#	src/Makefile.cfg
#	src/d_clisrv.c
#	src/p_setup.c
#	src/r_segs.c
#	src/r_things.c
 2018-11-20 14:33:10 +00:00
mazmazz
d2bbddbed4 Implemented features 
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
 2018-11-17 01:21:21 -05:00
Alam Ed Arias
d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
mazmazz
6c69dd1f78 Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
mazmazz
a362407886 Merge branch 'control-selector' into text-prompts 2018-11-12 21:11:53 -05:00
mazmazz
40e5a2104b Also set cv_analog for tutorialgcs 
* M_TutorialSaveControlResponse CV_Set adjustment
 2018-11-12 17:34:56 -05:00
mazmazz
acd922886a Change mouse cv vars temporarily alongside control scheme 2018-11-12 17:30:21 -05:00
mazmazz
31c1145cf3 Uncomment gcs_platform defaults 2018-11-12 16:54:42 -05:00
mazmazz
ab084f1bc9 Add tutorialgcs variable for optional control scheme loading 2018-11-12 16:50:03 -05:00
mazmazz
3f72e1bacf New gclists and const modifier; added tutorialmode declarations to this branch 2018-11-11 08:44:08 -05:00
mazmazz
99a0831b0b Hardcode tutorial prompt offset index 2018-11-10 10:15:16 -05:00
mazmazz
e1e94c3af2 Added page tags and find page by tag 
* Added tutorial mode defines to this branch
 2018-11-10 09:32:53 -05:00
mazmazz
1855359ac0 Moved TextPrompt logic to f_finale.c 
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
 2018-11-04 22:32:45 -05:00
mazmazz
95c68c331a TextPrompt/Page freeslots; SOC Prompt/Page parsing 2018-11-04 22:31:52 -05:00
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix 2018-10-29 19:52:08 +01:00
Louis-Antoine
3d0daf2202 Fix desynch when toggling analog mode or flipcam 
Special thanks to Lat' for asking weird questions
 2018-10-29 00:49:23 +01:00
Monster Iestyn
29b242a5bd Merge branch 'endgame-code-refactor-backport' into 'next' 
Endgame code refactor

See merge request STJr/SRB2!297
 2018-10-19 17:31:19 -04:00
Monster Iestyn
feceaf6d30 Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission 
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
 2018-10-11 21:25:15 +01:00
Monster Iestyn
2bb7df5f49 G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt 2018-10-11 21:25:04 +01:00
Monster Iestyn
31f3f8b8e7 Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame 2018-10-11 21:24:53 +01:00
Monster Iestyn
9c464742b7 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now 
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
 2018-10-11 20:00:45 +01:00
mazmazz
d542c2440d musicplus-feature-endoflevel 2.2 -> 2.1 backport 2018-09-18 15:50:12 -04:00
mazmazz
c5ea6b5efe MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
a44be49535 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
7db7a739d4 Use INFLIVES macro in place of 0x7f for infinite lives check 2018-08-29 21:31:15 +01:00
Monster Iestyn
5eddb1f455 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
mazmazz
dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Monster Iestyn
1af8d3ac02 Merge branch 'master' into hud-n-menu-tidbits 
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
 2018-08-28 20:51:46 +01:00
Monster Iestyn
58a844d3cf Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
toaster
91eb248e46 Fix up them there ghosts! 
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
 2018-08-25 17:11:49 +01:00
Latapostrophe
8747a8529d Changed chat position, 
Added chat back tint
Fixed word wrapping glitches
 2018-08-19 10:58:29 +02:00
mazmazz
487c62fe31 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_setup.c
 2018-08-10 13:35:59 -04:00
mazmazz
09f4309f45 Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option 2018-08-09 23:14:14 -04:00
Latapostrophe
ad187c26f0 Repositionning chat & bugfixes 2018-07-31 15:57:19 +02:00
Latapostrophe
ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
Monster Iestyn
dfb5f06d7e fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
Monster Iestyn
76c8d30ed2 Fix special stage map end var defaults to use the correct map numbers 2018-06-30 18:14:04 +01:00
toaster
f18cfb11f3 Some cvar fudging. 
* Turn off mlook and mousemove by default, as requested by Prime/Mystic.
* Change all the analog cvar names (and hide them from the help function so they aren't so easily rediscovered) to invalidate 2.1-era copies of config.cfg, given I've seen a common sentiment is that they won't try the new controls at all and will just copy their old ones across, and I'd like to sabotage the deprecated feature.
 2018-06-18 17:39:34 +01:00
toaster
f0618d5780 Correct some minor deficiencies in the hold-for-retry system in record attack. 2018-06-15 21:42:36 +01:00
toaster
a3f7e07e4d Improve retrying text presentation. 
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
 2018-06-14 14:41:14 +01:00
toaster
62927bbb76 * Hold the pause button to restart a record attack run! 
* Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif
* Show powerup display in singleplayer even while holding Game Status button.
 2018-06-14 00:58:28 +01:00
toaster
522fccaf2e * Record attack tab-HUD tweaks. 
* Do not subtract a life when retrying if you have infinite lives.
 2018-06-13 17:52:23 +01:00
toaster
a56811cb0d Fix all the Floral Fieldsing pv2 discovered. 2018-06-12 01:08:03 +01:00
toaster
1242180667 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
Monster Iestyn
14d49b8bf1 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
 2018-06-09 19:35:36 +01:00
toaster
13053bd1ba FINAL CHANGE, I PROMISE, I THINK 
* MainCfg property smpstage_start - controls the special stage multiplayer games go to.
 2018-06-06 16:07:14 +01:00
toaster
6e07631cc9 MONSTER COMMIT. 
OLD SPECIAL STAGES:
* Spheres in old special stages instead of rings!
* Individual timers in old special stages instead of a global one!
* Old special stages use a variant of the NiGHTS HUD now!
* Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres!
* All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore.
* Made emerald gaining function be based on special stage number rather than gained emeralds!
* Consistency with...

NiGHTS SPECIAL STAGES:
* Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif
* Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.)

SPECIAL STAGES IN GENERAL:
* useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS.
* CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif
* SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif

NiGHTS NON-SPECIAL STAGES:
* Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages.
* Colour Chips turn yellow in bonus time.
* Ideya!
* Its own "drowning" music!
* All of the object types for Dream Hill.
* GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif

RANDOM BS:
* Turn super with the spin button instead of the jump button!
* Followmobj now correctly set with P_SetTarget instead of pointer assignment.
* Emerald hunt uses new sprites!
* Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
 2018-06-03 22:41:54 +01:00
Monster Iestyn
3fb12cf337 Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode 2018-04-15 19:59:57 +01:00
mazmazz
606df6482e Merge branch 'master' into nightsplus-laplogic 2018-04-07 07:54:46 -04:00
mazmazz
3fbffb0b4d Add player_t marelap and marebonuslap, with logic 2018-03-30 20:28:27 -04:00
toasterbabe
d9b5155e6e * Make Tokens appear in competition. 
* Tweak thrown ring colours.
* Make Armageddon shield loop properly.
* Tweak drowning numbers to be consistent between third and first person.
 2018-03-30 21:49:15 +01:00
toasterbabe
de8f1fa407 * Incorporate (almost) all of Mystic's feedback. 
* Prevent ANY input when blindfolded.
* Make CECHOs always perplayer'd. (A little hacky; quads will need work here.)
* Make NiGHTS link timer bounces not a mess, and only when the colour changes.
 2018-03-30 16:39:59 +01:00
Alam Ed Arias
7f4424b4a0 whitespace cleanup 2017-11-02 23:13:34 -04:00
toasterbabe
2a42291b30 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/d_netcmd.c
 2017-11-02 20:39:07 +00:00
toaster
49a1266ccc Merge branch 'sal-misc-stuff' into 'master' 
Sal misc stuff (state overwriting, gamepad tweaks)

See merge request STJr/SRB2Internal!116
 2017-11-02 16:35:12 -04:00
toaster
605e51f6f3 Merge branch 'more_about_menus' into 'master' 
More about menus

Closes #72

See merge request STJr/SRB2Internal!122
 2017-11-02 16:31:51 -04:00
toasterbabe
2458c06f5b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into sal-misc-stuff 
# Conflicts:
#	src/g_game.c
 2017-10-30 21:42:38 +00:00
Monster Iestyn
bfca420f47 Merge branch 'master' into gametype-strings 2017-10-30 21:34:16 +00:00
toasterbabe
3994697fbd Fix all NiGHTS demo desyncs! (More specifically: compare with d_netcmd.c's order of operations - it's skin change, then g_initnew, then demo start, NOT g_initnew then skin change then demo start!!!!! 2017-10-30 14:20:36 +00:00
toasterbabe
8372bde91b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 2017-10-18 21:02:50 +01:00
toasterbabe
0fe1f9d63b * "BAD DEMO!!" and "ANALOG" attachments to the input viewer 
* Minor refactor
 2017-10-18 13:22:57 +01:00
toasterbabe
c7b2c43ae5 Record attack input display! 
https://cdn.discordapp.com/attachments/293238104096112641/369485020038955008/srb20041.gif
 2017-10-16 16:25:31 +01:00
TehRealSalt
f0b938eb98 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/p_saveg.c
 2017-10-14 16:20:56 -04:00
Monster Iestyn
3e595b8f1b Merge branch 'master' into ports-chopping-block 2017-10-14 20:47:04 +01:00
toasterbabe
1ba9d1fe6e * Rudimentary (set everything every state or DIE) support for ghost followmobjs. 
* Rename GZT_SPRITE to GZT_FRAME, since otherwise it's easy to confuse with EZT_SPRITE (which does something completely different).
* Fix issue where ghosts were facing wrong direction on spawn.
* Other minor refactorings.

* ...also, made smiles' tails pop up instead of down when skidding
 2017-10-14 17:50:14 +01:00
toasterbabe
f75d56f932 Beginner support for followitem. Doesn't handle it for ghosts; need to do that independently. 2017-10-11 17:45:32 +01:00
toasterbabe
8871b08007 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/p_user.c
 2017-10-11 17:44:48 +01:00
toasterbabe
7fcef5d44d Huh, that's what was going on with the black magyks. Silly me! 2017-10-10 21:24:24 +01:00
toasterbabe
728a195e54 Fix NiGHTS desync message... by obliterating all its special casing. 2017-10-10 19:30:32 +01:00
toasterbabe
8217900c0d * Make replays take analog mode, flipcam, directionchar and autobrake settings into account. 
* Fix replays for the current state of internal, irrespective of that previous thing.
* Fix replay ghosts for everything.
* Known issues; NiGHTS still prints an error message about desyncing on map start, but plays back fine. Curious.
 2017-10-10 17:56:38 +01:00
toasterbabe
844416855f Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo! 2017-10-02 14:08:58 +01:00
TehRealSalt
f31cdf395a Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/p_user.c
 2017-09-30 22:29:16 -04:00
Monster Iestyn
7481ffef2a Wiped out Wii (and Wii Linux) 2017-09-29 21:03:28 +01:00
Monster Iestyn
41ae71db4a postponed PSP 2017-09-29 20:34:16 +01:00
Monster Iestyn
5a16c39af0 XBOX was eXecuted 2017-09-29 19:27:17 +01:00
Monster Iestyn
f4e535a64d Burned Dreamcast port at the stake 2017-09-29 18:19:34 +01:00
Alam Ed Arias
2629301947 Merge branch 'public_next' into master 2017-09-28 17:29:02 -04:00
Alam Ed Arias
f1a347e55f Merge branch 'public_next' into master 2017-09-28 11:01:20 -04:00
Alam Ed Arias
ec125628ab Merge branch 'master' into next 2017-09-28 10:16:35 -04:00
Alam Ed Arias
55f377ba3d Build: kill GCC 7's format-overflow warnings 2017-09-28 09:13:46 -04:00
toasterbabe
295b100df4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 
# Conflicts:
#	src/m_menu.c
 2017-09-27 14:43:09 +01:00
TehRealSalt
4a51d4bee0 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/g_game.h
 2017-09-19 17:07:09 -04:00
toaster
3cc14e3985 Merge branch 'directionchar' into 'master' 
Autobrake & decoupling player sprite angle from camera angle

See merge request !69
 2017-09-19 07:56:22 -04:00
toaster
6d03c50966 Merge branch 'continue_startinglives' into 'master' 
Save cards and continue startinglives-balancing

See merge request !114
 2017-09-19 07:45:35 -04:00
TehRealSalt
d1e379f4f9 Whoops, forgot P2 2017-09-19 00:30:08 -04:00
TehRealSalt
e020352c0c Fixed diagonal analog input being weakened 
Using a keyboard and an analog stick should now give you similar
acceleration in all directions.
 2017-09-19 00:26:05 -04:00
toasterbabe
5bd71970ad Make chat visible in the evaluation gamestate. 2017-09-18 21:38:51 +01:00
TehRealSalt
ce0a49ede5 Add jump & spin joystick axis 
Lets you set jump/spin to Xbox controller triggers, like you can with
fire/nfire
 2017-09-17 22:30:48 -04:00
toasterbabe
970268ec38 Redid that ridiculous lastcoop thing as an MV_MP thing, which also means it gets properly cleared when you load mods with new save data. 2017-09-17 22:05:13 +01:00
toasterbabe
b217e9eb92 * Made levels with TOL_COOP inaccessible from the multiplayer map select unless you'd visited them in singleplayer (mapvisited, saves to gamedata) or visited a Co-op level number equal to/after it (multiplayer, doesn't save to gamedata) 
* Tweaked Pandora's box to add:
 - A mid-game link to the Addons menu.
 - A button to give everyone SF_SUPER (except Tails in non-devmode executables).
 2017-09-17 16:49:39 +01:00
toasterbabe
f90d595332 * cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. 
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
 2017-09-16 20:25:14 +01:00
yellowtd
519414b215 Merge branch 'master' into titlemap 2017-08-22 19:07:32 -04:00
toasterbabe
706eb5efeb * New, pretty save select! Requires patch.dta to really appreciate. 
* Changed the save format a little more, since I had free reign over it.
* Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
 2017-08-20 23:18:47 +01:00
toasterbabe
42211f02b4 * Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. 
* Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag.
* Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
 2017-08-20 13:14:17 +01:00
toasterbabe
fd63db0aaf Starting lives revamp, per the 2.2 priorities topic list! 
* Each time you die, the number of game overs you've had is counted.
* Your save file updates to record this.
* The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game).

Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
 2017-08-18 00:58:16 +01:00
toasterbabe
780f9b1645 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/hardware/hw_md2.c
 2017-08-07 20:36:14 +01:00
toasterbabe
b51e80ef88 Make timer reset work in LF_NORELOAD as well. 2017-08-05 22:13:35 +01:00
TehRealSalt
2d9a024c4a Commenting out lastmapsaved 2017-08-04 13:57:47 -04:00
TehRealSalt
9d17466d99 Added lastmaploaded to replace the lastmapsaved check 
This allows saving in special cases where you can go to a map that
doesn't save, and then back to the map you saved on (see: SUBARASHII
special stages), while still preventing you from killing your lives by
repeatedly retrying in said map.

Kept lastmapsaved just in case. Can be removed if deemed unnecessary.
 2017-08-03 20:27:31 -04:00
toasterbabe
8941379c64 Implementation of all the new skincolours. No new exe yet, though, since I'm still doin' stuff. 2017-07-22 23:24:12 +01:00
toasterbabe
fb00691324 Fix a bug in a testing netgame where we were able to game over and yet ended up just resetting the map normally. 2017-07-08 19:30:25 +01:00