Nev3r
8286f55e8e
Revert "Merge branch 'flats-png_port' into 'master'"
...
This reverts merge request !322
2019-09-09 18:40:21 +00:00
Jaime Passos
fd39522310
Missing arguments
2019-09-09 15:39:10 -03:00
Nev3r
845e86ec12
Merge branch 'flats-png_port' into 'master'
...
Flats png port
See merge request STJr/SRB2Internal!322
2019-09-09 14:16:10 -04:00
Jaime Passos
2574914843
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
toaster
41727318ff
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-09 15:25:48 +01:00
toaster
7eaf43810a
DON'T PUSH ALONE - first dregs of continue screen
2019-09-09 15:25:36 +01:00
Steel Titanium
e1b14d3d7d
Fix function being redefined
2019-09-08 19:39:23 -04:00
toaster
ec76002d9f
Merge branch 'lightning_polys' into 'master'
...
Lightning Polys
See merge request STJr/SRB2Internal!294
2019-09-08 19:04:56 -04:00
toaster
74e6c147d7
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
Steel Titanium
8d2f3eb575
Move mobj_t declaration to top of the block
2019-09-08 17:14:47 -04:00
Steel Titanium
b979594c17
Fix this mistake
2019-09-08 16:54:40 -04:00
Monster Iestyn
361fbf8f6a
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
toaster
14c44a6825
Merge branch 'nightsattackfixes' into 'master'
...
NiGHTS attack fixes
Closes #205
See merge request STJr/SRB2Internal!319
2019-09-08 16:42:45 -04:00
toaster
0217d693f2
Merge branch 'ending-star' into 'master'
...
Endings: Fireworks fallback graphics.
See merge request STJr/SRB2Internal!296
2019-09-08 16:28:52 -04:00
toaster
380f9ec07d
Update SPR2_XTRA references for adjusted player.dta content.
2019-09-08 21:28:12 +01:00
toaster
1e11fe650f
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
17a2038489
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
f523cb107e
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
toaster
8acf86cf10
Extend gameovertics again by two seconds.
2019-09-08 18:03:51 +01:00
toaster
abcf4f82ad
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-08 18:00:25 +01:00
toaster
5eb6b408a1
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
87f0013831
Implement all the other alpha blend styles
2019-09-08 13:21:00 -03:00
Steel Titanium
0b5bc8f64f
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
414bff33bf
Better directory structure
2019-09-08 01:29:09 -04:00
mazmazz
f3d287990c
Fix NiGHTS attack menu not drawing correct background
2019-09-07 22:00:38 -04:00
Jaime Passos
13f181acd0
opengl patch translucency
2019-09-07 22:43:29 -03:00
Jaime Passos
6860e4a85d
if that function can't return NULL why should i do this?
2019-09-07 19:02:50 -03:00
Jaime Passos
45c629c174
probably want to Z_Free this...............
2019-09-07 18:56:08 -03:00
Jaime Passos
1095c4a4c7
fix non powers of two spans
2019-09-07 18:20:49 -03:00
toaster
09f7dc1350
* 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
27970e22e1
fix translucency
2019-09-07 16:54:26 -03:00
toaster
bc911c2b20
Fix detection of GRADE_ constants in SOC.
2019-09-07 20:08:05 +01:00
Monster Iestyn
86c72eb5e6
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
57cacd1b58
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
818ccf02c5
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
490f41543c
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
135a6636a7
Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)
2019-09-07 12:10:50 +01:00
toaster
64ceaa2051
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.
2019-09-07 12:07:29 +01:00
toaster
5e4dec8dfc
* 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
3eb4866a2d
* 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
5040f4d7f7
* 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
16b17840d9
2D toggle command
2019-09-06 20:51:39 -04:00
Jaime Passos
25bb9d1f88
define stuff idk
2019-09-06 19:41:29 -03:00
Jaime Passos
3590a1160c
Fix tilted spans.
2019-09-06 19:37:07 -03:00
Jaime Passos
6acdf893e1
test
2019-09-06 19:26:05 -03:00
Jaime Passos
b28af03b1c
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Jaime Passos
7bc484206f
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-06 16:08:18 -03:00
toaster
1311542c7f
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
0db1d5d225
2.2 skies aren't flipped
2019-09-05 17:42:36 -03:00
Jaime Passos
16956f1c56
Make sky dome look a bit better
2019-09-04 13:59:09 -03:00
