Alam Ed Arias
af859bc337
Merge branch 'EOL-27' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:59:33 -05:00
Alam Ed Arias
1a6e69742f
Merge branch 'EOL-26' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:56:43 -05:00
Alam Ed Arias
b09e4ed32d
Merge branch 'EOL-25' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:49:49 -05:00
Alam Ed Arias
385aa633d7
Merge branch 'EOL-24' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:47:28 -05:00
Alam Ed Arias
ab27fc29a2
Merge branch 'EOL-23' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:45:24 -05:00
Alam Ed Arias
1b9b667404
Merge branch 'EOL-20' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:38:12 -05:00
Alam Ed Arias
c2d1c4207b
Merge branch 'EOL-19' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:35:31 -05:00
Alam Ed Arias
18c2de0003
Merge branch 'EOL-15' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 22:01:29 -05:00
Alam Ed Arias
47bb524aff
Merge branch 'EOL-14' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 21:52:54 -05:00
Alam Ed Arias
a9f04a68e1
Merge branch 'EOL-13' into EOL
...
# Conflicts:
# src/p_enemy.c
2018-11-27 21:48:47 -05:00
Alam Ed Arias
342b7e9106
fix EOL on src/p_enemy.c
2018-11-27 21:30:19 -05:00
Alam Ed Arias
b0228fea33
fix EOL on src/p_enemy.c
2018-11-27 21:29:18 -05:00
Alam Ed Arias
2a97b46ecc
fix EOL on src/p_enemy.c
2018-11-27 21:27:17 -05:00
Alam Ed Arias
ebfd2dd421
fix EOL on src/p_enemy.c
2018-11-27 21:27:05 -05:00
Alam Ed Arias
3f6df31735
fix EOL on src/p_enemy.c
2018-11-27 21:26:48 -05:00
Alam Ed Arias
7cc688944a
fix EOL on src/p_enemy.c
2018-11-27 21:25:07 -05:00
Alam Ed Arias
8f93a5c06f
fix EOL on src/p_enemy.c
2018-11-27 21:24:56 -05:00
Alam Ed Arias
74afcd4e8e
fix EOL on src/p_enemy.c
2018-11-27 21:18:29 -05:00
Alam Ed Arias
638b70fb0c
fix EOL on src/p_enemy.c
2018-11-27 21:18:13 -05:00
Alam Ed Arias
fb72955780
fix EOL on src/p_enemy.c
2018-11-27 21:17:45 -05:00
Alam Ed Arias
c43b200221
Merge branch 'EOL-12' into EOL
2018-11-27 21:10:09 -05:00
Alam Ed Arias
5b77b35eea
fix EOL on src/p_enemy.c
2018-11-27 21:07:23 -05:00
Alam Ed Arias
0765c83ccc
Merge branch 'EOL-11' into EOL
2018-11-27 20:47:38 -05:00
Alam Ed Arias
04e42e1d56
fix EOL on src/p_enemy.c
2018-11-27 20:45:40 -05:00
Alam Ed Arias
0646e96c77
Merge branch 'EOL-10' into EOL
2018-11-27 20:44:28 -05:00
Alam Ed Arias
b09940fdda
fix EOL on src/p_enemy.c
2018-11-27 20:41:27 -05:00
Alam Ed Arias
247388c6f7
Merge branch 'EOL-9' into EOL
2018-11-27 20:40:30 -05:00
Alam Ed Arias
05d5d1f254
fix EOL on src/p_enemy.c
2018-11-27 20:38:59 -05:00
Alam Ed Arias
8e0b7dd804
Merge branch 'EOL-8' into EOL
2018-11-27 20:37:22 -05:00
Alam Ed Arias
0c2a93f750
fix EOL on src/p_enemy.c
2018-11-27 20:36:00 -05:00
Alam Ed Arias
993c0831fc
Merge branch 'EOL-7' into EOL
2018-11-27 20:28:25 -05:00
Alam Ed Arias
1cbda4b3c2
fix EOL on src/p_enemy.c
2018-11-27 20:26:42 -05:00
Alam Ed Arias
a9249937e4
Merge branch 'EOL-6' into EOL
2018-11-27 20:25:29 -05:00
Alam Ed Arias
a958a80a61
fix EOL on src/p_enemy.c
2018-11-27 20:24:05 -05:00
Alam Ed Arias
816bc0d146
Merge branch 'EOL-5' into EOL
2018-11-27 20:22:22 -05:00
Alam Ed Arias
7a70c0e748
fix EOL on src/p_enemy.c
2018-11-27 20:19:50 -05:00
Alam Ed Arias
ab1af1c0af
Merge branch 'EOL-4' into EOL
2018-11-27 20:17:52 -05:00
Alam Ed Arias
761ff7cc6c
fix EOL on src/p_enemy.c
2018-11-27 20:12:53 -05:00
Alam Ed Arias
69114a5374
Merge branch 'EOL-3' into EOL
2018-11-27 20:12:21 -05:00
Alam Ed Arias
b2012b0771
fix EOL on src/p_enemy.c
2018-11-27 20:08:23 -05:00
Alam Ed Arias
76c6de01c4
Merge branch 'EOL-2' into EOL
2018-11-27 20:05:07 -05:00
Alam Ed Arias
dfc142c1d5
fix EOL on p_enemy.c
2018-11-27 17:21:18 -05:00
Alam Ed Arias
f2a4656bd6
fix EOL on p_enemy.c
2018-11-27 17:15:55 -05:00
mazmazz
7d834ff894
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
2cfd941778
Re-organize flags for FLICKY_CENTER
...
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
fe2d1e9020
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
f000a68150
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
21a55a4702
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
956b83729b
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
mazmazz
e5dd74eb45
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00