ef886e4b80
Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!)
2019-11-04 13:11:04 +00:00
5e03d40b33
New end-of-level signpost logic
2019-11-04 16:28:44 +08:00
43fff92c82
Alacroix: Fix our heroes' arms disappearing due to dropped frames
2019-11-04 02:43:48 -05:00
16c107e2ac
Fix garbage string being drawn on record attack menu
...
Pretty silly of me to assume it would be NUL-terminated by default.
2019-11-03 21:43:09 -05:00
d268582315
Frame 4 typos
2019-11-03 19:53:05 -05:00
cb6bc67944
Alacroix title: Give Tails his back tails
2019-11-03 18:38:09 -05:00
05ac1a1a21
Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions
2019-11-03 16:21:21 -05:00
82b65c87b8
Alacroix title screen character frames
2019-11-03 10:34:12 -05:00
42835905ef
Load Alacroix character frames
2019-11-03 06:30:27 -05:00
e7e3c6ccbb
Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines.
2019-11-03 10:23:21 +00:00
96a80c51d3
TTMODE_USER logic
2019-11-02 21:51:45 -04:00
6db58bc2bf
Alacroix title animation adjustments
2019-11-02 21:05:01 -04:00
751d398321
Fix sky dome
2019-11-02 17:33:36 -03:00
915e50a1e4
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
8909598baf
Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise.
2019-11-02 18:25:56 +00:00
417f17ebdd
Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck.
...
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.
Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
2019-11-02 17:52:54 +00:00
067ef42e37
SNTX -> SONT
2019-11-02 13:30:03 -04:00
fc02b73534
Remove TTCOUNTERSET to simplify custom title SOC
2019-11-02 12:40:12 -04:00
1ebcdb5344
Multi-res title screen gfx
2019-11-02 12:12:36 -04:00
fc22d1adc3
* Restart Metal recording from beginning if retry is used.
...
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
0c1b5f07f0
Merge remote-tracking branch 'origin/master' into new-title
2019-11-01 21:06:46 -04:00
7cd7f9fdb7
Forgot to stage this.
2019-11-01 16:33:46 +00:00
e3fe542f31
Prevent desync with modeattacking.
2019-11-01 16:25:28 +00:00
67f5b2245f
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
f3e9dd0cad
Add static ATZ Gargoyles
2019-10-31 19:38:28 +08:00
95a3546988
Finish Glaregoyle states
2019-10-31 19:18:44 +08:00
126fc44d6e
Change sounds, after discussing with Lach.
2019-10-30 17:37:42 +00:00
67a99f6334
ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV
2019-10-30 17:16:44 +00:00
7c08cd69fa
WIP new states for Glaregoyle
2019-10-31 00:32:19 +08:00
04f400e048
Give the clone fighter's vectorisation colour, rather than forcing greyscale.
2019-10-29 23:24:00 +00:00
4d55a9f4a9
Metal Sonic battle improvements.
...
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
2019-10-29 23:11:12 +00:00
56d095e39f
Finish the Metal demo if the Metal playback object is dead.
2019-10-29 18:17:04 +00:00
2d1a574e09
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
d7ea986d7b
I was right on the money - SendWeaponPref seems to have been delayed compared to earlier in development. Doesn't matter a lick for regular gameplay (net or otherwise), but absolutely mandatory to get it sorted ASAP in Record Attack.
2019-10-29 15:59:59 +00:00
f0f8b544de
* Add thok auras to Metal playback.
...
* Add height changes to demos and Metal playback (to properly place thok aura relative to object).
* Fix followmobj recordings in reverse gravity (done via more strenuous flag setting + info height serialisation).
* Make RA ghosts fade in from start tic, and go colorized on their final one.
* Fix thok auras potentially doing bad things if they're set to MT_NULL.
* Add sprite change support to Metal playback.
* Re-enable some stuff I previously disabled for Metal recording/playback.
* Make ALL objects spawned with skins properly acknowledge that their spawnstate's frame is a sprite2, rather than just specific objects.
* Fix placement of Metal Sonic fume in reverse gravity.
* Since not backwards compatible with the previous test build, increment DEMOVERSION again. (Don't worry, we've got like 65524 more versions allowed before we run out of possible DEMOVERSIONs...)
2019-10-29 15:32:22 +00:00
9436993a3e
Implement new states for Buggle, the new Aquabuzz
2019-10-29 15:32:03 +08:00
417aa778aa
Use doomtype.h types instead of libpng types
2019-10-29 00:20:21 -03:00
5464b6ab28
Use doomtype.h types instead of libpng types
2019-10-29 00:15:33 -03:00
0a49340ae1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
94ab276508
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
1906709cf2
* 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
f6e8226c4e
Update p_user.c
2019-10-28 15:37:26 -03:00
a22af36305
add r_patch.c
2019-10-28 15:28:42 -03:00
1a44159ce9
Update r_data.c
2019-10-28 14:36:19 -03:00
79e99dc471
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
e91bf1a32e
Fix some intro fades displaying text in all-caps
2019-10-28 16:10:22 +01:00
8824cd64fd
Merge branch 'master' into knuxstuff
2019-10-28 22:25:32 +08:00
46ba988541
Slow climbing down underwater
2019-10-28 22:21:20 +08:00
ce91bdaaab
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut
2019-10-28 14:19:25 +00:00
9a160823aa
Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption
2019-10-28 14:19:07 +00:00
b93c2467e7
Don't let Knuckles play the landing animation unless in fall state
2019-10-28 22:13:34 +08:00
1306b2bbc5
Slow glide down underwater
2019-10-28 21:30:36 +08:00
d9196485f6
Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake...
2019-10-28 13:01:15 +00:00
17dde0d91c
Forgot to make pw_noautobrake count down........
2019-10-28 12:54:55 +00:00
22649f698e
Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again.
2019-10-28 11:34:20 +00:00
33816e49ca
Add overflow checks so we I_Error instead of death crash into oblivion
...
You'd love to know how we even reached (size_t)-1.
2019-10-28 00:40:25 -07:00
fb9421893e
:oh:
2019-10-27 14:29:13 -07:00
a00dfcf420
Oh right, the keywords...
2019-10-27 14:26:29 -07:00
f0e19d1597
Fix minor unnecessary call
2019-10-27 14:25:20 -07:00
56ee233b08
Fix compiler warnings
2019-10-27 14:23:53 -07:00
7bf819f5af
Use a superior strcasestr
2019-10-27 14:23:13 -07:00
70df5242a3
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00
bb65e8d72f
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
6358d839ee
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
2078b47952
Move gamedata param to cover -resetdata
2019-10-27 10:33:40 -07:00
4ac136f626
Custom gamedata parameter
2019-10-27 10:31:17 -07:00
df785e1651
* Add alternate numerical drawer for continues on Intermission screen if there's > 5.
...
* Tweak offsets on Continue screen numerical continue drawer to match.
2019-10-27 17:20:43 +00:00
23c6011348
Fix char select music not playing in secrets menu
2019-10-27 13:12:36 -04:00
2439b2cb32
More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop.
2019-10-27 13:37:14 +00:00
9e8733be42
Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2.
2019-10-27 13:07:06 +00:00
fa187a66e2
* Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag.
...
* Add a dashmode downpower sound.
2019-10-27 13:02:07 +00:00
0c52de7a29
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
c221a89c67
Fix unsigned/signed comparisons.
2019-10-27 11:18:37 +00:00
a58c794691
Missing ;
2019-10-27 12:03:52 +01:00
b6e145f0c5
Render title map on connecting to server screen too
2019-10-26 12:50:49 -07:00
801e83aef6
Merge branch 'use-zones-pk3' into 'master'
...
Use zones.pk3 instead of zones.dta.
See merge request STJr/SRB2Internal!352
2019-10-26 15:33:13 -04:00
91eb380412
Fix some jingle resuming behavior with boss music switching
2019-10-26 15:02:45 -04:00
9e9e6a8f8f
Merge branch 'metalstuff' into 'master'
...
Metal Sonic's jet fume
See merge request STJr/SRB2Internal!413
2019-10-26 14:52:04 -04:00
26cb75e961
Fix MIDI not being disabled when non-native
2019-10-26 12:09:27 -04:00
e89948ce71
Merge branch 'master' into metalstuff
2019-10-26 16:07:59 +08:00
92be187731
Merge branch 'master' into knuxstuff
2019-10-26 08:09:13 +02:00
634292a5fc
Differing signedness comparison
2019-10-25 21:44:34 -07:00
64e7708832
I say damn you massive initializer!
2019-10-25 21:36:10 -07:00
c7c72a4892
Merge branch 'master' into new-title
2019-10-25 22:29:29 -04:00
6c9ad67c84
Fix pointer typo (whoops)
2019-10-26 08:34:38 +08:00
aa34f74f75
Remove imtermediary state transitions
2019-10-26 08:32:36 +08:00
ca768b044d
Merge branch 'master' into metalstuff
2019-10-26 08:30:37 +08:00
63d24d529a
Merge branch 'master' into knuxstuff
2019-10-26 05:53:49 +08:00
03c5b70fc5
Merge branch 'newmenus' into 'master'
...
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252 )
Closes #245 , #244 , and #252
See merge request STJr/SRB2Internal!389
2019-10-25 17:46:16 -04:00
4d022046fa
Merge branch 'object_tweaks' into 'master'
...
Object tweaks (object_tweaks division 3)
See merge request STJr/SRB2Internal!394
2019-10-25 17:45:48 -04:00
1c1fefe25f
Merge branch 'linedef-153' into 'master'
...
Dynamic Sinking Platform (for Red Volcano Zone)
See merge request STJr/SRB2Internal!401
2019-10-25 16:56:19 -04:00
46d105dd53
Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"
2019-10-25 22:55:10 +02:00
2118b0e613
Merge branch 'hammer-landing' into 'master'
...
Twinspin landing option
See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
faf61912a6
Merge branch 'lua-allow-player' into 'master'
...
Allow access to players userdata outside levels.
See merge request STJr/SRB2Internal!386
2019-10-25 15:40:31 -04:00
7d69409cf7
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
4a9eb387f7
Merge branch 'window-focus-music' into 'master'
...
Window focus options for playing sounds/music
See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
2a8e5b7bff
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
f1a7a3b4de
Merge branch 'kartport_misc-changes' into 'master'
...
Kart ports: misc changes
See merge request STJr/SRB2Internal!380
2019-10-25 15:33:30 -04:00
ff061fb813
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
f2596ab0bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
...
# Conflicts:
# extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
403d698724
Merge branch 'mi-tinkers-with-lua-again' into 'master'
...
MI tinkers with lua again
See merge request STJr/SRB2Internal!392
2019-10-25 15:27:55 -04:00
d7480f20fa
Merge branch 'intangible-flats-tangible-sides' into 'master'
...
Collide with walls of FOF if both planes are intangible
See merge request STJr/SRB2Internal!385
2019-10-25 15:26:54 -04:00
080ff854b8
Merge branch 'be-more-nice-with-levelselect-mp' into 'master'
...
Remove level select restrictions in DEVELOP Multiplayer
Closes #238
See merge request STJr/SRB2Internal!399
2019-10-25 15:26:09 -04:00
829706a090
Merge branch 'walltransfermove' into 'master'
...
Let players move after spinning off a wall transfer
See merge request STJr/SRB2Internal!412
2019-10-25 15:20:20 -04:00
5a28c03a26
Merge branch 'superminecarts' into 'master'
...
Super and Minecarts fixes (resolves #259 )
Closes #259
See merge request STJr/SRB2Internal!408
2019-10-25 15:19:47 -04:00
2ee42c498b
Merge branch 'nonightsbot' into 'master'
...
Disable tailsbot in NiGHTS maps (resolves #261 )
Closes #261
See merge request STJr/SRB2Internal!409
2019-10-25 15:19:05 -04:00
7a09a8bd3a
Merge branch 'cezfangcheat' into 'master'
...
CEZ3 Fang cheat fix (resolves #262 )
Closes #262
See merge request STJr/SRB2Internal!410
2019-10-25 15:18:16 -04:00
2d458059c8
Don't fuck nojumpspin characters who are capable of rolling
2019-10-25 18:51:41 +08:00
d5b1467e79
Put player in jump state after spinning during a wall transfer
2019-10-25 18:48:40 +08:00
630bdaa876
Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors.
2019-10-24 21:14:51 +01:00
d89d8acc59
I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour.
2019-10-24 20:40:03 +01:00
4ff46d14dd
Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring).
2019-10-24 19:55:02 +01:00
ea0fe50f5a
Fix CEZ3's first phase being cheated by Fang.
2019-10-24 19:33:03 +01:00
527254584d
Disable tailsbot in NiGHTS maps, not just Special Stages. ( Resolves #261 )
2019-10-24 19:16:53 +01:00
989e089e0a
resolve #263 (this is going into master because it's literally just the line being present twice)
2019-10-24 19:00:54 +01:00
a215eeabf0
* Fix Super players who die being eternally super.
...
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).
Resolves #259 .
2019-10-24 18:51:12 +01:00
c970911ac2
The console sucks, so "Don't" becomes "No" :lancer:
2019-10-23 17:37:09 -07:00
48173beb35
Menu options
2019-10-23 17:31:10 -07:00
cd252eb468
Console variables to toggle music/sound playing when the window is unfocused
...
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
2019-10-23 17:21:09 -07:00
9162ba87cc
Revert sound and music window focus related toggles
...
This partially reverts commit 5ac8a26814
2019-10-23 15:24:34 -07:00
bfce75d5cd
Disable restriction for ``DEVELOP`` builds only
2019-10-23 16:29:50 -04:00
0ef50557c2
Merge branch 'spinbust' into 'master'
...
Make spinbust behavior consistent with other bustable blocks
Closes #254
See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
8cd0ebb679
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Hazards
See merge request STJr/SRB2Internal!404
2019-10-23 02:51:00 -04:00
06bbbb5cf8
Put dashmode players in pain state when damaging enemy with >1HP
2019-10-23 13:54:15 +08:00
7be046e16c
Fix compile warnings
2019-10-23 13:46:30 +08:00
6d498fe357
Allow machine skins to damage objects in dashmode
2019-10-23 13:41:32 +08:00
52c5d49215
Apply HUD translucency to ping and FPS counters
2019-10-22 21:54:09 -07:00
d86be51472
Toggle ping and FPS counters with HUD
2019-10-22 21:50:51 -07:00
0b314a82bb
Use long double suffix
2019-10-22 21:48:15 -07:00
aa9f19512c
Use less confusing player sorting key names
2019-10-22 21:41:34 -07:00
39baca89d3
Do not start sound system when disabled
2019-10-22 21:39:37 -07:00
c201879d69
Add Metal's jet fume
2019-10-23 12:35:17 +08:00
923f43f887
Move change viewpoint control checking so it doesn't take precedence
...
Notably over chat.
2019-10-22 21:32:12 -07:00
5ac8a26814
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
12540dca32
Make "Focus lost" HUD overlay optional
2019-10-22 20:30:05 -07:00
43ca2c1b30
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
2019-10-22 20:14:01 -07:00
a24814c2fc
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
2019-10-22 20:09:33 -07:00
f0ee901160
Support adding to CV_FLOAT cvars with the Add command
2019-10-22 20:04:02 -07:00
135619af8b
Add a command to increment cvars
2019-10-22 20:03:45 -07:00
602c66d173
Grab mouse on window focus
...
Window focus does not necessarily imply mouse movement.
2019-10-22 19:45:43 -07:00
3ffa84a77b
Replace ping command with a condensed and sorted version
2019-10-22 19:40:05 -07:00
29a5999a44
"NEWPING" might as well be the only ping
2019-10-22 19:39:26 -07:00
d62674c184
Clang warnings
2019-10-22 19:18:56 -07:00
386ac78600
Merge branch 'mace-place' into 'master'
...
Make maces normally placeable in maps.
See merge request STJr/SRB2Internal!390
2019-10-22 13:29:06 -04:00
520deac658
remove last few specks of Windows CE code I missed years ago
2019-10-22 16:39:44 +01:00
dbd8e563b4
Merge branch 'soundex_tweak' into 'master'
...
Tweak Line Special 414's behavior
See merge request STJr/SRB2Internal!382
2019-10-22 05:31:22 -04:00
57a8af1557
Disable standalone hangable chains, since they're not a good mechanic.
2019-10-22 02:29:34 +02:00
acd28c001e
lmao I forgot the backside FOF
2019-10-21 14:44:16 -07:00
ea0a0f4f3c
Comment for insanity
2019-10-21 14:28:22 -07:00
e2f2166d24
Fix hang due to comparison not working on at least GCC 9.1
...
I have no idea what the fuck is going on here. k infinitely ascends. (Even
above integer restrictions when I made it UINT8.) I can only imagine some kind
of fuckery in the stack. Surely this is a compiler error.
2019-10-21 14:20:29 -07:00
3a3122e255
Add green flame sprites, state, and object
2019-10-21 16:22:20 +08:00
d6411b9549
Add new ATZ gargoyle sprites
2019-10-21 13:43:02 +08:00
c52ee364f5
Only allow landing in the melee ability mid-twinspin if jump or spin is held
2019-10-21 12:49:12 +08:00
e15ffd2bc8
Optimize texture/patch/png/flat flat caching
...
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.
Missing flats for now yield a HOM instead of REDFLR as well.
OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
2019-10-20 20:24:03 -07:00
441aceb116
Add new dashmode colormap
2019-10-21 04:37:56 +08:00
9d425b21e2
Modify initial platform sink to be more natural, while still toeing the line between "forgiving" and "punishing".
2019-10-20 19:13:46 +01:00
a2f0f61d75
Merge branch 'master' into linedef-153
2019-10-20 20:20:41 +08:00
57d29a9b65
Merge branch 'platterwrap' into 'master'
...
Prevent wraparound on Level platter when there are less than 3 rows
See merge request STJr/SRB2Internal!383
2019-10-20 06:45:05 -04:00
7c481744a4
Merge branch 'kartport_dedi' into 'master'
...
Kart-port dedicated server Lua fix (round 2)
See merge request STJr/SRB2Internal!387
2019-10-20 06:43:54 -04:00
41dd9c4f0a
Merge branch 'flats-fixes-13102019' into 'master'
...
Transparent flat fixes (Resolves #249 )
Closes #249
See merge request STJr/SRB2Internal!384
2019-10-20 06:42:17 -04:00
fcf05c728b
Merge branch 'master' into object_tweaks
2019-10-20 12:34:49 +02:00
54847b1949
Merge branch 'mapthingtweaks' into 'master'
...
Mapthing tweaks (object_tweaks division 1)
See merge request STJr/SRB2Internal!396
2019-10-20 06:33:01 -04:00
b219be6f5e
Remove level select restrictions in Multiplayer
2019-10-19 21:37:03 -04:00
1604e4d439
Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST
2019-10-19 22:20:48 +02:00
9c36cf00d8
Merge branch 'fix-player-state-resynch' into 'master'
...
Fix player state resynching
See merge request STJr/SRB2Internal!393
2019-10-19 16:15:19 -04:00
fc97ccd7d4
Fix item selection not returning to "Specify IPv4 Address"
2019-10-19 13:07:20 -07:00
4a15e2d1d8
Fix "You must specify an IP address" message returning to title instead of MP menu
2019-10-19 13:01:06 -07:00
dfdbc0afe3
Don't fade to character select from secret level select
2019-10-19 12:42:53 -07:00
25d8b7d5ea
Don't fade to Server Options
2019-10-19 12:25:02 -07:00
3e0a9cf742
Revert my old attempt of making the level music fade out before game over jingle
2019-10-19 14:36:30 -04:00
3f42834a98
Merge branch 'thinkerlists_oops' into 'master'
...
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v
See merge request STJr/SRB2Internal!395
2019-10-19 13:34:28 -04:00
c8629c2aab
Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins.
2019-10-19 18:16:52 +01:00
bf761a26d6
* Implement fixes/tweaks as written on the gitlab.
...
* `SPR2_NTAG` last vestiges removal.
* Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`.
* Fixed nametag colour issues.
* Support widescreen with nametags.
* Fix a metric SHITTON of compiler errors.
* Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`)
* GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`)
* Redefining `lines` within the scope of the global.
* Redefining `string` within the function-specific `string`.
* It would be recommended for y'alls to turn ERRORMODE on!
2019-10-19 18:15:54 +01:00
88d239ac36
Set the player's name as soon as they enter the game
2019-10-19 17:09:18 +02:00
7e04cbbc16
Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)
2019-10-19 16:01:04 +01:00
920736ac8b
Grouped ports from object_tweaks.
...
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
2019-10-19 15:57:01 +01:00
dfd6c5b9d2
Fix hw_light.c list (not gonna make an exe for this)
2019-10-19 15:50:16 +01:00
e549de392f
Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters.
2019-10-19 14:46:14 +01:00
7f26b90113
Decrease drag on directionchar in waterslides on sphere's request.
2019-10-19 14:32:34 +01:00
f2bbf53c0d
Change boost panel thing numbers per MS's request.
2019-10-19 14:32:15 +01:00
73c39990f9
Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real
2019-10-19 14:51:24 +02:00
c7fd22f98a
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v
2019-10-19 12:08:15 +02:00
8e9ada1093
* Add `MT_BANPYURA` and `MT_BANPSPRING` to `dehacked.c`.
...
* Correct spelling of `MT_BANPSPRING`.
2019-10-18 20:32:35 +01:00
ad09f2603d
* New object types!
...
* Red and yellow Boost panels!
* Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
* https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
* Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
* Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
* Banpyura!
* A Crushstacean with a spring instead of a crushclaw.
* https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
* Wanted this for a while, finally added it.
* Improved springs.
* Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
* Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
* They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
* Add above new types.
* Add Blue Diagonal Spring, which existed in the source but not the config.
* Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
246a6489e9
Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about)
2019-10-18 13:37:42 +01:00
07c02f075b
Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state.
...
Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.
2019-10-17 18:22:06 +01:00
c097ee563d
Merge branch 'master' into mi-tinkers-with-lua-again
2019-10-17 18:02:42 +01:00
26fed77671
Fix standalone hangable chains being broken, thanks to toaster.
2019-10-17 01:01:40 +02:00
28607a81b5
Kill off SPR2_NTAG
2019-10-16 18:25:20 -04:00
edea290b0f
Show "Press ESC to exit" string on NiGHTS Attack menu too
2019-10-16 18:00:54 -04:00
dc0a1899ec
Fix ifselectvalnextmapnobrace indentation
2019-10-16 17:49:21 -04:00
2cc129c5c0
Undo grabbable chains being placeable for now, since they're bugged.
2019-10-16 22:31:57 +02:00
92b92dd3eb
Fix clients being resynched at the wrong gametic
2019-10-16 21:24:30 +02:00
42de16b904
Make the maces and related objects normally placeable.
2019-10-16 21:12:04 +02:00
e3e87d7655
Compile fix.
2019-10-16 17:39:38 +01:00
77160ae37b
Just revert the `respawn`, `retry` and `suicide` stuff cuz it's apparently contentious. Who knew?
2019-10-16 17:38:38 +01:00
45e5f70eb8
Merge `retry` and `respawn` into one command, `respawn`.
2019-10-16 11:38:09 +01:00
38d044e475
Seperate name tag sprite into SPR2_NTAG
2019-10-16 00:22:05 -04:00
58ef85d591
Make nametag SPR2 frame be the last frame of SPR_XTRA
2019-10-15 23:41:01 -04:00
9c33f160a6
Lots of changes
...
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
2019-10-15 22:54:21 -04:00
360ae45994
Make use of MINVAL and MAXVAL consistent in COM_Help_f.
2019-10-15 13:46:45 +01:00
8f3e59b43d
Improved "HELP" command!
...
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
aa9bc574da
* Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue.
...
* Optimise M_ChangeCvar.
2019-10-15 12:24:31 +01:00
3185a66191
Quick macro substitution to make sure MAXSCORE is consistent.
2019-10-15 11:55:40 +01:00
910df54fb5
Added some examples of cvars that can use named values.
...
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
2019-10-15 11:49:37 +01:00
911fd9576b
Rework min/max cvars to allow for "named" values outside their range!
...
Kart-port round 3, with the original commit written by me, toaster.
2019-10-15 11:23:59 +01:00
079ef023c9
Fix dedicated server extra lua variables not being synched for joiners.
...
Original fix written by Lat`.
2019-10-15 10:49:14 +01:00
313b534911
More record attack stuff.
...
Show emblem requirements.
Committed because I need sleep...
2019-10-15 01:55:50 -04:00
37101f826e
Allow access to players userdata outside levels.
...
In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.
2019-10-14 22:12:26 -04:00
597949f370
Change this for consistency.
2019-10-14 21:47:20 -04:00
5007abee23
Collide with walls of FOF if both planes are intangible
2019-10-14 13:22:33 -07:00
9ef72c0862
Fix directionchar issue from faulty merge conflict resolution
2019-10-15 02:57:18 +08:00
b48d8cf68b
Merge branch 'master' into knuxstuff
2019-10-15 02:50:59 +08:00
9cad882626
Merge branch 'master' into knuxstuff
2019-10-15 02:49:44 +08:00
2f9a13d5e0
Make shatter blocks intangible to the player, but solid to everything else
2019-10-14 20:15:03 +02:00
2417c5aab2
Remove glide landing dust; put player in landing state after glide-sliding off a ledge
2019-10-15 01:40:56 +08:00
0836062edd
Limit climb camera rotation to a 180 degree cone
2019-10-15 01:19:58 +08:00
2f26cfad01
Prevent wraparound on Level platter when there are less than 3 rows.
...
Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.
2019-10-14 17:17:00 +01:00
c935797a34
Encapsulate the second behavior branch into an else.
...
When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-10-14 16:30:20 +02:00
edd016690d
A bunch of stuff
2019-10-14 02:24:44 -03:00
0f79396757
New intermission thinker hook
2019-10-13 20:50:46 -04:00
9e9a40cadb
Merge branch 'master' into newmenus
2019-10-13 20:12:48 -04:00
cb228c4938
Undo this
2019-10-13 20:12:28 -04:00
bf75a4c29f
New -port command line paramater
2019-10-13 20:04:45 -04:00
0cf2774129
remove duplicate NearestColor prototype
2019-10-13 19:45:35 -03:00
88d19a2d9c
fix holey textures
2019-10-13 18:37:41 -03:00
ad4033ec9e
Make shatter blocks solid
2019-10-13 23:08:54 +02:00
c71213155d
Unfuck glide slide/landing dust's P_RandomRange parameters
2019-10-14 04:08:07 +08:00
63a7fb6956
Merge branch 'anotherctgfix' into 'master'
...
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs)
See merge request STJr/SRB2Internal!378
2019-10-13 13:27:24 -04:00
46268214fc
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).
2019-10-13 17:48:40 +01:00
05a3023cb0
Merge branch 'nightsangle' into 'master'
...
Fixed NiGHTS spawnpoint angle camera jump fuckups
See merge request STJr/SRB2Internal!376
2019-10-13 12:47:32 -04:00
dabd0b2e01
Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request.
...
(Resolves #250 )
2019-10-13 16:30:29 +01:00
a5b5712be9
Fixed NiGHTS spawnpoint angle camera jump fuckups.
2019-10-13 16:15:46 +01:00
9bdb38df64
Merge branch 'lenient_acz3' into 'master'
...
Make ACZ3 Boss damage while bouncing more lenient
See merge request STJr/SRB2Internal!375
2019-10-13 11:08:26 -04:00
16a05d996e
Merge branch 'scrollwep' into 'master'
...
Add scroll-wheel weapon changing to default controls
Closes #248
See merge request STJr/SRB2Internal!374
2019-10-13 11:08:13 -04:00
01fbb91f7e
Merge branch 'bogus_requestskin' into 'master'
...
Fix bogus "requested skin not found!" print
Closes #247
See merge request STJr/SRB2Internal!373
2019-10-13 11:07:59 -04:00
008e232d78
Merge branch 'connect-to-ground-fix' into 'master'
...
Fix for A_ConnectToGround on gravflipped objects
See merge request STJr/SRB2Internal!372
2019-10-13 11:07:46 -04:00
57f756ddf1
Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off.
2019-10-13 15:30:51 +01:00
d9129db5ed
Add scroll-wheel weapon changing to default controls
...
(resolves #248 )
2019-10-13 15:19:31 +01:00
e62d097265
Fix "requested skin not found!" print happening whenever you select an unlockable character.
...
Also, since I'm less paranoid now - readd the skin number to its print.
2019-10-13 15:10:19 +01:00
636760760f
Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.
2019-10-13 14:41:17 +02:00
0350262a0f
On the recommendation of Sryder, revert everything relating to the `cpusleep` changes except for the new default value of 1.
2019-10-13 13:12:07 +01:00
6033f70b01
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes
2019-10-13 12:18:00 +01:00
4b965fe43b
Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier)
2019-10-13 12:17:24 +01:00
9ca227237a
Better cpusleep command. Sal said it better than I can, so in her words:
...
* Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
* New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.
2019-10-13 12:05:12 +01:00
5502242e8b
MD2 crash fix.
2019-10-13 11:59:38 +01:00
008f576560
Revert stupid 2.1-compat fuckup I did in slopes code.
2019-10-13 11:55:50 +01:00
a550eb79d3
Additional crash fix for papersprites.
2019-10-13 11:53:53 +01:00
a03ecac921
Merge branch 'openglskydome2' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
a7c0fe9672
Merge branch 'openmpt-crash-fix' into 'master'
...
libopenmpt related changes
See merge request STJr/SRB2Internal!351
2019-10-12 11:02:45 -04:00
71f93e7071
Merge branch 'sneakers-reduction' into 'master'
...
Reduce speed sneaker factor to 1.67x
See merge request STJr/SRB2Internal!368
2019-10-12 11:00:24 -04:00
6fab3d28b2
Merge branch 'OGL_regressions' into 'master'
...
Correct minor OGL regressions
See merge request STJr/SRB2Internal!361
2019-10-12 09:53:20 -04:00
8af715eb36
Merge branch 'left-right-ra-level-select' into 'master'
...
Left and Right Arrow keys also select level in Record Attack
See merge request STJr/SRB2Internal!363
2019-10-12 09:53:05 -04:00
d401862714
Merge branch 'amytweaks' into 'master'
...
Amy tweaks
See merge request STJr/SRB2Internal!366
2019-10-12 09:52:44 -04:00
a2a5983256
Prevent Time Attack level handler always beeping.
2019-10-12 09:42:03 -04:00
d735e1b9c2
Merge branch 'rvz-hardcode' into 'master'
...
RVZ hardcode
Closes #178
See merge request STJr/SRB2Internal!357
2019-10-12 09:37:23 -04:00
68a82c3849
Merge branch 'amycameo' into 'master'
...
Amy for Frozen Hillside (full pitch in description)
See merge request STJr/SRB2Internal!356
2019-10-12 07:16:26 -04:00
15bba9e1b0
Merge branch 'hoop_drawdist' into 'master'
...
Only apply NiGHTS draw distance to hoops
See merge request STJr/SRB2Internal!370
2019-10-12 03:10:53 -04:00
0f562d27d7
Merge branch 'fastgoop' into 'master'
...
Increased THZ goop speed by 25%
Closes #229
See merge request STJr/SRB2Internal!367
2019-10-12 03:10:26 -04:00
3600e1b140
Allow rollout rock's splash sound delay reduction to occur above water
2019-10-12 04:41:50 +08:00
a01373741b
Don't spam splash sounds on the rollout rock
2019-10-12 04:35:51 +08:00
2daeb81f36
Create new linedef special type 153: Dynamically Sinking Platform
2019-10-12 04:23:11 +08:00
68599ccc63
Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag
2019-10-11 21:02:11 +02:00
25971de368
Attempt to fix the offset issues.
...
Better than the previous commit, but not quite there yet.
2019-10-10 15:50:06 -04:00
1560453797
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
...
# Conflicts:
# src/p_map.c
2019-10-10 17:51:29 +01:00
354429ca39
Merge branch 'intro-sky-fix' into 'master'
...
Fix the sky on the intro cutscene not scrolling.
Closes #220
See merge request STJr/SRB2Internal!353
2019-10-10 02:36:53 -04:00
7fedde9811
Merge branch 'promiscuousplanes' into 'master'
...
Headbumps and associated
Closes #242
See merge request STJr/SRB2Internal!360
2019-10-10 02:36:10 -04:00
c17a3227a0
Merge branch 'bumperstuff' into 'master'
...
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
Closes #246
See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04:00
a138c0ebf2
Merge branch 'acz_touchups' into 'master'
...
ACZ touchups
Closes #209 , #208 , and #158
See merge request STJr/SRB2Internal!359
2019-10-10 02:34:46 -04:00
4af432e658
Basic outline color support.
...
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
2019-10-10 02:00:52 -04:00
b2529136e0
Reduce speed sneaker's top speed factor to 1.67x
2019-10-09 21:39:51 +08:00
d553b6a011
Add sounds to rollout rock in lava
2019-10-09 15:06:50 +08:00
82fcdf4d43
Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound)
2019-10-09 14:24:27 +08:00
18bf8aa6e4
WIP: New character select name font
2019-10-09 00:28:01 -04:00
43e13b38c9
Change one of the Pyrefly captions.
2019-10-08 19:45:43 +01:00
1155a7c3a0
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
...
# Conflicts:
# src/p_mobj.c
2019-10-08 19:43:43 +01:00
4870107974
Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V )
2019-10-08 16:38:53 +01:00
bc794a2227
Players can jostle free from Pterabytes
2019-10-08 00:00:41 +02:00
788415a4db
Don't apply autobrake to Pterabyte-carried players
2019-10-07 22:33:06 +02:00
0fceb66e71
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 22:23:52 +02:00
ce5d0691ac
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
2019-10-07 19:12:03 +02:00
8062422f13
Fixed wrong sound being played by Pyreflies with Ambush
2019-10-07 19:11:36 +02:00
3412eb655a
Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)
2019-10-07 22:51:13 +08:00
77dd5260ab
Allow rock to disappear if unridden for 12 seconds
2019-10-07 22:22:51 +08:00
46a1d6897c
Address checkbox 1 and 2 of #235 .
...
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
2019-10-07 15:03:28 +01:00
c64997bfe5
Add Ambush and Flip flag behaviors
2019-10-07 20:55:58 +08:00
d84564d9f2
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 13:08:49 +01:00
95f6e2008f
Better rollout behavior in lava
2019-10-07 15:25:32 +08:00
2113774a6a
Don't deplete special stage timer in water if you have water protection
2019-10-07 09:01:17 +02:00
bfb9bac5bd
Collision polish
2019-10-07 14:51:32 +08:00
fe2f383997
Fixed a typo
2019-10-07 08:36:40 +02:00
bed9dff077
Readability changes
2019-10-07 13:36:36 +08:00
306779fac0
Readability changes
2019-10-07 13:35:10 +08:00
7850d43725
Let ridden rollout rocks collide with other players
2019-10-07 13:14:23 +08:00
6fd645ef27
A-arrows on Record Attack level select
...
Menu code sucks, did you know?
2019-10-06 14:45:42 -07:00
0be3743450
Key handler to allow selecting map by arrow keys in Record Attack
...
Enter still goes to the platter.
2019-10-06 14:11:16 -07:00
7746767735
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
058ed632de
Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players.
...
Springs and gas jets are exempt because all hell might break loose otherwise.
2019-10-06 19:53:54 +02:00
9b94fd3752
* Add rudimentary support for MF2_LINKDRAW in GL.
...
* Allow MF_ENEMY objects to flash, just as they do in Software.
2019-10-06 16:31:13 +01:00
a2f8b84b5a
Good catch by MS.
2019-10-06 16:17:11 +01:00
toaster
