Commit graph

357 commits

Author SHA1 Message Date
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master'
Date stuff

See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
dc011d2fd3 Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
toaster
49de43afaf Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.) 2019-11-26 12:37:57 +00:00
toaster
e0c6fe7326 Woops 2019-11-24 15:19:15 +00:00
toaster
3f40c7e4a7 * Resolve #345.
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
2019-11-24 13:24:37 +00:00
MascaraSnake
62ae268a29 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
sphere
da90ebcdfb fuck autocomplete 2019-11-22 04:12:38 +01:00
sphere
693d6b5ca5 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
James R
65ce4cab26 Warn if gametype number is out of range to map command 2019-11-19 12:32:02 -08:00
James R
edea7b2a10 Check for out of range gametype on map change 2019-11-19 12:25:50 -08:00
MascaraSnake
abdfc2d237 Merge branch 'exit-move-lj' into 'master'
Post-exit movement

See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
Steel Titanium
b1f39e836d Better ping implementation. 2019-11-17 20:22:47 -05:00
Louis-Antoine
658fd6e052 Disable exitmove by default 2019-11-17 23:52:51 +01:00
MascaraSnake
3b3441ca40 Merge branch 'clearer-nodes-command' into 'master'
Make the "nodes" command clearer

See merge request STJr/SRB2Internal!477
2019-11-16 12:53:31 -05:00
James R
d2cd9e7239 Remove defaultname, since players are probably sure on their name change 2019-11-15 17:32:43 -08:00
James R
1c2eb88163 Don't confuse node with player in commands
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
Louis-Antoine
d3b113c84a Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404 Let players move after completing the level
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
MascaraSnake
0de24336ed Merge branch 'map-by-name' into 'master'
LJ saved me from self destruction by bad code

See merge request STJr/SRB2Internal!463
2019-11-14 18:06:52 -05:00
Louis-Antoine
7ca4184cb2 Allow item respawn in co-op again
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
James R
9290fa7e20 Warn if the gametype is not valid at all! 2019-11-13 14:31:44 -08:00
James R
85b6b307e8 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
MascaraSnake
302e122d64 Merge branch 'map-by-name' into 'master'
New map command

See merge request STJr/SRB2Internal!424
2019-11-13 13:45:36 -05:00
MascaraSnake
d648a2ad87 Merge branch 'radiomode' into 'master'
Radio mode

See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
James R
6ee9c029e4 Warn if the first argument is an option 2019-11-12 18:29:42 -08:00
James R
83d31c782b Get map name from multiple arguments
(This means you don't need quoting.)
2019-11-12 17:42:54 -08:00
James R
f7e879da06 So you don't like macros? 2019-11-12 16:10:00 -08:00
toaster
f7c5774b7e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
# Conflicts:
#	src/p_user.c
2019-11-12 21:56:46 +00:00
MascaraSnake
fae4fb16e9 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
toaster
a8169e3844 Sound test is cool now!
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
toaster
2a16cf539a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
22b413e84c * Improve the Metal Sonic recording/playback system.
* Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!)
    * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.)
    * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do.
    * Disable dashmode while recording, for a fairer race.
    * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt.
    * Always start Metal recording in wait frames for bonus taunting.

Other relevant changes:
* Increment DEMOVERSION *again*.
* Improve the Record Attack ghost followmobj recording to accomodate Metal's jet.
* Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone.
* Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force.
    * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
2019-10-28 22:12:47 +00:00
James R
5b90586f0d :oh: 2019-10-27 14:29:13 -07:00
James R
ab57df909b Fix minor unnecessary call 2019-10-27 14:25:20 -07:00
James R
08ad257e17 Extend map name text matching code into a function 2019-10-27 14:23:03 -07:00
James R
658c1e82d0 Add support for custom keywords
For now, 32 characters separated by spaces.

Also fixed a SIGSEGV from an empty level title.
2019-10-27 14:10:26 -07:00
James R
b3f9bce439 Overhaul the map command
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)

Gave a better description of command.
Supported abbreviated optional parameters.

And now REALLY detects incorrect parameters.
2019-10-27 14:02:36 -07:00
toaster
4334384855 Fix bot showing up in NiGHTS stages with a two-pronged approach.
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
2019-10-27 12:20:17 +00:00
MascaraSnake
a039814673 Merge branch 'set-name-on-join' into 'master'
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
2019-10-25 15:38:21 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
MascaraSnake
7c9c2553b2 Merge branch 'kartport_namedvalues' into 'master'
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
2019-10-25 15:32:56 -04:00
toaster
1305c1cde8 Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
James R
96a12b6bed Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R
4f5d32a73f "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
Louis-Antoine
209a883821 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
toaster
ec20d04e6f Compile fix. 2019-10-16 17:39:38 +01:00
toaster
036c6aa829 Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew? 2019-10-16 17:38:38 +01:00
toaster
3e3ee8717f Merge retry and respawn into one command, respawn. 2019-10-16 11:38:09 +01:00
toaster
69d43435f5 Improved "HELP" command!
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00