toaster
f5240ae43a
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
toaster
eb315d3662
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
toaster
09fce66717
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
toaster
7a4d1eefdb
Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed.
2019-09-18 14:16:52 +01:00
toaster
e8cf839d2f
Only set flight time to 0 if skin has SPR2_SWIM spriteset.
2019-09-18 14:11:06 +01:00
toaster
c93c88c769
Fix solidity of lava in reverse gravity. ( Resolves #216 )
2019-09-18 13:55:20 +01:00
toaster
d82eb22457
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
toaster
64ced42a9b
Merge branch 'patch-blending-aggregate-return-fix' into 'master'
...
Patch blending aggregate return fix
See merge request STJr/SRB2Internal!333
2019-09-18 08:35:50 -04:00
toaster
187072a215
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
toaster
97a5cbd445
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
toaster
3f6a331f24
Change startchar's default value to 0 ( Resolves #222 ).
2019-09-18 12:26:34 +01:00
Jaime Passos
5e1ebad9d3
sky barreling
2019-09-17 23:38:04 -03:00
Jaime Passos
f5b7c9951f
compile fix
2019-09-17 22:29:53 -03:00
Jaime Passos
fcf3359732
Merge branch 'revert-63c99dd2' into 'master'
...
Revert "Merge branch 'gl_skydome' into 'master'"
See merge request STJr/SRB2Internal!331
2019-09-17 21:14:52 -04:00
sphere
124be760b1
New animated DSZ kelp.
2019-09-18 02:05:19 +02:00
Alam Ed Arias
aab58a4613
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Alam Ed Arias
e969ef8930
PNG support: use png_const_bytep, so we do not drop const type
2019-09-17 16:18:54 -04:00
Alam Ed Arias
b1c3da4de3
Merge branch 'master' into next
2019-09-17 14:20:48 -04:00
Alam Ed Arias
6ec747638a
Fix FALLTHRU for Win32 console interface code
2019-09-17 14:18:27 -04:00
toaster
e7465699ad
Merge branch 'morecactis' into 'master'
...
More harmful cactus
See merge request STJr/SRB2Internal!329
2019-09-16 16:36:06 -04:00
Nev3r
2b0a0dd90f
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
Nev3r
c732a4f2ad
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
toaster
ccc1144a27
Merge branch 'luabanks' into 'master'
...
Lua save-banks!
See merge request STJr/SRB2Internal!295
2019-09-16 07:56:49 -04:00
Jaime Passos
dd61585ee1
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
Jaime Passos
ef2d19502b
Merge branch 'png-patches' into 'master'
...
PNG patches
See merge request STJr/SRB2Internal!327
2019-09-15 12:23:46 -04:00
Nev3r
77f2be12eb
Merge branch 'horizontal-springs' into 'master'
...
Always force player camera direction for springs with horizontal thrust component.
See merge request STJr/SRB2Internal!330
2019-09-15 12:18:22 -04:00
Nev3r
d6e02c20b3
Always force player camera direction for springs with horizontal thrust component.
2019-09-15 17:43:19 +02:00
Steel Titanium
a333f20d13
More harmful cactus
2019-09-12 21:36:13 -04:00
James R
201d97b5f7
Support W_VerifyFile on PK3
2019-09-12 17:06:57 -07:00
Jaime Passos
020c91b7d5
()
2019-09-12 16:12:31 -03:00
Jaime Passos
f2a3d8a840
Merge remote-tracking branch 'origin/master' into png-patches
2019-09-12 16:04:20 -03:00
Jaime Passos
d2bc3de4ae
Moved this macro
2019-09-12 16:03:44 -03:00
Steel Titanium
5ba4e604b2
Merge branch 'newicon' into 'master'
...
New EXE icon
See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
Jaime Passos
e3ceadbfe3
Fix powers-of-two checks
2019-09-12 14:32:31 -03:00
toaster
88000b87b0
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
Jaime Passos
772cc25f0b
Make nametags compatible with current player.dta
...
(again)
2019-09-11 22:18:03 -03:00
Jaime Passos
9b5a7309bd
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-11 22:17:42 -03:00
Jaime Passos
f91e8e126e
Crash prevention
2019-09-11 20:38:15 -03:00
Steel Titanium
cb539e405c
Merge branch 'master' into update-libs
2019-09-11 19:26:51 -04:00
Jaime Passos
6a7454acf7
Read user chunks
2019-09-11 20:18:04 -03:00
Jaime Passos
df966fe305
Merge remote-tracking branch 'origin/master' into png-patches
2019-09-11 17:08:17 -03:00
Jaime Passos
6623359b06
Transparency, not translucency
2019-09-11 17:03:50 -03:00
Jaime Passos
1dbbb226a9
Allow PNG graphics to be used as patches
...
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
toaster
1112730d8a
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
toaster
22f7fd904f
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
toaster
e99b0869a3
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
Steel Titanium
63c99dd28f
Merge branch 'gl_skydome' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!326
2019-09-11 11:58:05 -04:00
Steel Titanium
2339d60276
Merge branch 'ast_newstyles' into 'master'
...
Patch translucency styles
See merge request STJr/SRB2Internal!324
2019-09-11 11:57:45 -04:00
Steel Titanium
d03a0f2edc
Merge branch 'flats-png_port' into 'master'
...
Flats png port, fixed
See merge request STJr/SRB2Internal!323
2019-09-11 11:57:29 -04:00
James
5404fce6e4
Added cam_adjust, de-ghettoified the camera in general
2019-09-11 10:45:59 -04:00
