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
d19aebb01a
* Fix Minus being intangible after launch.
...
* Implement MS's temp bodge-fix for the TNT getting stuck on the player.
2019-10-06 16:15:13 +01:00
df172ee33f
Fix Minus being intangible after it pops up.
2019-10-06 16:09:33 +01:00
8b1a20f415
Fix Minus causing crashes if it picks up a Snapper.
2019-10-06 16:04:19 +01:00
aec5f26819
Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.)
2019-10-06 15:44:24 +01:00
5bbc31c18f
Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups
...
# Conflicts:
# src/p_enemy.c
2019-10-06 15:18:59 +01:00
2d33950590
Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode
2019-10-06 22:12:47 +08:00
cc87ba39c2
There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.)
2019-10-06 15:11:00 +01:00
79b95a53ed
Fix Snapper's head snapping to higher planes, and add gravflip support.
2019-10-06 15:04:04 +01:00
a5704238c7
Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2.
...
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
2019-10-06 14:34:25 +01:00
defffd667e
Fixed and simplified the big fern leaf spawning code
2019-10-06 14:18:27 +02:00
93ce5bb94d
Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why).
...
Fully resolves #209 , in any case.
2019-10-06 12:14:18 +01:00
df2600cbea
Resolve #208 .
...
* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
2019-10-06 12:13:13 +01:00
17a2d1071c
Spawn big fern leaves relative to angle
2019-10-06 10:30:22 +02:00
357baeaa60
Added gravflip support to lavafall, Pyre Fly and Pterabyte
2019-10-05 22:20:48 +02:00
a7d6ebd5bd
Lavafall lava also kills rings
2019-10-05 20:37:48 +02:00
2f4edc0cb9
Players carried by Pterabyte cannot adjust their angle and are in their falling state
2019-10-05 20:29:47 +02:00
b9c3f72112
Grouped MFE_TOUCHLAVA together with the other liquid-related flags
2019-10-05 20:10:07 +02:00
16d077fde3
Coins don't melt in lava and lavafalls have displayoffset 1
2019-10-05 20:00:54 +02:00
0235d9e7ec
Fix Saloon doors.
...
* Make the center be the object stuff collides with, so that if the door is open people can't slip through.
* Add an MF_AMBUSH enhancement to allow non-minecart players to travel through.
* Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 13:21:35 +01:00
99220ae48b
Fixed a typo
2019-10-05 10:45:24 +02:00
cabc4e0294
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
b180fd7c91
Update to 9/25 Lua script
2019-10-05 03:02:27 +08:00
b120193eb7
Fix AI angling
2019-10-05 02:48:20 +08:00
00697caa6e
Initial commit
2019-10-03 12:49:46 +08:00
1750ed5383
nights attack
2019-10-02 22:02:13 -03:00
a7dcf534ca
character select
2019-10-02 21:57:04 -03:00
a0e9fbfffe
test
2019-10-02 21:28:02 -03:00
6a8539c8f1
test
2019-10-02 20:00:43 -03:00
27c9fe5047
Fix false comment
2019-10-03 02:31:32 +08:00
625de1f4f6
Some changes.
...
Restore the menu headers for record attack and character select menu.
Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).
2019-10-01 23:40:59 -04:00
6b10ffb88f
Merge branch 'master' into newmenus
2019-10-01 16:52:31 -04:00
5c1fabfaae
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
24e80c9b23
Made solid lava walls damaging
2019-10-01 21:17:33 +02:00
f224e03e1d
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 18:19:37 +01:00
b72609f7f7
Merge branch 'master' into mi-tinkers-with-lua-again
2019-09-30 20:51:29 +01:00
5460e0e1f9
Merge branch 'master' into acz-fixes
2019-09-30 20:50:33 +02:00
e75dee7747
Fix various minus carrying bugs
2019-09-30 20:35:47 +02:00
5bbd56b6fa
Improve glide bounces
2019-09-30 16:35:05 +08:00
7d57d53d45
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 14:38:58 +08:00
ebe99dad7a
Make comment more clear
2019-09-30 01:29:57 -04:00
592a98a3e8
Fix the sky on the intro cutscene not scrolling.
2019-09-30 01:25:21 -04:00
c72b5d8a49
Allow retention of momentum when climbing off surfaces
2019-09-30 10:55:57 +08:00
906a2b1f59
Merge branch 'master' into knuxstuff
...
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
d67804cb9c
png fix yes so cool
2019-09-29 19:10:49 -03:00
7eb5155240
sprite2info soc yummy yummy yes
2019-09-29 19:03:10 -03:00
d301d2bba4
Fixed a bug with the ring lava melting
2019-09-29 23:22:38 +02:00
4375ea8089
Lava now melts rings!
2019-09-29 23:11:21 +02:00
3d985c1b9e
Pterabytes can now swoop you off a rollout rock
2019-09-29 22:13:10 +02:00
6c0e4a154d
Resolve merge conflicts
2019-09-30 03:07:03 +08:00
e57b0f7126
(Hopefully) cover all cases for resetting rock usability
2019-09-30 03:05:08 +08:00
b2ac64f24c
better soc
2019-09-29 15:53:04 -03:00
cd45bca848
Pterabyte: Don't drop off player in the first ten tics after grabbing
2019-09-29 19:51:27 +02:00
c00144a4f8
Pterabyte: Don't target players who are invincible after being hurt
2019-09-29 19:29:34 +02:00
318fde6ae7
Giant mistake
2019-09-29 14:12:53 -03:00
9431497f7d
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/p_map.c
# src/p_user.c
2019-09-29 18:49:53 +02:00
26ecab14d7
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
4a0848acd7
I want to be able to stack skins in a sprite2 block
2019-09-29 12:41:15 -03:00
82be346091
change comment and error message
2019-09-29 12:16:38 -03:00
c268743220
hehee
2019-09-29 12:13:51 -03:00
60cbc2e6b4
Remove unused locals
2019-09-29 21:29:37 +08:00
71603006dc
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
8abb6129c1
Hardcode pumice ball
...
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
22e3c37e5d
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
2019-09-29 11:58:33 +02:00
598047ae8b
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
bea7224ebf
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00
73e4e67595
JIMITA DO THE SOC
2019-09-28 19:13:51 -03:00
b74cfca3e2
JIMITA DO TH EROTSPRITE
2019-09-28 17:56:27 -03:00
52562c4125
whoops, didn't mean to include this
2019-09-28 20:45:44 +01:00
8aefc03409
quick maths
2019-09-28 13:40:40 -03:00
6574e1a7d3
memory management
2019-09-28 12:50:07 -03:00
5118f8589d
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
cf852e7d39
Fix crash if speed is too high
...
Also update libopenmpt
2019-09-27 23:53:19 -04:00
0aba0aa4b9
Merge remote-tracking branch 'origin/master' into openglskydome2
2019-09-27 22:47:10 -03:00
fa444a37eb
Added < 0 checks to all three variables added in last commit
...
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
2019-09-27 23:15:38 +01:00
240aa34794
Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request
2019-09-27 21:16:11 +01:00
ff8c43664a
Merge branch 'addons-menu-cleanup' into 'master'
...
Addons menu cleanup
See merge request STJr/SRB2Internal!316
2019-09-27 08:55:36 -04:00
55a2f1ee1f
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
40a7b67a86
Merge branch 'dsz3shockwave' into 'master'
...
Deep Sea Zone 3 hardcoding
Closes #185
See merge request STJr/SRB2Internal!349
2019-09-27 08:54:57 -04:00
65d9c52884
Merge branch 'automap-fixes' into 'master'
...
Automap fixes
See merge request STJr/SRB2Internal!348
2019-09-27 08:52:59 -04:00
3f1d84a6b3
Merge branch 'patch-fixes' into 'master'
...
Patch fixes (Resolves #230 )
Closes #230
See merge request STJr/SRB2Internal!347
2019-09-27 08:52:41 -04:00
4d058d1d25
Merge branch 'lachfixes' into 'master'
...
Several bug fixes!
Closes #210 , #192 , and #189
See merge request STJr/SRB2Internal!345
2019-09-27 08:52:23 -04:00
c091174f2e
Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master'
...
Resolve "Tails AI should die when taking damage in Ultimate"
Closes #231
See merge request STJr/SRB2Internal!344
2019-09-27 08:51:11 -04:00
c97037e98e
Merge branch 'inputstuff' into 'master'
...
Trigonometric input capping
See merge request STJr/SRB2Internal!343
2019-09-27 08:50:55 -04:00
bc128dffdc
Fix compiling errors, thanks to toaster.
2019-09-26 23:15:52 +02:00
264c60fb70
P_SetTarget fixes, added SPR_SHCK to hw_light.c
2019-09-27 02:13:02 +08:00
ec1712064c
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH)
...
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 17:06:29 +01:00
d5e0ac1450
Added A_Boss3ShockThink to dehacked.c
2019-09-26 18:57:25 +08:00
c9c9f95057
Lowered shockwave speed
2019-09-26 17:12:03 +08:00
0cd3e4fd62
Hardcoded DSZ3 shockwave
2019-09-26 05:27:51 +08:00
75ee3193f4
Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last.
...
1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha)
2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself
3) ??? profit
Untested and uncompiled atm, but I have some confidence this might work
2019-09-25 20:27:41 +01:00
fb9248793a
Fix errormode compilation error
2019-09-25 23:09:05 +08:00
313fed2a59
Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side.
2019-09-25 15:49:37 +01:00
c1750d9359
Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)
2019-09-25 22:36:48 +08:00
9504d078e4
Don't lock on if something is literally intangible.
2019-09-25 15:12:19 +01:00
2a452ddcf5
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was?
...
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.
To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.
Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 14:36:20 +01:00
77613018f8
(Crudely) fixed camera jitter on certain FOF slopes
2019-09-25 21:15:19 +08:00
264d82c8d0
Fixed Brak's flames not animating
2019-09-25 20:32:56 +08:00
68ee7a6658
Fixed spectators taking unwarranted damage in splitscreen
2019-09-25 17:13:03 +08:00
5de1225b3e
Hopefully added the newline back?
2019-09-25 05:06:04 -04:00
3b30b9d656
Add parentheses over change
2019-09-25 05:00:43 -04:00
09868d2999
Dust devil fixes
2019-09-25 16:32:06 +08:00
637490e2de
AI players no longer take shield damage in Ultimate mode
2019-09-24 23:49:20 -04:00
c7f6db5c07
remove unused macros
2019-09-24 19:54:16 -03:00
a197449854
INT32 -> boolean
2019-09-24 19:49:24 -03:00
886fe2ad86
remove unused struct
2019-09-24 19:46:52 -03:00
b022ebe912
better crosshair
2019-09-24 19:44:30 -03:00
f7c1727959
fix automap FRACBITS confusion
2019-09-24 19:11:52 -03:00
51cee6d5bd
removed outdated comment
2019-09-25 03:16:04 +08:00
dc637736ea
Trigonometric input capping
2019-09-25 03:12:56 +08:00
e69dd9bd75
Automate the silly joystick menu items definition
2019-09-23 20:54:53 -07:00
5cdbde25c1
All for a cvar...
2019-09-23 20:23:40 -07:00
6a870b4467
Various of changes
...
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
d9507d62f8
ignore TRANSPARENTPIXEL
2019-09-23 19:20:59 -03:00
61aa84d15a
pixel alpha mistake
2019-09-23 18:27:43 -03:00
9c7b3f1d80
patch fixes
2019-09-23 18:25:53 -03:00
98d0a0d98e
Added bounce-off behavior for multi-hit enemies/bosses
2019-09-24 03:54:04 +08:00
3fdf48f9b0
Further cleanup
2019-09-24 03:21:01 +08:00
41d718dabf
Cleanup
2019-09-24 03:10:41 +08:00
de294d84e7
Lots of CA_GLIDEANDCLIMB changes:
...
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
dfee7efd33
Merge branch 'master' into internal-hotplug-stableid
2019-09-23 00:44:34 -04:00
73146a8338
Restore code that somehow got reverted???
...
How did this even happen??
2019-09-22 20:30:07 -04:00
e897f5df45
Sneakers affect max glide speed, changed glideslide behavior
2019-09-23 02:56:01 +08:00
0772ee693c
Merge remote-tracking branch 'origin/master' into knuxstuff
...
Update to master branch
2019-09-23 00:21:35 +08:00
e9d211d2bc
reallowed strafe key leeway, increased leeway strength
2019-09-23 00:21:28 +08:00
203f9d8c1a
Trying out a new glide
2019-09-22 21:11:49 +08:00
f7ad5501e1
Increase emblem and token hitbox sizes.
2019-09-22 04:19:09 +02:00
f8c97aeb27
Tweak bubble grabbing behavior.
2019-09-22 04:05:22 +02:00
c36123aa56
Mark new-style log names as loaded.
2019-09-20 17:43:41 +01:00
113568095a
* Resolve compiling issues with logmessages.
...
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
2019-09-20 17:22:09 +01:00
8d3d5566b8
Undo file mode change on menu files
2019-09-20 12:18:57 -04:00
7da89e3bc9
Merge branch 'camerafix' into 'master'
...
Camera fixes
Closes #105
See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
661966ced6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae
2019-09-20 16:45:06 +01:00
880c2cdada
Merge branch 'playerfixes' into 'master'
...
Some Player fixes and enhancements
Closes #216 , #219 , #222 , and #224
See merge request STJr/SRB2Internal!334
2019-09-20 11:39:32 -04:00
20d098de8f
Merge branch 'betterdirs' into 'master'
...
Better directory structure
See merge request STJr/SRB2Internal!321
2019-09-20 11:36:56 -04:00
361be5c659
Merge branch 'nmus-pk3' into 'master'
...
Support W_VerifyFile on PK3
See merge request STJr/SRB2Internal!328
2019-09-20 11:35:22 -04:00
d59c02fc0b
Merge branch 'timerfix' into 'master'
...
Timerres fix
Closes #213
See merge request STJr/SRB2Internal!338
2019-09-20 11:34:50 -04:00
19e0e43e87
test??
2019-09-20 12:07:57 +08:00
bf55dd293e
Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 21:43:57 -04:00
530b5784b8
platersprite_t is not the same as unsigned
2019-09-19 21:42:59 -04:00
322a0b8c41
Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 22:41:45 -03:00
ef7e8c5d58
use byteptr.h macros
2019-09-19 22:40:23 -03:00
4c7a7a7e0b
Small DSZ coral tweaks.
2019-09-20 00:51:44 +02:00
222d4f2b7c
Improved orbital camera in Software; cam_adjust cvars changed to on by default
2019-09-20 02:02:17 +08:00
802ddf94b1
Always pretend cv_playersforexit is 4 in co-op special stages.
2019-09-19 18:44:55 +01:00
a3ea2274f4
Fix inconsistency between score tally screen and timerres cvar ( Resolves #213 ).
2019-09-19 17:43:23 +01:00
f8475eef26
Disable some code which sometimes makes the player enter walking frames when jumping up to a platform, such as the CEZ3 buttons, despite still being in jumping mode.
...
If this causes more problems than it solves it can be reverted, but doing a bunch of playthroughs of DSZ1/2, GFZ1, and CEZ3 didn't seem to uncover anything, so I'm tentatively putting it in this branch.
2019-09-19 13:20:52 +01:00
ca9e6e31da
* Resolve #224 (landing frames on ceiling contact).
...
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00
cf14d5fe5d
* Remove sounds from swimming.
...
* Lower default swim animation speed.
* Make speed of flight/swim animation increase whenever mashing jump.
2019-09-19 12:30:30 +01:00
c2f7b14336
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes
2019-09-19 12:00:55 +01:00
5015f8e142
Added Camera Options submenu (provided my files aren't broken again (please D:))
2019-09-19 17:34:04 +08:00
c81452211d
Updated ACZ cacti.
2019-09-18 21:40:33 +02:00
284ced06ec
Merge branch 'master' into new_algae
2019-09-18 20:17:36 +02:00
f870b5237f
* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added.
...
* Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 17:48:41 +01:00
4e36cd82d3
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes
2019-09-18 17:24:56 +01:00
a5460c7451
Correct location of MT_CACTI10 and MT_CACTI11 in relation to their positions given in info.h and dehacked.c (fixes several ACZ-related crashes)
2019-09-18 17:24:22 +01:00
3285cc9a0d
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 16:06:13 +01:00
2ed9d957b0
Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2)
2019-09-18 15:26:21 +01:00
5d37ddd676
Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed.
2019-09-18 14:16:52 +01:00
a8a8ae0d0b
Only set flight time to 0 if skin has SPR2_SWIM spriteset.
2019-09-18 14:11:06 +01:00
e993b8981e
Fix solidity of lava in reverse gravity. ( Resolves #216 )
2019-09-18 13:55:20 +01:00
9d774f7578
More swim stuff!
...
* Prevent being able to damage enemies from below while swimming.
* Make the swim-specific bubbles happen at the hands instead of where the propeller would be.
* Improve placement/angle of swimming tails overlay.
* Immediately set flight time to 0 if a player is being carried underwater.
2019-09-18 13:46:17 +01:00
6a63802afa
Merge branch 'patch-blending-aggregate-return-fix' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into charfixes
2019-09-18 12:46:36 +01:00
e230d7351c
Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is:
...
* Fix S_PLAY_FLY_TIRED animation being fast.
* Add moving tails to S_PLAY_SWIM animation!
* Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219 , hopefully..?)
2019-09-18 12:46:18 +01:00
45a99ce318
Change startchar's default value to 0 ( Resolves #222 ).
2019-09-18 12:26:34 +01:00
5f6c702ed6
sky barreling
2019-09-17 23:38:04 -03:00
a6831aff9c
compile fix
2019-09-17 22:29:53 -03:00
81d1453dc4
New animated DSZ kelp.
2019-09-18 02:05:19 +02:00
35e3d9acab
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
2a33ffb7d7
PNG support: use png_const_bytep, so we do not drop const type
2019-09-17 16:18:54 -04:00
e179e1f9c4
Merge branch 'morecactis' into 'master'
...
More harmful cactus
See merge request STJr/SRB2Internal!329
2019-09-16 16:36:06 -04:00
777e7f8760
Merge branch 'deathstuff' into 'master'
...
Lots of death stuff
Closes #207
See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
21b5ebf6fa
Merge branch 'abilityclean' into 'master'
...
Clean up an ungodly amount of shit relating to abilities.
Closes #195 , #167 , and #177
See merge request STJr/SRB2Internal!307
2019-09-16 16:09:20 -04:00
71cc09c8c2
Merge branch 'luabanks' into 'master'
...
Lua save-banks!
See merge request STJr/SRB2Internal!295
2019-09-16 07:56:49 -04:00
db979845e0
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
a86e2332da
Fix MD2 loading
2019-09-15 16:24:17 -03:00
4e1791bbf4
Merge branch 'croppedpatchbleed' into 'master'
...
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.
See merge request STJr/SRB2Internal!311
2019-09-15 12:37:46 -04:00
32769f6c71
Merge branch 'png-patches' into 'master'
...
PNG patches
See merge request STJr/SRB2Internal!327
2019-09-15 12:23:46 -04:00
9771087554
Always force player camera direction for springs with horizontal thrust component.
2019-09-15 17:43:19 +02:00
3ebb9c2c49
More harmful cactus
2019-09-12 21:36:13 -04:00
86f9609623
Support W_VerifyFile on PK3
2019-09-12 17:06:57 -07:00
2a04ac69e1
()
2019-09-12 16:12:31 -03:00
acc8dae274
Merge remote-tracking branch 'origin/master' into png-patches
2019-09-12 16:04:20 -03:00
6c37576bc0
Moved this macro
2019-09-12 16:03:44 -03:00
00d64c380d
Merge branch 'newicon' into 'master'
...
New EXE icon
See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
a0ec86ce01
Fix powers-of-two checks
2019-09-12 14:32:31 -03:00
9006bdd6a3
I_Error if no frames are found for a loaded skin's SPR2_STND subspriteset, given this is what everything will default to if nothing else is provided, and I really don't wanna go across the code adding checks for sprite2s not existing (since R_GetSkinSprite2, under all circumstances other than this one, is capable of bouncing back).
2019-09-12 12:52:25 +01:00
9b0e2b8991
Make nametags compatible with current player.dta
...
(again)
2019-09-11 22:18:03 -03:00
f2915817a7
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-11 22:17:42 -03:00
e3df9cc6b1
Crash prevention
2019-09-11 20:38:15 -03:00
a5ff609873
Read user chunks
2019-09-11 20:18:04 -03:00
affff0a7e5
Merge remote-tracking branch 'origin/master' into png-patches
2019-09-11 17:08:17 -03:00
ed551f2536
Transparency, not translucency
2019-09-11 17:03:50 -03:00
aa91627ba2
Allow PNG graphics to be used as patches
...
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
323c7fa064
Increase maximum number of Luabanks to 16 on Steel's suggestion. (Using the Web IDE 'cuz I'm tired, so no new exe; luckily I made the code flexible to constant replacement!)
2019-09-11 14:22:56 -04:00
440b63ef13
Merge branch 'musicplus-resetmusic-followup' into 'master'
...
Follow-up fixes for reset-upon-dying music
See merge request STJr/SRB2Internal!284
2019-09-11 14:14:09 -04:00
9aed6374cd
Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.)
2019-09-11 17:32:41 +01:00
2ced626518
Merge branch 'gl_skydome' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!326
2019-09-11 11:58:05 -04:00
1bafec9f55
Merge branch 'ast_newstyles' into 'master'
...
Patch translucency styles
See merge request STJr/SRB2Internal!324
2019-09-11 11:57:45 -04:00
737690c8b8
Added cam_adjust, de-ghettoified the camera in general
2019-09-11 10:45:59 -04:00
10a0b38ab1
Fix an issue where completing a stage normally would not correctly set startrings for the next one (as opposed to warping directly or dying inside it).
2019-09-11 14:25:22 +01:00
fe7e374e3b
Fix the Save Select platter drawing for the new player signpost art.
...
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
2019-09-11 13:32:12 +01:00
ab1472bfc1
Tweak gameovertics slightly to avoid having no sound for too long.
2019-09-11 13:30:24 +01:00
ed5e8c486c
Continue screen! With aaaaaall the new assets to go with it.
...
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
2019-09-11 00:50:51 +01:00
fec579db8c
Merge remote-tracking branch 'origin/master' into gl_skydome
2019-09-10 19:20:20 -03:00
f1cc17ea02
Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions
2019-09-10 17:25:21 -03:00
eb1b6eedeb
some adjusts
2019-09-10 16:54:40 -03:00
4be108fa76
Lach has blessed us with a remade cam_adjust.
2019-09-10 10:11:03 -04:00
25e975e781
Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h!
...
These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.
2019-09-10 15:06:20 +01:00
6c2ef39408
Update SPR2 defaulting for SPR2_CNT1.
2019-09-10 14:44:04 +01:00
f0788598c9
Better fades
2019-09-09 23:31:48 -03:00
aebff2a430
Merge branch 'undo_322' into flats-png_port
2019-09-09 15:05:43 -04:00
470ac5fed2
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
...
This reverts commit 043bb86acd
2019-09-09 15:05:17 -04:00
9d64ee88a0
Be clear on what FALLTHRU we really want
2019-09-09 15:02:13 -04:00
043bb86acd
Revert "Merge branch 'flats-png_port' into 'master'"
...
This reverts merge request !322
2019-09-09 18:40:21 +00:00
0a69190848
Missing arguments
2019-09-09 15:39:10 -03:00
6553d816ea
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
2b0344a22f
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-09 15:25:48 +01:00
e5d9d3499f
DON'T PUSH ALONE - first dregs of continue screen
2019-09-09 15:25:36 +01:00
555b4e1766
Fix function being redefined
2019-09-08 19:39:23 -04:00
8c035ecb86
Merge branch 'lightning_polys' into 'master'
...
Lightning Polys
See merge request STJr/SRB2Internal!294
2019-09-08 19:04:56 -04:00
0392cfc158
Merge branch 'spawnobject-linedef' into 'master'
...
Linedef type 461 (Spawn Object)
See merge request STJr/SRB2Internal!304
2019-09-08 18:58:50 -04:00
1bf78a2423
Move mobj_t declaration to top of the block
2019-09-08 17:14:47 -04:00
cc80cd77c5
Fix this mistake
2019-09-08 16:54:40 -04:00
c696063260
Merge branch 'mprelated-tweaks' into 'master'
...
Various improvements and changes to multiplayer menu
See merge request STJr/SRB2Internal!300
2019-09-08 16:45:14 -04:00
9041a399c6
Merge branch 'nightsattackfixes' into 'master'
...
NiGHTS attack fixes
Closes #205
See merge request STJr/SRB2Internal!319
2019-09-08 16:42:45 -04:00
e03d03110b
Merge branch 'ending-star' into 'master'
...
Endings: Fireworks fallback graphics.
See merge request STJr/SRB2Internal!296
2019-09-08 16:28:52 -04:00
ba50a03d9c
Update SPR2_XTRA references for adjusted player.dta content.
2019-09-08 21:28:12 +01:00
6815748a3e
Merge branch 'flippost' into 'master'
...
Flippost
Closes #206 and #191
See merge request STJr/SRB2Internal!320
2019-09-08 16:24:58 -04:00
11e3f5ec96
Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale.
2019-09-08 21:21:36 +01:00
0ed589449a
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
2c898841e9
Extend gameovertics again by two seconds.
2019-09-08 18:03:51 +01:00
4dc9a95224
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-08 18:00:25 +01:00
2e90c40934
Fade time before Game Over track.
...
Notably, can no longer use P_PlayJingle because of pre-fade.
2019-09-08 18:00:01 +01:00
ff1fa3f92b
Implement all the other alpha blend styles
2019-09-08 13:21:00 -03:00
995ab1c84d
Merge branch 'master' into internal-hotplug-stableid
...
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
2019-09-08 01:55:36 -04:00
8ee0a9309b
Better directory structure
2019-09-08 01:29:09 -04:00
807614d02d
Add _ to the record and nights attack tracks for organization
2019-09-07 22:57:20 -04:00
abfa5e10b6
Make nametags compatible with current player.dta
2019-09-07 23:40:00 -03:00
7780de9edc
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-07 22:25:47 -04:00
b7c9f15225
Fix NiGHTS attack menu not drawing correct background
2019-09-07 22:00:38 -04:00
4adff34402
opengl patch translucency
2019-09-07 22:43:29 -03:00
a67dd633ff
if that function can't return NULL why should i do this?
2019-09-07 19:02:50 -03:00
3cc2b76fb8
probably want to Z_Free this...............
2019-09-07 18:56:08 -03:00
ff293c3f6f
fix non powers of two spans
2019-09-07 18:20:49 -03:00
d26ff197dc
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
...
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191 ).
2019-09-07 22:12:47 +01:00
f461b76bb0
fix translucency
2019-09-07 16:54:26 -03:00
5d85e82fa6
Fix detection of GRADE_ constants in SOC.
2019-09-07 20:08:05 +01:00
c6af108d8c
Merge branch 'musicfixes' into 'master'
...
Minor musicplus-related fixes
See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
d998dad2ad
Merge branch 'stop-bullying-tails' into 'master'
...
Ignore bots when looking for a player
Closes #190
See merge request STJr/SRB2Internal!301
2019-09-07 11:44:46 -04:00
a287b9e317
Merge branch 'fix_skipintro' into 'master'
...
Fix -skipintro in OpenGL
See merge request STJr/SRB2Internal!308
2019-09-07 11:44:09 -04:00
52a4b77f83
Merge branch 'devmode-toggletwod' into 'master'
...
DEVMODE: 2D toggle command
See merge request STJr/SRB2Internal!309
2019-09-07 11:43:01 -04:00
92b77c987b
Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)
2019-09-07 12:10:50 +01:00
5640aa955a
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.
2019-09-07 12:07:29 +01:00
cf4b5a1b9d
* Comment out the notices that the two types of music are disabled (see issue #179 ; not a perfect fix, but good enough for now).
2019-09-07 11:49:13 +01:00
54b89eefbb
* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).
2019-09-07 11:48:58 +01:00
99b4439b2a
* Allow CA2_GUNSLINGER users to pop monitors with their ability (as long as their weapon type isn't a pre-existing weapon ring).
...
* Correct the position of a carried player relative to Tails.
2019-09-07 11:33:26 +01:00
bc52bc83cc
2D toggle command
2019-09-06 20:51:39 -04:00
d38ba4d88c
define stuff idk
2019-09-06 19:41:29 -03:00
02a7d8e0a2
Fix tilted spans.
2019-09-06 19:37:07 -03:00
2a85ed0bdd
test
2019-09-06 19:26:05 -03:00
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
de4a609421
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-06 16:08:18 -03:00
f3cf3ca453
Cleanup.
2019-09-06 16:05:46 -03:00
56abc63c29
Ignore key held events.
2019-09-06 15:25:11 -03:00
a991a10ffc
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-06 15:10:09 -03:00
bb2012a8d0
Clean up an ungodly amount of shit relating to abilities.
...
* Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker.
* Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS.
* Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195 ).
* Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it.
The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
2019-09-06 19:01:46 +01:00
6aedca899f
2.2 skies aren't flipped
2019-09-05 17:42:36 -03:00
c6f3e4d53d
Make sky dome look a bit better
2019-09-04 13:59:09 -03:00
5bc034bc3e
[slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter
2019-09-04 15:52:25 +01:00
0986195d21
Bunch of fixes for dying in MP special stages.
...
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
7177d76cfd
Seperate "Game" and "Over" assets, per Sev's request and design.
...
https://cdn.discordapp.com/attachments/428262628893261828/618812279127015475/srb20069.gif
2019-09-04 15:21:00 +01:00
f0b4a609a8
Very tiny fix
2019-09-03 23:44:04 -03:00
53ddf19f94
Interpolation flag support
2019-09-03 22:57:54 -03:00
4760ff0963
Crash prevention
2019-09-03 21:31:32 -03:00
916bdeb880
3 digits frame number
2019-09-03 18:31:59 -03:00
1dca3338fd
Sprite2 support but I'm not a dumbass
2019-09-03 18:27:22 -03:00
4c39225c3e
Merge branch 'public_next'
2019-09-03 19:07:57 +01:00
f6d2b5109b
PRBoom sky dome
2019-09-03 02:12:17 -03:00
57974168c8
WIP 2.2 title screen (Alacroix)
2019-09-02 22:40:28 -04:00
1fca5a749e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-02 23:36:30 -03:00
6b151ef4ea
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-02 23:36:15 -03:00
1e506ef180
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 23:35:36 -03:00
3f00bc1639
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-02 23:34:25 -03:00
c21d83e8af
Sprite2 support!
2019-09-02 23:29:16 -03:00
d99026df3b
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
f07309707d
Lots of death stuff.
...
* Genesis-style love and attention to the death event.
* Only visibly decrement lives/rings when you're respawning (or game over, see below).
* Faster no-button-press respawn.
* Game Over specific love.
* Animation of Level Title font coming in from the sides.
* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
* Change gameovertics to 10 seconds instead of 15.
* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.
Also, two not-quite death things which nonetheless were relevant to change:
* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00
fe99c64511
Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3)
2019-09-01 11:43:30 +01:00
bbe8ef9ff7
Merged orbital cam, made my reset code not run in NiGHTS, 2D mode, or when exiting levels.
2019-08-31 17:06:01 -04:00
577a8fd387
Merge branch 'camorbit-sev' into camerafix
2019-08-31 14:53:43 -04:00
a5ae8abdb2
Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH
2019-08-31 12:53:55 +02:00
6a9da63d7f
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 19:19:54 +01:00
602154fe8b
Merge branch 'ring-penalty-graphic' into 'master'
...
Weapon ammo penalty indicator
See merge request STJr/SRB2Internal!297
2019-08-30 13:28:05 -04:00
8ddcced6f0
Pyre Fly: Don't spawn smoke and flames if no player is in range
2019-08-30 09:05:49 +02:00
4cece9fe36
Pyre Fly: Don't run the fuse code when dead
2019-08-30 08:55:29 +02:00
806b106905
Hardcoded the Pyre Fly
2019-08-30 08:17:25 +02:00
8167a88bec
Rename private mode to unlisted mode
2019-08-30 00:38:58 -04:00
5c295d285b
Capitalize the 'if'
2019-08-30 00:36:10 -04:00
10ea0f21ae
Fix spawning within random range
2019-08-29 23:56:15 -04:00
028996915d
Merge branch 'master' into next
2019-08-29 19:28:02 -04:00
dadec1196b
Warn on implicit fallthrough
2019-08-29 19:27:52 -04:00
lachwright
