Commit Graph

3949 Commits

Author SHA1 Message Date
mazmazz 5eafebe4d4 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 38eae01400 MT_FLICKY_x_CENTER defs 2018-08-09 12:08:06 -04:00
mazmazz 904ff6fccb Choose Flicky Fish Color by Thing Parameter 2018-08-09 04:19:18 -04:00
mazmazz f7c80f3980 Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL 2018-08-09 02:55:22 -04:00
mazmazz 9127a835c1 Flicky stand animation fixes 2018-08-09 02:27:25 -04:00
mazmazz abbc7631cd Flicky stand implementation by MTF_AMBUSH
* MTF_OBJECTSPECIAL: Set no gravity for flicky
2018-08-09 02:08:25 -04:00
mazmazz d5f32cc0e5 Flicky stand states 2018-08-09 01:44:21 -04:00
mazmazz db7bc927e7 Mapthingnums for MT_SECRETFLICKYies 2018-08-09 01:01:20 -04:00
mazmazz 292654e498 Fix FlickyFly momentum on MTF_OBJECTSPECIAL 2018-08-09 00:57:35 -04:00
mazmazz 332136b9bf Assign mapthingnums to MT_FLICKY
* Type # 570-585
2018-08-09 00:17:46 -04:00
mazmazz fc2517d8e2 FlickyFly: Configure gravity by MTF_AMBUSH 2018-08-09 00:13:08 -04:00
MascaraSnake 21cb0cab3c Reorganized the thing type numbers 2018-08-03 23:58:11 +02:00
Monster Iestyn 83d87c343b 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 b5ec286667 Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Monster Iestyn be5d0406bd Merge branch 'public_next'
# Conflicts:
#	src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
Monster Iestyn 74646052b0 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00
Monster Iestyn 485d990949 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 16999b7080 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 c02ee9a502 Re-did this fix. 2018-07-28 01:58:25 -04:00
Alam Ed Arias 79e4c3760a Merge branch 'master' into next 2018-07-20 17:35:53 -04:00
Alam Ed Arias 1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
Monster Iestyn a06ef26149 Merge branch 'master' into next 2018-07-11 21:37:23 +01:00
Monster Iestyn 8e19611033 Merge branch 'opengl-fof-lowerunpegged' into 'master'
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
Monster Iestyn 09ae0aae53 Merge branch 'master' into next 2018-07-11 21:18:39 +01:00
Monster Iestyn c127ea3ceb Merge branch 'opengl-projectsprite-fix' into 'master'
OpenGL HWR_ProjectSprite fix

See merge request STJr/SRB2!255
2018-07-11 16:15:42 -04:00
colette 0a931a1364 Update f_finale.c 2018-07-07 20:20:46 -04:00
Alam Ed Arias 17570c1ad6 Merge branch 'master' into next 2018-07-07 16:42:50 -04:00
Alam Arias a79b9a9127
Update m_misc.c 2018-07-07 20:41:11 +00:00
Alam Arias 7da6aca450
Update m_misc.c 2018-07-07 20:33:19 +00:00
Monster Iestyn f1bba60373 Merge branch 'md2-fopen-error' into 'master'
More helpful error messages

See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn 130de10f97 Merge branch 'md2-smoother-interpolation' into 'master'
Smoother MD2 interpolation

See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
MonsterIestyn 3e9103bec2
Merge pull request #252 from GoldenTails/patch-1
Fixed MD2 models not loading correctly on Linux
2018-07-06 19:12:21 +01:00
GoldenTails 761a221840 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn e5236c3137 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn 8c56e39c18 Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix

See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
MonsterIestyn d77ba1dab6
Merge pull request #264 from LJSonik/password-security-fix
Disable admin password by default
2018-07-05 20:16:19 +01:00
LJSonik 3b39b3b7c8
Merge branch 'master' into password-security-fix 2018-07-05 20:58:00 +02:00
MonsterIestyn 51c6e8d84c
Merge pull request #232 from LJSonik/minor-net-command-fixes
Minor net command fixes
2018-07-05 19:56:17 +01:00
LJSonik bd6373bc86
Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik 8e3c3a6f65
Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium c8d0eb04f4 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium c61035571b Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium 46aa4c3503 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium 8aee862ff8 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn 82d953bbc2 Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
Monster Iestyn dfb5f06d7e fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
Monster Iestyn bcffe61277 remove MF_RUNSPAWNFUNC from MT_CACOLANTERN 2018-07-02 20:35:39 +01:00
Monster Iestyn c045e8cf8d Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
2018-07-01 22:01:00 +01:00
Monster Iestyn daa87947a4 huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems 2018-07-01 19:47:26 +01:00
Monster Iestyn 76c8d30ed2 Fix special stage map end var defaults to use the correct map numbers 2018-06-30 18:14:04 +01:00