mazmazz
20f1eb6e8e
Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat
2018-11-05 07:41:02 -05:00
mazmazz
ba912aea47
TRACERANGLE: Run exec *after* resetting mobj values
2018-11-04 17:34:00 -05:00
mazmazz
8f5f32a1b8
Trigger line exec by whether mobj is facing its tracer
...
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
2018-11-04 16:28:25 -05:00
Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
toaster
2ad2cbcc0a
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
mazmazz
23acc47b39
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
2018-09-14 10:35:51 -04:00
mazmazz
b1993b87a9
P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER
...
(cherry picked from commit d85f108997bfeca3e0b1731c1aad70617456400b)
2018-09-14 08:52:10 -04:00
mazmazz
619c218702
MT_NIGHTSBUMPER Spawn: Don't reset mthing->options
...
(cherry picked from commit dc9fd6f02ed4b681ed4982d119672f07cc91e585)
2018-09-14 08:52:10 -04:00
mazmazz
092b58fe39
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 00:38:07 -04:00
mazmazz
3d83908596
Initialize floorrover and ceilingrover on SpawnMobj
2018-09-10 00:20:51 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
520ee1e189
Revert "Ideya fixes when a player has more than one Ideya"
...
This reverts commit fe37d1e3e0 .
2018-09-07 08:56:53 -04:00
mazmazz
6b97930889
Merge branch 'master' into nights-fastercapsule
2018-09-07 08:56:02 -04:00
mazmazz
04a59aacc4
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -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
Digiku
816a81b396
Merge branch 'nightsplus-le' into 'master'
...
NiGHTS Linedef Executor Triggers
Closes #102
See merge request STJr/SRB2Internal!142
2018-09-02 18:10:50 -04:00
mazmazz
2fcb94d408
Make Ideya Anchor use parameter # instead of angle for Ideya ID
2018-08-16 11:25:35 -04:00
mazmazz
c072b15e4f
Fixed capsule timing logic
...
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
2018-08-15 13:38:15 -04:00
mazmazz
79ebbdc360
Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule
2018-08-15 12:09:46 -04:00
mazmazz
fd725050d0
Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration
2018-08-15 00:32:48 -04:00
mazmazz
60df69d04c
capsule->extravalue2 tic timer
2018-08-14 19:21:32 -04:00
mazmazz
0a110d9ef4
Ideya fixes when a player has more than one Ideya
...
# Conflicts:
# src/p_inter.c
2018-08-14 17:21:49 -04:00
mazmazz
fe37d1e3e0
Ideya fixes when a player has more than one Ideya
2018-08-14 17:13:23 -04:00
mazmazz
35bcf200be
Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop
...
* Use MT_EGGCAPSULE extravalue2 for tic timer
2018-08-14 11:41:10 -04:00
mazmazz
a177ac38f4
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
2018-08-13 09:51:14 -04:00
mazmazz
539c323838
Make Drone visual elements react to height change
2018-08-13 09:50:50 -04:00
mazmazz
3170d31708
Correct hitboxradius value; proper sparkle->z when moving x/y
2018-08-13 04:49:32 -04:00
mazmazz
87fc89d110
Make anchoring non-specific to Ideya states (now anchor anything!)
...
# Conflicts:
# src/p_inter.c
2018-08-13 02:19:53 -04:00
mazmazz
1dab7b2f79
MT_IDEYAANCHOR info and spawn logic
2018-08-13 02:03:36 -04:00
mazmazz
c89e48e23c
Fix attraction bug on non-NiGHTS and Nightopian Helper
...
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
2018-08-12 23:03:12 -04:00
mazmazz
b17f3e7e40
Set Drone hitbox radius by upmost 4 bits of Angle
2018-08-12 13:34:27 -04:00
mazmazz
01436d2a65
For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using
2018-08-12 09:28:04 -04:00
mazmazz
e203edb450
Decouple Flicky Thing logic from spawnpoint variables; use mobj variables
2018-08-12 02:34:37 -04:00
mazmazz
89cf2b8793
A_OrbitNights make actor scale to target
...
* Added `donotrescale` input to disable this behavior
* Reverted previous commit changes for scaling Ideya because unneeded
2018-08-12 01:07:26 -04:00
mazmazz
b534e01e28
Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE
2018-08-11 23:53:07 -04:00
mazmazz
e50f7fa412
NIGHTSDRONE sync visual elements when changing mobj flags
2018-08-11 23:32:12 -04:00
mazmazz
154cfa1171
When NIGHTSDRONE z changes, change DRONEMAN z as well
2018-08-11 23:15:28 -04:00
mazmazz
60025e396b
NIGHTSDRONE visual element positioning now works with scaling
2018-08-11 22:41:58 -04:00
mazmazz
8c63bf9fe8
NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP
2018-08-11 21:38:44 -04:00
mazmazz
006f33d72f
Line fixes for visual element positioning
...
# Conflicts:
# src/p_mobj.c
2018-08-11 20:50:53 -04:00
mazmazz
291a955d24
Don't need this line
2018-08-11 15:54:39 -04:00
mazmazz
14301a62d5
Make Drone hitbox height and player Z alignment configurable
...
* Default hitbox height is 80
* Drone Thing parameter sets height to multiples of 32
* Player aligns by default to bottom+24 of hitbox (offsetted)
* `MTF_OBJECTSPECIAL` aligns player to hitbox top
* `MTF_EXTRA` aligns to hitbox center
* `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox
* Goalpost and sparkle Z alignment is changed to reflect configurableness
2018-08-11 15:52:42 -04:00
mazmazz
3b18d3984e
* Bounce Droneman within hitbox instead of floorz
...
* Correct Droneman hiding so he always stays within hitbox even when invisible
2018-08-11 02:03:44 -04:00
mazmazz
30fccd6946
Drone de-coupling implementation
...
* Visual elements and hitbox work as expected with scaling and OBJECTFLIP
2018-08-10 22:11:48 -04:00
mazmazz
4e319541b6
Nights Drone mobj and state entries
...
* New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING
* NIGHTSGOAL renamed to NIGHTSDRONE_GOAL
* MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 18:24:31 -04:00
mazmazz
9f41426008
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes
2018-08-10 15:00:41 -04:00
mazmazz
b680dafdb4
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things
2018-08-10 14:58:27 -04:00