Commit graph

14498 commits

Author SHA1 Message Date
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
Latapostrophe
54251723e9 it's cam, not thiscam 2019-09-18 14:04:23 +02: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
TehRealSalt
5023abd279 Blue springs are Chaotix strong, grey springs are stronger & have diagonal/horizontal types, spring doomednums are reorganized 2019-09-18 02:26:14 -04: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
Sal
c7ed907e81 Merge branch 'rings_slopechange' into 'master'
Slippery Slopes

See merge request KartKrew/Kart!161
2019-09-17 00:47:53 -04:00
TehRealSalt
22ccce6f24 Modify angle offset with your speed vs the spring's speed
Blue springs will send you more at a reflected momentum angle, while red springs will send you more straight
2019-09-16 20:47:13 -04:00
Latapostrophe
0fb7f78571 camera checks to avoid crashes 2019-09-17 00:04:32 +02: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
TehRealSalt
26e34a1fa1 Use maps.pk3 2019-09-16 03:04:26 -04:00
TehRealSalt
b174f15260 Waiting for the roulette gives you Orbinaut x3 instead of just one
Should reduce the amount of waiting, and make banana vs orbis more of a decision
2019-09-15 23:40:50 -04:00
TehRealSalt
88578f0534 Moving capsules 2019-09-15 23:36:55 -04:00
TehRealSalt
1ef09699d1 Functional gameplay
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
TehRealSalt
2648e5d3de Fix the inner capsule sides not moving outward 2019-09-15 17:33:49 -04:00
TehRealSalt
cd65381abc Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.

As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00
Jaime Passos
0d11dd516a Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
Jaime Passos
ff9d87e201 Fix MD2 loading 2019-09-15 16:24:17 -03: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
TehRealSalt
b39482d721 Lua port of the capsule visual
No item collision or gameplay at all yet
2019-09-15 04:51:45 -04:00
James R
7a70f882b1 Let first person camera work in demos 2019-09-15 00:32:01 -07:00
TehRealSalt
5738071100 Horizontal/diagonal springs use all object's speed, instead of only players 2019-09-15 00:49:10 -04:00
TehRealSalt
16bd11f53f Wrong var name 2019-09-15 00:32:58 -04:00
TehRealSalt
004bae45c5 Buff drift-steering during the grease period 2019-09-15 00:27:28 -04:00
TehRealSalt
0e35b65caa Spring Bullshit, part (?)
Who knows how many times I've had to rewrite this part but it FINALLY works properly for everything...
2019-09-14 23:47:08 -04:00
Latapostrophe
7cf7e9cb55 i am a retard 2019-09-13 23:42:51 +02:00
filpAM
c194921142 Fix "NOMIXER" flag compiling 2019-09-13 13:20:44 -04: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
TehRealSalt
40c8081a1b Grease part 3 2019-09-12 19:26:00 -04: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