Commit graph

1214 commits

Author SHA1 Message Date
katsy
03c9543db9 you too 2020-12-14 04:06:28 -05:00
katsy
3e73577b8e add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
James R
78c2fa09a0 Merge branch 'flame-orb' into 'next'
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Nev3r
f94d9825b4 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
a9a08046f0 Merge branch 'mobjghost-rollangle' into 'next'
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
Zippy_Zolton
16cc066e2e thunder shield :D 2020-10-29 12:32:42 -05:00
Zippy_Zolton
39d003d6f7 Flame Shield Changes 2020-10-28 01:23:05 -05:00
Nev3r
df6a903592 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Zippy_Zolton
e5b2a926f3 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Zippy_Zolton
e612b2a7f3 g 2020-10-23 01:09:12 -05:00
Zippy_Zolton
5a06c0e7b0 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
James R
e10e4d79c3 Merge branch 'bustflags' into 'next'
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
lachwright
72a7bb90c7 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
Jaime Passos
b4b4738c94 Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Snu
4480273fc6 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
Snu
f0b7da9d79 Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively. 2020-09-29 13:52:35 +01:00
Snu
5f96f8af58 Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls. 2020-09-29 13:47:48 +01:00
Snu
628480d1c2 Add functionality to PF_CANBREAKFLOORS 2020-09-29 12:58:36 +01:00
Snu
b06bb9c678 Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS. 2020-09-29 10:32:45 +01:00
lachwright
0a7802c8e9 Allow JumpSpin abilities to be used with non-ability shields 2020-09-16 16:50:10 +09:30
Bartu İnce
3a84946e98 no message 2020-09-08 03:03:48 +03:00
Nev3r
e80e0b6007 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
James R
0a85046b22 Merge branch 'bt_spin' into 'next'
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Nev3r
3854b56228 Merge branch 'next' into udmf-multitag
# Conflicts:
#	src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
James R
1f2697050b Merge branch 'fix-nights-fullbright' into 'next'
NiGHTS fullbright fixes

See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
lachwright
c6f752a394 Fix Super Sonic exploiting CA_FLOAT abilities 2020-07-21 03:50:26 +08:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
2182018930 Merge branch 'p-xymovement-lua-exposure' into 'next'
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails
b3198ed063 Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails
36e1c30e19 Replace all occurances of BT_USE with BT_SPIN (2.3?)
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
Nev3r
fe87d0391c Merge branch 'udmf-next' into udmf-multitag 2020-07-11 08:47:58 +02:00
Nev3r
ebe16a66d9 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
2020-07-10 18:18:07 +02:00
Snu
b03a0ee735 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Snu
5f7175204f Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
LJ Sonic
83f53943a6 Merge branch 'knuxtweaks' into 'next'
Knuckles tweaks

See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
b558c523a2 Merge branch 'fix-oldbrak-missiles2' into 'next'
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
lachwright
d989d57bd0 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
44dfcc7b3d Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan
cd152365fa Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
Lachlan
ee7bc779ea P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan
2ceff03a15 Fix buildbot warning 2020-07-04 03:21:48 +08:00
lachwright
0a3b728e81 Knuckles changes:
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
lachwright
5ec234e726 Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00