Alam Ed Arias
c91e0f9fd6
Merge branch 'EOL-15' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:01:29 -05:00
Alam Ed Arias
44e04bc6cd
Merge branch 'EOL-14' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 21:52:54 -05:00
Alam Ed Arias
69fafaa21d
Merge branch 'EOL-13' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 21:48:47 -05:00
Alam Ed Arias
3f55ce8e77
fix EOL on src/p_enemy.c
2018-11-27 21:18:29 -05:00
Alam Ed Arias
eeaaf66b04
fix EOL on src/p_enemy.c
2018-11-27 21:18:13 -05:00
Alam Ed Arias
0d053d9d1b
fix EOL on src/p_enemy.c
2018-11-27 21:17:45 -05:00
Alam Ed Arias
cba6489fd7
Merge branch 'EOL-12' into EOL
2018-11-27 21:10:09 -05:00
Alam Ed Arias
92ff9929b2
fix EOL on src/p_enemy.c
2018-11-27 21:07:23 -05:00
Alam Ed Arias
457448501a
Merge branch 'EOL-11' into EOL
2018-11-27 20:47:38 -05:00
Alam Ed Arias
c00cba17d0
fix EOL on src/p_enemy.c
2018-11-27 20:45:40 -05:00
Alam Ed Arias
13e4537dd7
Merge branch 'EOL-10' into EOL
2018-11-27 20:44:28 -05:00
Alam Ed Arias
351b3385d0
fix EOL on src/p_enemy.c
2018-11-27 20:41:27 -05:00
Alam Ed Arias
720cefbf69
Merge branch 'EOL-9' into EOL
2018-11-27 20:40:30 -05:00
Alam Ed Arias
f8aae10064
fix EOL on src/p_enemy.c
2018-11-27 20:38:59 -05:00
Alam Ed Arias
d89b38a05c
Merge branch 'EOL-8' into EOL
2018-11-27 20:37:22 -05:00
Alam Ed Arias
b7eda67e07
fix EOL on src/p_enemy.c
2018-11-27 20:36:00 -05:00
Alam Ed Arias
6ef394aa1a
Merge branch 'EOL-7' into EOL
2018-11-27 20:28:25 -05:00
Alam Ed Arias
1780ae7611
fix EOL on src/p_enemy.c
2018-11-27 20:26:42 -05:00
Alam Ed Arias
a8fc90c18a
Merge branch 'EOL-6' into EOL
2018-11-27 20:25:29 -05:00
Alam Ed Arias
3f09f50f49
fix EOL on src/p_enemy.c
2018-11-27 20:24:05 -05:00
Alam Ed Arias
246193e81e
Merge branch 'EOL-5' into EOL
2018-11-27 20:22:22 -05:00
Alam Ed Arias
96192a4f20
fix EOL on src/p_enemy.c
2018-11-27 20:19:50 -05:00
Alam Ed Arias
2d84877ce4
Merge branch 'EOL-4' into EOL
2018-11-27 20:17:52 -05:00
Alam Ed Arias
f5b5fb47f3
fix EOL on src/p_enemy.c
2018-11-27 20:12:53 -05:00
Alam Ed Arias
001b0eb6f3
Merge branch 'EOL-3' into EOL
2018-11-27 20:12:21 -05:00
Alam Ed Arias
9dfb32602c
fix EOL on src/p_enemy.c
2018-11-27 20:08:23 -05:00
Alam Ed Arias
5270d1c535
Merge branch 'EOL-2' into EOL
2018-11-27 20:05:07 -05:00
Alam Ed Arias
634518d7d7
fix EOL on p_enemy.c
2018-11-27 17:21:18 -05:00
Alam Ed Arias
73d61e8858
fix EOL on p_enemy.c
2018-11-27 17:15:55 -05:00
mazmazz
3463ec212a
A_FlickyCenter implementation - now Flickies can be attracted to players!
...
* Changed default movement to attraction, vs. aimless
* Flickies spawned from this will always have the FLICKY_CENTER mobj as its target
* Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players
* FLICKY_CENTER mobj tracer points to the spawned Flicky
* Thanks toaster for the original code~~
2018-08-09 17:28:37 -04:00
mazmazz
ebb150a05e
MT_FLICKY_x_CENTER defs
2018-08-09 12:08:06 -04:00
mazmazz
7b539b51f2
Choose Flicky Fish Color by Thing Parameter
2018-08-09 04:19:18 -04:00
mazmazz
ae321f78ac
Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL
2018-08-09 02:55:22 -04:00
mazmazz
4d1d40aa5d
Flicky stand animation fixes
2018-08-09 02:27:25 -04:00
mazmazz
999eff8eba
Flicky stand implementation by MTF_AMBUSH
...
* MTF_OBJECTSPECIAL: Set no gravity for flicky
2018-08-09 02:08:25 -04:00
mazmazz
304fdea710
Flicky stand states
2018-08-09 01:44:21 -04:00
mazmazz
41a438ece1
Mapthingnums for MT_SECRETFLICKYies
2018-08-09 01:01:20 -04:00
mazmazz
baa16c55fb
Fix FlickyFly momentum on MTF_OBJECTSPECIAL
2018-08-09 00:57:35 -04:00
mazmazz
0bccca1a8b
Assign mapthingnums to MT_FLICKY
...
* Type # 570-585
2018-08-09 00:17:46 -04:00
mazmazz
2526d2996e
FlickyFly: Configure gravity by MTF_AMBUSH
2018-08-09 00:13:08 -04:00
MascaraSnake
f0f8698d04
Reorganized the thing type numbers
2018-08-03 23:58:11 +02:00
Monster Iestyn
594cc953b5
Fix Cacolantern's preparing sound being played everywhere across the map
...
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
2018-08-02 16:15:30 +01:00
Monster Iestyn
502c80eaac
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
Monster Iestyn
f6b8206660
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
Monster Iestyn
10668f14b8
Merge branch 'master' into next
2018-07-31 19:36:30 +01:00
Monster Iestyn
e4f38995e7
Merge branch 'gme-lowvolume-fix' into 'master'
...
GME low volume fix
See merge request STJr/SRB2!248
2018-07-31 14:35:32 -04:00
Monster Iestyn
6bf3274452
Merge branch 'gme-pause' into 'master'
...
Fix pausing on gme
See merge request STJr/SRB2!251
2018-07-31 14:33:56 -04:00
Steel Titanium
d649700abf
Re-did this fix.
2018-07-28 01:58:25 -04:00
Alam Ed Arias
6d9bf3c5b3
Merge branch 'master' into next
2018-07-20 17:35:53 -04:00
Alam Ed Arias
f80b4e18a2
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00