toaster
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
toaster
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
toaster
0ed589449a
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
toaster
2c898841e9
Extend gameovertics again by two seconds.
2019-09-08 18:03:51 +01:00
toaster
4dc9a95224
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-08 18:00:25 +01:00
toaster
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
Jaime Passos
ff1fa3f92b
Implement all the other alpha blend styles
2019-09-08 13:21:00 -03:00
Steel Titanium
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
Steel Titanium
8ee0a9309b
Better directory structure
2019-09-08 01:29:09 -04:00
Steel Titanium
807614d02d
Add _ to the record and nights attack tracks for organization
2019-09-07 22:57:20 -04:00
Jaime Passos
abfa5e10b6
Make nametags compatible with current player.dta
2019-09-07 23:40:00 -03:00
mazmazz
7780de9edc
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-07 22:25:47 -04:00
mazmazz
b7c9f15225
Fix NiGHTS attack menu not drawing correct background
2019-09-07 22:00:38 -04:00
Jaime Passos
4adff34402
opengl patch translucency
2019-09-07 22:43:29 -03:00
Jaime Passos
a67dd633ff
if that function can't return NULL why should i do this?
2019-09-07 19:02:50 -03:00
Jaime Passos
3cc2b76fb8
probably want to Z_Free this...............
2019-09-07 18:56:08 -03:00
Jaime Passos
ff293c3f6f
fix non powers of two spans
2019-09-07 18:20:49 -03:00
toaster
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
Jaime Passos
f461b76bb0
fix translucency
2019-09-07 16:54:26 -03:00
toaster
5d85e82fa6
Fix detection of GRADE_ constants in SOC.
2019-09-07 20:08:05 +01:00
GoldenTails
14cd7a5a0c
Merge branch 'master' into fix-fixedrem
2019-09-07 12:19:13 -05:00
Monster Iestyn
c6af108d8c
Merge branch 'musicfixes' into 'master'
...
Minor musicplus-related fixes
See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
toaster
92b77c987b
Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)
2019-09-07 12:10:50 +01:00
toaster
5640aa955a
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.
2019-09-07 12:07:29 +01:00
toaster
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
toaster
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
toaster
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
Steel Titanium
bc52bc83cc
2D toggle command
2019-09-06 20:51:39 -04:00
Jaime Passos
d38ba4d88c
define stuff idk
2019-09-06 19:41:29 -03:00
Jaime Passos
02a7d8e0a2
Fix tilted spans.
2019-09-06 19:37:07 -03:00
Jaime Passos
2a85ed0bdd
test
2019-09-06 19:26:05 -03:00
Jaime Passos
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Jaime Passos
de4a609421
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-06 16:08:18 -03:00
Jaime Passos
f3cf3ca453
Cleanup.
2019-09-06 16:05:46 -03:00
Jaime Passos
56abc63c29
Ignore key held events.
2019-09-06 15:25:11 -03:00
Jaime Passos
a991a10ffc
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-06 15:10:09 -03:00
toaster
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
Jaime Passos
6aedca899f
2.2 skies aren't flipped
2019-09-05 17:42:36 -03:00
Jaime Passos
c6f3e4d53d
Make sky dome look a bit better
2019-09-04 13:59:09 -03:00
toaster
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
toaster
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
toaster
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
Jaime Passos
f0b4a609a8
Very tiny fix
2019-09-03 23:44:04 -03:00
Jaime Passos
53ddf19f94
Interpolation flag support
2019-09-03 22:57:54 -03:00
Jaime Passos
4760ff0963
Crash prevention
2019-09-03 21:31:32 -03:00
Jaime Passos
916bdeb880
3 digits frame number
2019-09-03 18:31:59 -03:00
Jaime Passos
1dca3338fd
Sprite2 support but I'm not a dumbass
2019-09-03 18:27:22 -03:00
