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
mazmazz
acbbe3daf8
Merge remote-tracking branch 'origin/master' into tutorial-time
2018-11-03 10:58:11 -04:00
Monster Iestyn
7cef400f0e
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
2018-10-31 19:26:29 +00:00
Monster Iestyn
3895de5ab0
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
Monster Iestyn
7729abe5b9
Merge branch 'next' into lua-slopes
...
# Conflicts:
# src/lua_maplib.c
2018-10-20 18:31:06 +01:00
Monster Iestyn
946cff8aed
Whoops these should be L not gL here (not that it makes much difference normally though)
2018-10-11 21:44:25 +01:00
mazmazz
73925fe590
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-19 18:53:46 -04:00
mazmazz
cf7131bfd4
Merge remote-tracking branch 'origin/master' into musicplus-core
2018-09-19 18:53:18 -04:00
Digiku
a5a8282a77
Merge branch 'nights-score-lap' into 'master'
...
NiGHTS: Intermission Bonuses
See merge request STJr/SRB2Internal!159
2018-09-19 11:03:14 -04:00
Digiku
eb307a4066
Nights intermission dehacked: a comment
2018-09-19 10:45:51 -04:00
mazmazz
77381cd984
musicplus-jingle 2.2 -> 2.1 backport
2018-09-18 15:10:00 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
5f5ea5eec6
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-16 23:32:18 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
a177548da6
Added NIGHTSLINK bonus type for the 2.1 Link Bonus
2018-09-09 01:13:02 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
2d86dddb00
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
Monster Iestyn
cc20eed183
Merge branch 'master' into tutorial-time
2018-09-04 15:54:50 +01:00
mazmazz
73842cec71
Add MUSICPOSTBOSSFADEIN
2018-09-01 13:10:50 -04:00
mazmazz
631a053e92
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
Monster Iestyn
3c65251bb6
Merge branch 'master' into hud-cleaning
...
# Conflicts:
# src/y_inter.c
2018-08-29 16:39:02 +01:00
Digiku
e5a1db2870
Merge branch 'intermission-bonuslivesmax' into 'master'
...
Intermission: MaxBonusLives level header option for # of lives in score tally
See merge request STJr/SRB2Internal!162
2018-08-29 04:25:03 -04:00
mazmazz
142807392e
UINT32 muspostbosspos fix
2018-08-25 16:28:56 -04:00
mazmazz
e588460fe5
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
# Conflicts:
# src/dehacked.c
# src/lua_maplib.c
# src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
6bb5280fbc
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
2018-08-25 16:21:34 -04:00
mazmazz
26d309992a
MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS
2018-08-25 16:18:09 -04:00
mazmazz
bc0038ca3e
Merge branch 'musicplus-core' into musicplus-feature-postboss
...
# Conflicts:
# src/dehacked.c
# src/p_setup.c
2018-08-25 16:11:29 -04:00
mazmazz
13854fbffb
Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables
2018-08-25 16:10:46 -04:00
mazmazz
f30cf2b6cc
Added MUSICPOSTBOSS level header for boss post-defeat music
2018-08-25 16:02:12 -04:00
mazmazz
5ed5f469b2
Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position
...
* Cutscene support too!
2018-08-25 15:59:20 -04:00
mazmazz
7155f42c6c
Add MUSICRATE to dehacked
2018-08-25 08:08:04 -04:00
wolfy852
8134098558
Expose NEWTICRATE and NEWTICRATERATIO to Lua
...
This should keep 70FPS-compatible scripts from throwing nil value errors.
2018-08-25 03:40:43 -05:00
Monster Iestyn
f97ea7db39
Add INFLIVES as a constant that Lua/SOC can use
2018-08-23 22:18:52 +01:00
Monster Iestyn
785ba3abdd
Merge branch 'master' into tutorial-time
2018-08-22 21:30:29 +01:00
Monster Iestyn
fa637475ae
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 17:16:11 +01:00
mazmazz
53303174c1
MaxBonusLives level header option for # of lives in score tally
2018-08-13 14:17:38 -04:00
mazmazz
1dab7b2f79
MT_IDEYAANCHOR info and spawn logic
2018-08-13 02:03:36 -04:00
mazmazz
8ec0865170
Have just one NiGHTS bonus option: NIGHTS and LINK together
2018-08-12 20:25:35 -04:00
mazmazz
8d40d8ea43
BONUSTYPE typo; bonus alignment
2018-08-12 19:32:11 -04:00
mazmazz
c51e84fdfe
NiGHTS bonus implementation
2018-08-12 19:25:21 -04:00
Monster Iestyn
f31dcb6357
Added "Tutorialmap" MainCfg option for SOC
2018-08-12 14:30:49 +01:00
mazmazz
76dc4d99bc
Remove ORBIDYA CENTER states, we don't need 'em
2018-08-11 12:06:17 -04:00
mazmazz
3ec985dde9
ORBITEM CENTER states for A_OrbitNights target height offset
2018-08-10 23:49:02 -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
mazmazz
f7a32c9fad
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 02:18:20 -04:00
mazmazz
4d4e52d981
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-09 23:14:14 -04:00
mazmazz
ebb150a05e
MT_FLICKY_x_CENTER defs
2018-08-09 12:08:06 -04:00
mazmazz
304fdea710
Flicky stand states
2018-08-09 01:44:21 -04:00