toasterbabe
790e334d19
comment goof
2018-04-07 23:10:34 +01:00
mazmazz
606df6482e
Merge branch 'master' into nightsplus-laplogic
2018-04-07 07:54:46 -04:00
mazmazz
f903d01bc1
Add ML_DONPTEGTOP flag to Nights LE
...
* Nightserize: Run only if player is already NiGHTS
* DeNightserize: Run only if >0 players are NiGHTS
2018-04-07 07:33:07 -04:00
mazmazz
ff6fe27748
Merge branch 'master' into nightsplus-le
2018-04-07 07:09:41 -04:00
Digiku
7cf2c78522
Fix whitespace weirdness
2018-04-07 06:28:31 -04:00
toasterbabe
ff9775225e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into delag_maces
...
# Conflicts:
# src/p_mobj.c
2018-04-07 01:54:43 +01:00
Digiku
e1cd6357cc
Merge branch 'op-nightsbumper' into 'master'
...
NiGHTS Objectplace: Preserve MT_NIGHTSBUMPER vertical angle upon WRITETHINGS
See merge request STJr/SRB2Internal!137
2018-04-06 20:21:25 -04:00
toaster
d315072e3f
Merge branch 'texture-fixes' into 'master'
...
Texture fixes
See merge request STJr/SRB2Internal!135
2018-04-06 17:44:17 -04:00
toaster
8c33cb9134
Merge branch '100-make-slopes-static-by-default-and-require-flag-to-turn-them-dynamic' into 'master'
...
Resolve "Make slopes static by default, and require flag to turn them dynamic."
Closes #100
See merge request STJr/SRB2Internal!140
2018-04-06 17:43:47 -04:00
toaster
66733d96c2
Merge branch 'pretty_stuff' into 'master'
...
Pretty stuff
See merge request STJr/SRB2Internal!131
2018-04-06 17:40:52 -04:00
toasterbabe
4f3c9b5fad
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
...
# Conflicts:
# src/hardware/hw_draw.c
2018-04-06 19:38:19 +01:00
Monster Iestyn
a3b86a737e
Merge branch 'public_next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/hardware/r_opengl/r_opengl.c
# src/sdl12/hwsym_sdl.c
# src/sdl12/i_video.c
2018-04-06 18:42:07 +01:00
toasterbabe
3f427d0161
* Improve devmode text.
...
* Make sure showfps never covers anything relevant to the base game.
* Tweak spectator text for raising/lowering.
* Minor code-smell squishes.
2018-04-06 18:40:08 +01:00
toasterbabe
15903c6271
* Correct V_PERPLAYER's screen-centered (no snapto flags on a given axis) behaviour.
...
* Fix that one comment Digiku mentioned. ;P
* Make extra lives/100 ring rewards consistent between lives being relevant and lives being infinite/not present, which was a problem this branch made evident when Race ended up getting the infinite lives symbol!
2018-04-06 14:42:49 +01:00
toasterbabe
3c74952522
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-04-06 12:54:39 +01:00
Monster Iestyn
740e0cf8c1
Merge branch 'master' into hardcoding-time-again
2018-04-05 19:03:49 +01:00
Wolfy
ca8e14d5e9
Revert "THZ Hardcoding"
...
This reverts commit 8bd91bd2f2
.
Note to self: read through the fucking merge requests
2018-04-05 12:49:39 -05:00
Wolfy
1d63f53aeb
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal
2018-04-05 03:55:03 -05:00
Wolfy
8bd91bd2f2
THZ Hardcoding
...
Feel free to reorganize as necessary.
2018-04-05 03:23:27 -05:00
Steel Titanium
d446f3420e
Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit
2018-04-03 16:16:20 -04:00
Steel Titanium
759ea8cb42
Indentation fixup
2018-04-03 16:11:07 -04:00
Alam Ed Arias
59f5b46ad3
Merge branch 'public_next' into master
2018-04-03 16:09:11 -04:00
Alam Ed Arias
cf6a30a8ef
Merge branch 'master' into next
2018-04-03 15:48:06 -04:00
toaster
7848e9f42b
Merge branch 'openglquickfixes' into 'master'
...
Opengl Quick Fixes
See merge request STJr/SRB2!237
2018-04-03 15:34:24 -04:00
toasterbabe
4f3f647f5b
A minor assortment of changes.
2018-04-03 01:46:42 +01:00
toasterbabe
156cc031ea
* Optimise them even further... AGAIN! Using an offset-based system rather than a multiplication-based one...
...
* Again, tweak the spawning code to take maximum advantage of these gains.
* Fix potential crashes with MT_NULL mace/chain types supplied.
* #ifdef out the height-clipping code. It needs more TLC than I can give it right now, and the existing behaviour is less obviously broken (sadly enough).
* Fix chainmace points, which were apparently broken without anyone realising.
2018-04-03 01:10:10 +01:00
toasterbabe
4051ae8915
* Revamp mace creation again to potentially serve as the foundation for further optimisation (and also not rely on a while (1) loop, which easily went wrong several times whilst I was making changes to it).
...
* Fix minor typoes and other small tweaks in the P_MaceRotate function, which I'm probably about to rewrite again anyways...
2018-04-02 21:36:12 +01:00
mazmazz
b80277b7f1
Merge branch 'nightsplus-stillvisangle' into nights-nightserizeangle
2018-04-02 15:26:41 -04:00
mazmazz
49682f58bf
Make NiGHTS face forward or backward upon Nightserizing
2018-04-02 15:21:19 -04:00
mazmazz
294d583166
Dumb stupid hack where NiGHTS faces you upon Nightserizing
...
Because I can't figure out how to tell which player angle is "forward" in an axis track.
2018-04-02 14:41:29 -04:00
mazmazz
37eeb5d25c
Merge branch 'nightsplus-laplogic' into nightsplus-le
...
# Conflicts:
# src/p_map.c
2018-04-02 09:21:55 -04:00
mazmazz
0c6f722ff2
For NiGHTS OP Hoop, make mt->options XOR cv_opflags more SRB2-like
2018-04-02 08:36:33 -04:00
mazmazz
53503cd01f
Slight fixes for NiGHTS LE Trigger logic
2018-04-02 08:13:53 -04:00
mazmazz
2c72c6e660
Split NiGHTS LE trigger logic into P_CheckNightsTriggerLine
...
This makes P_RunTriggerLinedef more readable because the logic is too different from the other triggers.
Also replace BOOL with boolean
2018-04-02 08:11:28 -04:00
toasterbabe
0102da824e
Make the h-chain repairing safer.
2018-04-02 01:20:32 +01:00
toasterbabe
5ac70bbb7e
* Fix multispoke mace/chainbars having problems.
...
* Completely rework how mace/chainbars are spawned to reduce the number of matrix multiplications required EVEN FURTHER!
* Reimplement the maceretry solidity stuff (effect 4).
* Flip the mminlength stuff so that existing dev maps don't break badly.
* Fix hacky chainbar grabbing.
* Tweak height of tinychain a smidge.
2018-04-02 01:08:31 +01:00
toasterbabe
97ddb8881d
* Remove ability to change speed of chains.
...
* Fix ability to turn chains (still disabled by default, just at least want the option...)
* Replace max speed setting with a "minimum chainlink distance" setting - if greater than zero, that many chains will not be spawned from the center outwards. Doesn't affect the head of the chain at all, since otherwise what's the point? :V
2018-04-01 22:05:59 +01:00
toasterbabe
6d59551afd
Mace optimisation!
...
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
2018-04-01 20:54:19 +01:00
mazmazz
9dc90f2df8
Implement logic branching for NiGHTS LE triggers and add Bonus Time trigger
2018-04-01 08:23:59 -04:00
mazmazz
3d72c105df
Initial checkpoint for NiGHTS LE triggers
2018-03-31 10:11:27 -04:00
mazmazz
3fbffb0b4d
Add player_t marelap and marebonuslap, with logic
2018-03-30 20:28:27 -04:00
Sryder
6f2de824fb
Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default
...
I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.
2018-03-30 23:12:44 +01:00
toasterbabe
0fbebcaa08
Make special stage tallies do the token noise if you cash in a token!
2018-03-30 22:03:14 +01:00
toasterbabe
d9b5155e6e
* Make Tokens appear in competition.
...
* Tweak thrown ring colours.
* Make Armageddon shield loop properly.
* Tweak drowning numbers to be consistent between third and first person.
2018-03-30 21:49:15 +01:00
mazmazz
c09991d3d4
Merge branch 'nightsplus-laplogic' into nightsplus-le
...
# Conflicts:
# src/p_map.c
2018-03-30 14:39:00 -04:00
mazmazz
637a4a8446
Add player_t marelap and marebonuslap, with logic
2018-03-30 14:38:28 -04:00
mazmazz
56d7f9ed38
Nights LE checkpoint
2018-03-30 14:22:59 -04:00
Sryder
0aaae501d3
Warnings must die
2018-03-30 18:53:23 +01:00
Sryder
f3aa02e26d
Start with lightnum on sector lightlevel
2018-03-30 18:13:52 +01:00
Sryder
66f220d6ad
Merge branch 'master' into openglquickfixes
2018-03-30 18:09:41 +01:00