stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-09 01:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
14161 commits 179 branches 42 tags 180 MiB
Commit graph

1274 commits

Author SHA1 Message Date
MascaraSnake
a14eacd63a Bowser isn't a boss, so don't call A_BossDeath just to do that one thing it needs to do 2021-12-27 08:55:59 +01:00
MascaraSnake
c550de5dfa Adapt spikes to UDMF 2021-12-27 07:32:57 +01:00
MascaraSnake
8535b595d6 Adapt some more player spawning stuff to UDMF 2021-12-26 21:11:24 +01:00
MascaraSnake
fe8c1d1331 Adapt Pyre Fly to UDMF 2021-12-21 22:00:42 +01:00
MascaraSnake
a5ac10733a Adapt Hive Elemental to UDMF 2021-12-21 21:51:37 +01:00
MascaraSnake
52c319167f (Mostly) adapt the Ideya Drone to UDMF 2021-12-21 21:41:00 +01:00
MascaraSnake
5918ecc2fe Refactor star post check 2021-12-21 18:32:24 +01:00
MascaraSnake
693fa7ba81 Adapt star posts to UDMF 2021-12-21 18:27:19 +01:00
MascaraSnake
af30847a1f Adapt zoom tube waypoint to UDMF 2021-12-21 18:24:58 +01:00
MascaraSnake
81bf0dceb2 Turn makesoftwarecorona into a function 2021-12-21 18:12:38 +01:00
MascaraSnake
4b58b45b5f Adapt emblem tags to UDMF 2021-12-21 17:58:37 +01:00
MascaraSnake
cbebdc219d Adapt pop-up turret to UDMF 2021-12-21 17:45:43 +01:00
MascaraSnake
3205b6d83a Adapt player starts to UDMF 2021-12-21 08:01:51 +01:00
MascaraSnake
db1f215327 Implement generic item rows and circles 2021-12-20 21:14:39 +01:00
sphere
b092374e1a Merge branch 'lagspikes' into 'next' 
Minor spike optimisations

See merge request STJr/SRB2!1669
 2021-12-20 12:33:13 +00:00
MascaraSnake
59c6d59c00 Adapt NiGHTS things to UDMF 2021-12-19 21:30:49 +01:00
MascaraSnake
482c24a1fb Adapt NiGHTS track items to UDMF 2021-12-18 10:45:50 +01:00
MascaraSnake
1a1e5faf08 Adapt fan particle generator to UDMF 2021-12-18 10:31:42 +01:00
MascaraSnake
ebf692f143 Adapt push/pull point to UDMF 2021-12-16 07:00:30 +01:00
MascaraSnake
ed9a562ec4 Adapt maces to UDMF 2021-12-14 18:50:47 +01:00
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
MascaraSnake
1b023732d0 Adapt rock spawner to UDMF 2021-12-13 08:24:52 +01:00
MascaraSnake
060bc5fde0 Replace P_ThingOnSpecial3DFloor with the more versatile P_MobjTouchingSectorSpecial 2021-12-08 21:07:26 +01:00
MascaraSnake
3cd56e456d Rewrite pushable/mobj linedef executor trigger code 2021-12-07 19:20:26 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
f359151457 Merge branch 'trigger-bruh' into udmf-executor-triggers 2021-12-05 08:36:11 +01:00
MascaraSnake
adce427299 Merge branch 'next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2021-12-03 18:58:02 +01:00
MascaraSnake
6dc49042de Port katsy's bouncy FOF cleanup 2021-12-03 18:48:16 +01:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next' 
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
 2021-12-03 12:18:39 +00:00
sphere
a8f754283b Merge branch 'lethallavaland' into 'next' 
fix MFE_TOUCHWATER (and MFE_TOUCHLAVA) not applying while standing on sloped water or lava (resolves #365, #201)

Closes #201 and #365

See merge request STJr/SRB2!1654
 2021-12-02 10:22:14 +00:00
sphere
dd2a1c8394 Merge branch 'master' into 'next' 
merge master into next again

See merge request STJr/SRB2!1659
 2021-11-26 13:57:28 +00:00
katsy
da33cb674e fix water fof height calculation on slopes 2021-11-05 16:51:44 -05:00
SMS Alfredo
865c0a081d Make Overlay objects account for player->drawangle 2021-10-29 10:40:25 +00:00
Tatsuru
cd5ba1271a Merge branch 'youvebeenblocked' into 'next' 
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332)

Closes #332

See merge request STJr/SRB2!1491
 2021-09-12 21:38:40 +00:00
Tatsuru
2eed4a9265 Merge branch 'sunbehindcloud' into 'next' 
Refactor weather switching (fixes #541)

Closes #541

See merge request STJr/SRB2!1498
 2021-09-10 17:00:44 +00:00
katsy
50fe45efe6 Refactor weather switching (fixes #541) 2021-09-10 17:00:43 +00:00
James R
cbc5cc3b2a Fix GCC 11 array-bounds warning in P_SetupStateAnimation 
Removing inline here silences the warning somehow, it
could be a GCC bug?
 2021-09-03 17:18:00 -07:00
Shane Ellis
ccc71ddafc Merge branch 'addplayer' into 'next' 
Multiplayer Bot Features (aka AddPlayer)

See merge request STJr/SRB2!1383
 2021-08-25 21:38:37 +00:00
SMS Alfredo
2d218859ff Give coins a drop shadow 2021-08-06 23:25:19 -05:00
Monster Iestyn
df99cde40f mo not mobj! 2021-07-31 22:11:44 +01:00
Monster Iestyn
7dddc631d7 P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely) 2021-07-31 21:14:48 +01:00
SMS Alfredo
cb619fad5d Rebase on !1307 2021-07-07 19:57:28 -05:00
Shane Ellis
afa8466b30 comment cleanup 2021-06-30 01:38:04 -04:00
CobaltBW
4f04097066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer 2021-06-29 14:32:46 -07:00
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
 2021-06-02 11:47:11 -04:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next' 
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
 2021-06-01 07:36:50 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next' 
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
 2021-05-28 21:30:16 -04:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Lach
58a070ca03 Merge branch 'no-fire-shield-palflash' into 'next' 
No fire shield palflash (resolves #512)

Closes #512

See merge request STJr/SRB2!1473
 2021-05-10 08:37:20 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Sally Coolatta
92107f28d5 Add string variable for unlockables and emblems 
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
 2021-04-25 17:54:47 -04:00
Radicalicious
e510e71617 Remove fire shield flash 2021-04-23 15:50:48 -04:00
SMS Alfredo
228668ce98 Change the render flags to extra flags and improve SF_NOSUPERSPRITES 2021-04-19 14:25:34 -05:00
SMS Alfredo
3f086ff612 The intial 2021-04-07 01:14:32 -05:00
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations 
# Conflicts:
#	src/p_spec.c
 2021-02-15 09:20:40 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.
 2021-02-11 13:24:20 +01:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
CobaltBW
b112e12c93 Merge remote-tracking branch 'origin/next' into addplayer 2021-01-23 13:33:19 -08:00
Shane Ellis
2016caa70b Update references to player->bot 2021-01-23 10:16:27 -05:00
LJ Sonic
41f1b3cfa3 Merge branch 'jimita-why-you-done-this!!!' into 'next' 
Fix mobj unarchiving code

See merge request STJr/SRB2!1384
 2021-01-22 18:26:26 -05:00
Jaime Ita Passos
f3ad648874 Revert "Move a few mobj spawn defaults to its own function" 
This reverts commit 6f9c48a305.

# Conflicts:
#	src/p_mobj.c
 2021-01-17 23:17:46 +01:00
Shane Ellis
1583bf126b lua habits 2021-01-15 18:31:09 -05:00
Shane Ellis
225e7c72ac Update p_mobj.c 2021-01-15 18:00:00 -05:00
Tatsuru
1752f6efc1 Allow water running in reverse gravity 2021-01-04 18:10:41 -03:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08:00
Nev3r
c97056f9ce Merge branch 'spritestuff2-archiving-fix' into 'next' 
Fix archived mobjs having no default blend mode and sprite scales

See merge request STJr/SRB2!1300
 2020-12-16 08:57:36 -05:00
James R
a36908a5ce Merge branch 'amys' into 'next' 
fix amy meeting herself in mario mode

See merge request STJr/SRB2!1330
 2020-12-15 20:57:16 -05:00
James R
73a7365798 Merge branch 'circuit-finallap' into 'next' 
Final lap text for circuit

See merge request STJr/SRB2!1303
 2020-12-15 20:42:59 -05:00
katsy
2b23468359 remove amy 2020-12-14 02:36:00 -05:00
James R
a86a7822d1 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 15:38:46 -08:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
Jaime Ita Passos
3472b3ece3 Fix ERZ3 mode 2020-12-10 21:55:22 -03:00
James R
6d3442a5d7 Merge branch 'saloondoor-revengeance' into 'next' 
Saloon door fixes (closes #394)

Closes #394

See merge request STJr/SRB2!1296
 2020-12-10 15:43:31 -05:00
James R
fc5708b2f2 Merge branch 'firemelt' into 'next' 
Fix objects with MF_FIRE disappearing in lava (Closes #366)

Closes #366

See merge request STJr/SRB2!1287
 2020-12-10 15:37:57 -05:00
James R
e46c6e75f3 Merge branch 'metal-sigfpe' into 'next' 
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
 2020-12-10 15:35:03 -05:00
James R
9a77cf6306 Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R
c841750868 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
Zippy_Zolton
7082db485b CTF text 2, branch is finished 2020-12-08 16:09:51 -06:00
Jaime Ita Passos
6f9c48a305 Move a few mobj spawn defaults to its own function 2020-12-06 17:46:35 -03:00
Tatsuru
3b85abdee7 Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
Zippy_Zolton
29f56fb2d8 g 2020-12-03 02:05:10 -06:00
Zippy_Zolton
c28bd8005e Fix fire objects disappearing in lava 2020-12-03 01:28:54 -06:00
Tatsuru
a67862665a Don't spawn the projectile if you're just gonna delete it 2020-12-02 12:05:40 -03:00
Nev3r
30ab512c3c Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/dehacked.c
 2020-12-01 18:56:42 +01:00
SMS Alfredo
5c71fe0710 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
SMS Alfredo
9163e73092 Allow no spin characters to water skip while spinning 2020-11-18 12:35:40 -06:00
James R
50e15840fb Merge branch 'udmf-multitag' into 'next' 
UDMF: Multitag support

See merge request STJr/SRB2!1097
 2020-11-14 19:18:14 -05:00
lachwright
a65fc9f622 Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
 2020-11-13 13:23:14 +01:00
Nev3r
2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
95a61a226b rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Jaime Passos
36550725f3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Nev3r
3d2d44bfff Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1 Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next. 2020-10-27 22:13:10 +01:00
Nev3r
c62ef355ef 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
Jaime Passos
b872222b50 Implement blend modes 2020-10-27 00:03:41 -03:00
Jaime Passos
e63efdac13 Only create floor sprite slopes when needed, instead of always allocating them. 
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
 2020-10-14 13:07:02 -03:00
Jaime Passos
ab526e47cc Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
4273896311 Implement relative and absolute sprite offsets for objects (mobjs) 
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
 2020-10-13 12:57:36 -03:00
James R
cb8f6097cf Merge branch 'save-netvars' into 'next' 
Save netvars

See merge request STJr/SRB2!1179
 2020-10-12 19:03:01 -04:00
Jaime Passos
cc97e22e2f 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
aa102dcea0 Add CV_SAVE to netvars 
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
 2020-10-09 15:06:09 -07:00
Zippy_Zolton
1c751fdf0f I am going to die :D 2020-10-09 15:42:55 -05:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Tatsuru
a52afc2baf Ignore spectators 2020-09-19 23:10:03 -03:00
lachwright
d7ab41a90b Objectplace improvements: 
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
 2020-09-06 17:28:34 +09:30
Nev3r
b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
Nev3r
586dc0b631 Merge branch 'next' into udmf-fofs-mkii 2020-07-30 12:39:25 +02:00
Nev3r
b99385e159 Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now. 2020-07-30 09:45:58 +02:00
Nev3r
c65ada7dd7 Merge branch 'next' into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
 2020-07-29 13:55:14 +02:00
Nev3r
6dfe236602 Merge branch 'udmf-next' into 'next' 
Merge udmf-next into next

See merge request STJr/SRB2!1075
 2020-07-28 14:03:59 -04:00
lachwright
cea3f64c88 Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
Nev3r
d1db5ebf56 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-07-13 09:34:32 +02:00
GoldenTails
4b3d6f04f8 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails
df1fd0c456 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails
4710e4f07c Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails
6d3a2919a2 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00
GoldenTails
27c25bfa1e Expose P_SceneryXYMovement to Lua. 
Ironically this seems slightly more advanced than P_RingXYMovement...
 2020-07-12 18:02:50 -05:00
GoldenTails
6ac3d62321 Expose P_RingXYMovement to Lua. 
Ever wanted to move like a ring horizontally?
 2020-07-12 18:02:50 -05:00
Nev3r
ad55f5f872 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
Nev3r
710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
lachwright
3226a5d699 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08:00
Nev3r
fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
lachwright
f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic
98c657e703 Merge branch 'sf_nosupersprites' into 'next' 
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
 2020-07-04 06:51:11 -04:00
lachwright
527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
LJ Sonic
3679df07aa Merge branch 'dragonbomber-height' into 'next' 
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
 2020-07-03 17:05:10 -04:00
lachwright
8652bbc1a5 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
3ebc17ac3a Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Nev3r
ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
lachwright
7b2e54b426 Fix Dragonbomber z positioning 2020-06-19 00:52:24 +08:00
lachwright
edfd64877c Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
 2020-06-09 09:50:02 +02:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
Lachlan Wright
191e2e094d Merge branch 'fix-spawn-desynch' into 'next' 
Fix desynch when a player spawns

See merge request STJr/SRB2!977
 2020-06-08 05:25:41 -04:00
Lachlan Wright
614a98bd9d Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
MascaraSnake
de7a806ec3 Merge branch 'nospinmovecut' into 'next' 
Don't cut momentum if landing in a roll

See merge request STJr/SRB2!972
 2020-06-07 13:24:19 -04:00
Monster Iestyn
7e562a3ca5 Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
lachwright
f68a95016e Merge branch 'next' into nospinmovecut 2020-06-07 02:45:26 +08:00
Monster Iestyn
7340442839 P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
LJ Sonic
e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake
8d7f4e3265 Merge branch 'movement-refactor' into 'next' 
Clean up some movement code

See merge request STJr/SRB2!912
 2020-06-01 07:21:41 -04:00
lachwright
5136a4d41d Don't cut momentum if landing in a roll 2020-05-30 19:07:16 +08:00
lachwright
ae5d5b9546 Merge branch 'next' into dashmode-fixes 2020-05-30 18:13:21 +08:00
Louis-Antoine
67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
MascaraSnake
ff37975892 Merge branch 'next' into movement-refactor 
# Conflicts:
#	src/p_map.c
 2020-05-19 09:50:23 +02:00
MascaraSnake
33a22331f8 Merge branch 'waypoints' into 'next' 
Store waypoints at map load instead of iterating through the thinker list to find them

See merge request STJr/SRB2!938
 2020-05-18 16:00:46 -04:00
Louis-Antoine
d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
MascaraSnake
969c48fac8 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
MascaraSnake
02c2aeb46a Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-13 16:23:36 +02:00
MascaraSnake
1ccda0b85c Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
MascaraSnake
36843cbfd6 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
James R
6b4ee94e38 Use camera angle, not mobj angle, when comparing Angle Anchor 2020-05-10 19:40:28 -07:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
lachwright
63cb58a10a Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
MascaraSnake
8c36b9efa5 Adapt basic PolyObject setup to UDMF 2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +02:00
MascaraSnake
1f041496c7 Store bustable FOF data directly in ffloor_t instead of referring to master line 2020-05-02 21:19:55 +02:00
MascaraSnake
245d5be047 Merge branch 'movement-refactor' into udmf-fofs-mkii 
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
 2020-05-02 19:05:48 +02:00
MascaraSnake
122104815a Revert some very incorrect refactoring 2020-05-02 15:33:15 +02:00
MascaraSnake
ddb4c2c97f Refactor P_PushableCheckBustables 2020-05-02 15:30:56 +02:00
MascaraSnake
21eccc15d8 Bustable blocks: Forgot to adapt linedef executor triggering for pushables 2020-05-02 14:51:03 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
a67c8786ae P_PlayerZMovement: Move PolyObject handling code into its own function 2020-05-02 13:49:16 +02:00
MascaraSnake
29192eff9a Merge branch 'remove-polyobjects' into movement-refactor 2020-05-02 13:37:13 +02:00
MascaraSnake
afc6378868 P_PlayerZMovement: Move checks for Mario blocks into their own function 2020-05-02 13:34:24 +02:00
MascaraSnake
2605f29bd4 P_PlayerMobjThinker: Move check for floatbob platforms into its own function 2020-05-02 13:08:13 +02:00
MascaraSnake
19d77bfc53 P_PlayerMobjThinker: Move crumbling platforms check into its own function 2020-05-02 12:50:09 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
lachwright
165b6c2435 Dashmode fixes: 
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
 2020-05-01 08:26:23 +08:00
MascaraSnake
e00531ed9c Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h
 2020-04-26 11:13:09 +02:00
Nev3r
9ebb4071ee Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +02:00
MascaraSnake
3170f2b8c3 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
 2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
sphere
67f511a55e Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
25affe6948 Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
de3ad9bc43 Merge branch 'udmf-next' into udmf-multitag 
# Conflicts:
#	src/doomdata.h
#	src/p_setup.c
 2020-04-22 09:11:17 +02:00
Nev3r
3d9d9d74f6 Merge branch 'udmf-pitch-and-roll' into 'udmf-next' 
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
 2020-04-21 12:27:26 -04:00
Nev3r
beb42c9499 Move the scale setting code behind the MapthingSpawn hook. 2020-04-19 16:00:57 +02:00
Nev3r
7cf08e1a08 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
Nev3r
9ac60a62b3 Fix cage issue with boss 4. 2020-04-19 13:13:53 +02:00
MascaraSnake
1d3aa7129a Add enums for textmap FOF values 2020-04-18 18:02:43 +02:00
MascaraSnake
8e5effa07b Merge branch 'udmf-argenums' into udmf-fofs-mkii 2020-04-18 17:23:02 +02:00
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
d775a42e93 Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists. 2020-04-17 23:43:26 +02:00