Monster Iestyn
|
7511911846
|
Merge branch 'custom3dcrash' into 'next'
Fix sigsegv caused by bad target check in A_Custom3DRotate
See merge request STJr/SRB2!1430
|
2021-03-24 14:24:21 -04:00 |
|
katsy
|
42cfcbf7be
|
fix sigsegv in A_Custom3DRotate
|
2021-03-21 16:09:11 -05:00 |
|
Lachlan Wright
|
77feee73c3
|
Revert "Merge branch 'player-speed' into 'next'"
This reverts merge request !1309
|
2021-02-27 03:38:13 +00: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 |
|
LJ Sonic
|
36c193f317
|
Merge branch 'fix-boss2pogotarget' into 'next'
Make several actions actually check for a player smh (Fixes #387)
Closes #387
See merge request STJr/SRB2!1340
|
2021-01-25 18:11:38 -05:00 |
|
GoldenTails
|
08146c9cad
|
Have A_ThrownRing check for a player too
|
2020-12-19 21:30:13 -06:00 |
|
GoldenTails
|
60564197af
|
Have A_DetonChase check for a player too
|
2020-12-19 21:12:09 -06:00 |
|
GoldenTails
|
f9e5681a6b
|
Actually check for a player smh
|
2020-12-19 20:33:29 -06:00 |
|
James R
|
75633bde50
|
Replace all instances of P_AproxDistance with FixedHypot
|
2020-12-12 14:53:54 -08:00 |
|
James R
|
9649a9fbae
|
Merge branch 'player-speed' into 'next'
Make player->speed and other things use R_PointToDist2
See merge request STJr/SRB2!1309
|
2020-12-12 17:38:02 -05:00 |
|
James R
|
c8cc9c7a6f
|
Remove trailing whitespace
|
2020-12-12 02:40:46 -08:00 |
|
Zippy_Zolton
|
916cacb38f
|
snailer
|
2020-12-10 19:01:09 -06:00 |
|
Tatsuru
|
9770368ee9
|
Initialize junk line tag lists
|
2020-11-30 18:21:06 -03:00 |
|
LJ Sonic
|
eef3028110
|
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
# Conflicts:
# src/dehacked.c
# src/dehacked.h
|
2020-11-29 21:54:15 +01:00 |
|
Louis-Antoine
|
13ba25f4fe
|
Only call the Lua API for overridden actions
|
2020-11-15 01:15:58 +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 |
|
Monster Iestyn
|
ddd59a6e9d
|
A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser
|
2020-09-26 17:31:49 +01:00 |
|
Tatsuru
|
48d6ae8e53
|
Decolorize players as intended
|
2020-08-24 23:53:21 -03: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 |
|
lachwright
|
3226a5d699
|
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
|
2020-07-09 05:56:11 +08:00 |
|
LJ Sonic
|
9c1bee694b
|
Merge branch 'knuxtweaks' into 'next'
Knuckles tweaks
See merge request STJr/SRB2!1030
|
2020-07-04 16:37:35 -04:00 |
|
LJ Sonic
|
6c61baa818
|
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
|
527e682931
|
Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
|
2020-07-04 18:27:06 +08:00 |
|
James R
|
067d9b9a63
|
Merge remote-tracking branch 'origin/next' into gtr-fixes
|
2020-06-24 19:31:19 -07:00 |
|
lachwright
|
cab87b4632
|
lol should have tested before pushing
|
2020-06-19 15:59:09 +08:00 |
|
lachwright
|
47d9d87654
|
Fix the Eggman signpost's background color
|
2020-06-19 15:49:24 +08:00 |
|
kaysrishaq
|
682791a024
|
brak missile fix, pw_ignorelatch, small Recycler fix
|
2020-06-18 17:09:29 -04:00 |
|
Steel Titanium
|
d3d5496a78
|
Fix facecolor may be used uninitialized.
|
2020-06-17 14:09:49 -04:00 |
|
SteelT
|
c810ea3945
|
Merge branch 'next-lc-uint16' into 'next'
Custom skincolor bugfixes
See merge request STJr/SRB2!971
|
2020-06-11 20:08:50 -04:00 |
|
SwitchKaze
|
d589e6bc95
|
Fix signpost shade.
|
2020-05-29 21:41:20 -05:00 |
|
SteelT
|
f0b64971a0
|
Merge branch 'next-lc-uint16' into 'next'
Custom skincolors
See merge request STJr/SRB2!960
|
2020-05-28 11:23:05 -04: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 |
|
Monster Iestyn
|
c9c7327011
|
A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with
|
2020-05-21 19:42:48 +01: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 |
|
MascaraSnake
|
9cd9d2e0d7
|
Merge branch 'carry-dust-devil' into 'next'
Add carry types to Dust devils
See merge request STJr/SRB2!886
|
2020-05-15 02:50:29 -04:00 |
|
ZipperQR
|
6a9543b1c2
|
no message
|
2020-05-14 03:35:46 +03:00 |
|
MascaraSnake
|
36843cbfd6
|
Merge branch 'next' into waypoints
|
2020-05-12 23:51:32 +02:00 |
|
MascaraSnake
|
435e6c9812
|
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
|
2020-05-12 14:53:10 +02:00 |
|
James R
|
7257fc730a
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
Jaime Passos
|
39c5ab4e17
|
Merge remote-tracking branch 'origin/next' into gtr-fixes
|
2020-05-09 17:12:52 -03:00 |
|
lachwright
|
9d21d790a4
|
Prevent laser sprites clipping into walls/off ledges
|
2020-05-08 02:58:56 +08:00 |
|
lachwright
|
36b400387e
|
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
|
2020-05-07 23:24:33 +08:00 |
|
lachwright
|
3a1988fc01
|
Fix knockback scaling
|
2020-05-07 22:47:34 +08:00 |
|
lachwright
|
63cb58a10a
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
lachwright
|
92c900f284
|
New GFZ3 laser
|
2020-05-06 09:01:02 +08:00 |
|
ZipperQR
|
0d7c49e7e4
|
no message
|
2020-05-03 14:02:23 +03:00 |
|
ZipperQR
|
64edd91dbd
|
Dust devil support
|
2020-04-22 00:59:12 +03:00 |
|
Nev3r
|
aa0d76f8fa
|
Delete tags.
|
2020-04-18 00:23:24 +02:00 |
|
Nev3r
|
7904856e8e
|
Remove presumably the remaining old tag references in the gamelogic.
|
2020-04-17 22:28:41 +02:00 |
|