stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
7185 commits 174 branches 41 tags 300 MiB
Commit graph

7185 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
5d37ddd676 Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed. 2019-09-18 14:16:52 +01:00
toaster
a8a8ae0d0b Only set flight time to 0 if skin has SPR2_SWIM spriteset. 2019-09-18 14:11:06 +01:00
toaster
e993b8981e Fix solidity of lava in reverse gravity. (Resolves #216) 2019-09-18 13:55:20 +01:00
toaster
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
toaster
110907a955 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
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
toaster
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
toaster
45a99ce318 Change startchar's default value to 0 (Resolves #222). 2019-09-18 12:26:34 +01:00
Jaime Passos
5f6c702ed6 sky barreling 2019-09-17 23:38:04 -03:00
Jaime Passos
a6831aff9c compile fix 2019-09-17 22:29:53 -03:00
Jaime Passos
3e95451960 Merge branch 'revert-2ced6265' into 'master' 
Revert "Merge branch 'gl_skydome' into 'master'"

See merge request STJr/SRB2Internal!331
 2019-09-17 21:14:52 -04:00
sphere
81d1453dc4 New animated DSZ kelp. 2019-09-18 02:05:19 +02:00
Alam Ed Arias
35e3d9acab Revert "Merge branch 'gl_skydome' into 'master'" 
This reverts merge request !326
 2019-09-17 20:20:09 +00:00
Alam Ed Arias
2a33ffb7d7 PNG support: use png_const_bytep, so we do not drop const type 2019-09-17 16:18:54 -04:00
Alam Ed Arias
062f0278bc Merge branch 'master' into next 2019-09-17 14:20:48 -04:00
Alam Ed Arias
78075ecd89 Fix FALLTHRU for Win32 console interface code 2019-09-17 14:18:27 -04:00
toaster
e179e1f9c4 Merge branch 'morecactis' into 'master' 
More harmful cactus

See merge request STJr/SRB2Internal!329
 2019-09-16 16:36:06 -04:00
Nev3r
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
Nev3r
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
toaster
71cc09c8c2 Merge branch 'luabanks' into 'master' 
Lua save-banks!

See merge request STJr/SRB2Internal!295
 2019-09-16 07:56:49 -04:00
Jaime Passos
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
Jaime Passos
32769f6c71 Merge branch 'png-patches' into 'master' 
PNG patches

See merge request STJr/SRB2Internal!327
 2019-09-15 12:23:46 -04:00
Nev3r
7fe0636463 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
9771087554 Always force player camera direction for springs with horizontal thrust component. 2019-09-15 17:43:19 +02:00
Steel Titanium
3ebb9c2c49
More harmful cactus 2019-09-12 21:36:13 -04:00
James R
86f9609623 Support W_VerifyFile on PK3 2019-09-12 17:06:57 -07:00
Jaime Passos
2a04ac69e1 () 2019-09-12 16:12:31 -03:00
Jaime Passos
acc8dae274 Merge remote-tracking branch 'origin/master' into png-patches 2019-09-12 16:04:20 -03:00
Jaime Passos
6c37576bc0 Moved this macro 2019-09-12 16:03:44 -03:00
Steel Titanium
00d64c380d Merge branch 'newicon' into 'master' 
New EXE icon

See merge request STJr/SRB2Internal!265
 2019-09-12 14:05:32 -04:00
Jaime Passos
a0ec86ce01 Fix powers-of-two checks 2019-09-12 14:32:31 -03:00
toaster
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
Jaime Passos
e3df9cc6b1 Crash prevention 2019-09-11 20:38:15 -03:00
Jaime Passos
a5ff609873 Read user chunks 2019-09-11 20:18:04 -03:00
Jaime Passos
affff0a7e5 Merge remote-tracking branch 'origin/master' into png-patches 2019-09-11 17:08:17 -03:00
Jaime Passos
ed551f2536 Transparency, not translucency 2019-09-11 17:03:50 -03:00
Jaime Passos
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
toaster
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
toaster
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
toaster
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
Steel Titanium
2ced626518 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
1bafec9f55 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
e7f4017706 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
737690c8b8 Added cam_adjust, de-ghettoified the camera in general 2019-09-11 10:45:59 -04:00
toaster
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
toaster
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
toaster
ab1472bfc1 Tweak gameovertics slightly to avoid having no sound for too long. 2019-09-11 13:30:24 +01:00
toaster
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
Jaime Passos
fec579db8c Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Jaime Passos
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