Commit graph

4169 commits

Author SHA1 Message Date
Alam Ed Arias
e45f7cc9f1 Merge branch 'EOL-27' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:59:33 -05:00
Alam Ed Arias
744607317e Merge branch 'EOL-26' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:56:43 -05:00
Alam Ed Arias
61042de7d2 Merge branch 'EOL-25' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:49:49 -05:00
Alam Ed Arias
2a036ee669 Merge branch 'EOL-24' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:47:28 -05:00
Alam Ed Arias
6e4f60aaa5 Merge branch 'EOL-23' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:45:24 -05:00
Alam Ed Arias
df09b246ef Merge branch 'EOL-20' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:38:12 -05:00
Alam Ed Arias
c9c9aaa04a Merge branch 'EOL-19' into EOL
# Conflicts:
#	src/p_enemy.c
2018-11-27 22:35:31 -05:00
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
4c1691361b fix EOL on src/p_enemy.c 2018-11-27 21:30:19 -05:00
Alam Ed Arias
3f45f51a45 fix EOL on src/p_enemy.c 2018-11-27 21:29:18 -05:00
Alam Ed Arias
2b91c2226c fix EOL on src/p_enemy.c 2018-11-27 21:27:17 -05:00
Alam Ed Arias
81ef92a198 fix EOL on src/p_enemy.c 2018-11-27 21:27:05 -05:00
Alam Ed Arias
3f252630c4 fix EOL on src/p_enemy.c 2018-11-27 21:26:48 -05:00
Alam Ed Arias
bf83c1cd25 fix EOL on src/p_enemy.c 2018-11-27 21:25:07 -05:00
Alam Ed Arias
3ed9e0e373 fix EOL on src/p_enemy.c 2018-11-27 21:24:56 -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
c61cbcdf22 Erase default home radius from states and impose default on home check 2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2 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
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
mazmazz
6426d88141 Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
mazmazz
a095b47980 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00