Lactozilla
|
a3e6b5e0fb
|
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
|
2023-11-23 13:48:18 -03:00 |
|
Alam Ed Arias
|
49d9619192
|
Merge branch 'master' into raise-skin-limit
|
2023-10-28 18:09:42 -04:00 |
|
Lactozilla
|
3377fa986a
|
Remember the player's color after a team gametype
|
2023-08-07 13:37:07 -03:00 |
|
Sal
|
b7443cfa05
|
Merge branch 'lawofattraction' into 'next'
Fix ring attraction and homing attack math errors (resolves #1045, #1001)
Closes #1001 and #1045
See merge request STJr/SRB2!2033
|
2023-08-02 14:54:33 +00:00 |
|
Sal
|
03ae681714
|
Merge branch 'a_scaletoground' into 'next'
Fix A_ConnectToGround's Handling of Scaled Mobjs
Closes #1038
See merge request STJr/SRB2!2029
|
2023-07-26 12:17:14 +00:00 |
|
Nev3r
|
022ddcf363
|
Merge branch 'models-plus-final' into 'next'
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle
See merge request STJr/SRB2!1840
|
2023-07-24 12:46:10 +00:00 |
|
Sal
|
b238a6db50
|
Merge branch 'shockwave-action' into 'next'
Add a standalone action for shockwaves
See merge request STJr/SRB2!1777
|
2023-07-24 11:01:41 +00:00 |
|
Sally Coolatta
|
7c2a241042
|
Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
|
2023-07-24 04:40:15 -04:00 |
|
sphere
|
47436ee495
|
Merge branch 'bosszero' into 'next'
Do not consider 0 a valid executor tag for bosses
Closes #1017
See merge request STJr/SRB2!2037
|
2023-07-14 13:17:48 +00:00 |
|
spherallic
|
a4bcf4e2ce
|
Do not consider 0 a valid executor tag for bosses
|
2023-07-06 18:06:23 +02:00 |
|
MIDIMan
|
4342dacbdf
|
Fix A_FishJump for custom objects in binary maps
|
2023-07-05 14:25:10 -04:00 |
|
katsy
|
2c66f2ce27
|
Fix homing attack and ring attraction math dumbs
|
2023-07-03 16:27:07 -05:00 |
|
Zwip-Zwap Zapony
|
b405f50caa
|
Fix A_ConnectToGround's handling of scaled mobjs
|
2023-06-24 19:35:57 +02:00 |
|
Lach
|
647e6aac12
|
Simplify the way skincolors' invshades are used
|
2023-06-20 20:03:13 +02:00 |
|
sphere
|
d6d424f102
|
Merge branch 'fix-remove-facetarget-action' into 'next'
Fix segfault when P_RemoveMobj is called within A_FaceTarget action
See merge request STJr/SRB2!1974
|
2023-05-26 01:15:40 +00:00 |
|
Gustaf Alhäll
|
d4951f7cdd
|
Fix segfault when Crushstaceans hit a player with Armageddon shield
|
2023-05-16 22:18:11 +02:00 |
|
Gustaf Alhäll
|
901c7362ed
|
Fix segfault when P_RemoveMobj is called within A_FaceTarget action
|
2023-04-30 14:05:10 +02:00 |
|
SteelT
|
2d3153079b
|
A_PointyThink crash fix (patch from #827)
Fixes A_PointyThink crashing in certain scenarios
|
2023-04-22 17:02:06 -04:00 |
|
spherallic
|
1470d099e3
|
Update copyright year & credits
|
2023-03-31 14:53:31 +02:00 |
|
sphere
|
7eabccbfac
|
Merge branch 'issue568' into 'next'
Fixes issue #568
Closes #568
See merge request STJr/SRB2!1913
|
2023-02-27 20:37:50 +00:00 |
|
spherallic
|
207053a023
|
Prevent A_LobShot from dividing by 0
|
2023-01-13 17:10:50 +01:00 |
|
MascaraSnake
|
5bbfb1840a
|
Fix scaling mistake in A_FishJump
|
2023-01-04 08:58:40 +01:00 |
|
Arthur
|
7d53e4647b
|
Fixes issue #568
|
2023-01-01 21:07:15 -05:00 |
|
ashi
|
1fb6adf390
|
change |= to &=
|
2022-11-23 16:22:52 +00:00 |
|
ashifolfi
|
aa8410c612
|
fix statue being tangible for ~40 tics post burst mobj spawn
|
2022-11-20 18:46:41 -05:00 |
|
Eidolon
|
c5527f9470
|
Merge branch 'pterabyte-tweaks' into 'next'
Fix Pterabyte spawns (+ behavior tweaks)
See merge request STJr/SRB2!1839
|
2022-11-13 23:40:56 +00:00 |
|
Alam Arias
|
1b5dd687d2
|
Cleanup whitespace changes from master branch
|
2022-11-11 20:31:41 -05:00 |
|
Eidolon
|
12c2ddb115
|
Merge branch 'uncappedrevengeance' into next
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
|
2022-11-08 21:13:50 -06:00 |
|
spherallic
|
57cf1f870d
|
Fix Pterabyte spawns, revert mashing requirement, increase grace period
|
2022-10-25 13:11:30 +02:00 |
|
Alam Ed Arias
|
7631d0f521
|
Merge branch 'next' into kill-TMatrix
|
2022-10-23 00:33:20 -04:00 |
|
Alam Ed Arias
|
f310d84766
|
replaced old TVector and TMatrix code
|
2022-10-01 15:40:45 -04:00 |
|
Alam Ed Arias
|
d11fbe4504
|
New Fixed Point Matrix functions
|
2022-09-30 22:04:12 -04:00 |
|
spherallic
|
8a0f0237f2
|
Merge branch 'next' into udmf-fof-flags
|
2022-09-06 09:52:01 +02:00 |
|
sphere
|
d67e88ee0c
|
Merge branch 'fix-parenttriestosleep-desc' into 'next'
Fix description of A_ParentTriesToSleep
See merge request STJr/SRB2!1784
|
2022-09-05 21:49:34 +00:00 |
|
MascaraSnake
|
8d4baace53
|
Add Lua backwards compatibility for FOF flags
|
2022-07-31 12:04:42 +02:00 |
|
Eidolon
|
805941a98f
|
Merge public next into uncappedrevengeance
This is to capture the UDMF merges and make the later code review
easier.
|
2022-05-03 14:45:14 -05:00 |
|
ashi
|
c3001ac42a
|
Fix description of A_ParentTriesToSleep
|
2022-04-30 14:21:51 +00:00 |
|
Eidolon
|
9f845622cd
|
Revert "P_InitAngle, to fix angle interpolation on spawning objects"
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
|
2022-04-26 20:56:34 -05:00 |
|
Eidolon
|
5790168194
|
Convert P_TeleportMove use to origin funcs
|
2022-04-26 20:56:34 -05:00 |
|
Sally Coolatta
|
d476b41dfa
|
P_SetOrigin & P_MoveOrigin to replace P_TeleportMove
|
2022-04-26 20:56:33 -05:00 |
|
Sally Coolatta
|
e4930535f3
|
P_InitAngle, to fix angle interpolation on spawning objects
|
2022-04-26 20:56:31 -05:00 |
|
MascaraSnake
|
faa7d89e3e
|
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
|
2022-04-20 21:01:16 +02:00 |
|
MascaraSnake
|
54640a8664
|
Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts:
# extras/conf/udb/Includes/SRB222_things.cfg
|
2022-04-20 20:59:55 +02:00 |
|
MascaraSnake
|
39b7fb9ff8
|
Merge commit 'd624ee25' into udmf-thing-types
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
|
2022-04-20 20:41:46 +02:00 |
|
MascaraSnake
|
f76b104c4a
|
Merge commit 'c7050671' into udmf-thing-types
|
2022-04-20 19:42:03 +02:00 |
|
MascaraSnake
|
36692483df
|
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
# src/p_inter.c
|
2022-04-19 22:04:04 +02:00 |
|
spherallic
|
6a969c163b
|
Make boss 3's shockwave into a customizable action.
|
2022-04-06 15:31:25 +02:00 |
|
spherallic
|
c782e81700
|
Give MT_METALSONIC_RACE a drop shadow & removed unused vars.
|
2022-03-12 17:44:37 +01:00 |
|
spherallic
|
6ef7221e38
|
A few drop shadow-related additions:
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for
badnik explosions
- Gave flickies drop shadows
|
2022-03-09 00:49:24 +01:00 |
|
sphere
|
ab711128c7
|
Merge branch 'tutorial-scenery' into 'next'
Tutorial scenery
See merge request STJr/SRB2!1722
|
2022-03-06 15:45:53 +00:00 |
|