toasterbabe
d0575f7fb0
* Hive Elementals and Bumblebores, plus associated useful action functions.
...
* Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done.
* Move Bubblebuzz-related stuff to go alongside the secret badniks and etc.
* MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 21:30:15 +01:00
toasterbabe
8f71e93cee
* Remove Commander-specific hack, incorporate into A_CrawlaCommanderThink.
...
* Make my changes to its thinker slightly more consistent.
2018-05-03 14:04:29 +01:00
toasterbabe
94c7d9bc52
Forgot to do this before making the previous commit; completes support for no-points drone badniks.
2018-05-03 00:00:22 +01:00
toasterbabe
6d1ba20a1d
* Add native support for multi-hit badiks to MF_ENEMY.
...
* MF2_FRET application and removal.
* Flashing when flag present.
* Bounce player back on successful damaging.
* Add their spawnhealth to the chain.
* Reduce code duplication in P_TouchSpecialThing.
* Play with Crawla Commander a little bit as a test of its power.
2018-05-02 23:48:50 +01:00
toasterbabe
856edd50df
Remove the ugly double-hack for monitors! Doesn't QUITE do it via the return value of P_DamageMobj like MI and I theorised it should do, but it's functionally identical whilst being less code to maintain.
2018-05-02 20:55:07 +01:00
toasterbabe
cf9d53efd8
Kill MF2_STANDONME (mechanically; still occupies the slot... will change that next time I have to handle the DEHACKED lists.)
2018-05-02 20:35:20 +01:00
toasterbabe
dbc0ac2303
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.)
...
* Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 20:03:18 +01:00
toasterbabe
5cc1befcad
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff.
...
* MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters.
* A_ConnectToGround is EXTREMELY useful for palmtrees and stuff.
* Some other, relatively hacky A_ functions.
* (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible.
* Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 15:13:44 +01:00
toasterbabe
1eb84f57c5
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once.
...
* Explosion executors.
* Minor refactor of P_KillMobj.
2018-04-26 20:18:51 +01:00
Monster Iestyn
8e5ac64d7c
Merge branch 'dedicated-nosoundinit' into 'master'
...
Don't init the sound system on dedicated servers
See merge request STJr/SRB2!225
2018-04-21 17:40:45 -04:00
Monster Iestyn
452aef4981
Merge branch 'connect-empty-address-fix' into 'master'
...
Fixed "invalid pointer" error when passing "" to Command_connect().
See merge request STJr/SRB2!234
2018-04-21 17:32:50 -04:00
Monster Iestyn
83a84d5a81
Merge branch 'connect-server-fix' into 'master'
...
Removed contradictory `-connect` check
See merge request STJr/SRB2!236
2018-04-21 16:25:28 -04:00
Monster Iestyn
eb0f9681d7
Merge branch 'findfile-rewrite' into 'master'
...
Rewrite of d_netfil.c's findfile
See merge request STJr/SRB2!240
2018-04-21 16:22:21 -04:00
Monster Iestyn
48a85512a0
Merge branch 'dedicated-debug-hotfix' into 'master'
...
Dedicated debug hotfix
See merge request STJr/SRB2!239
2018-04-21 16:13:38 -04:00
Monster Iestyn
6c7acdbd9e
Merge branch 'movie-spec-stage-fade-fix' into 'master'
...
Movie mode: special stage intro fade recording fix
See merge request STJr/SRB2!229
2018-04-21 16:12:46 -04:00
Monster Iestyn
9cdf87404e
Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there.
...
This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect.
Note: Untested as of writing
2018-04-15 22:00:31 +01:00
Monster Iestyn
3fb12cf337
Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode
2018-04-15 19:59:57 +01:00
Steel Titanium
2139d4771f
Default sound volume is too loud
2018-04-11 14:40:05 -04:00
toasterbabe
976331fb03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
2018-04-08 16:23:19 +01:00
toasterbabe
375c3c584e
[13:01] toaster: hey
...
[13:01] toaster: would anyone object if i pushed this to master
[13:02] toaster: so my changes to devmode don't fuck with gifs, for example https://cdn.discordapp.com/attachments/428262628893261828/432500920773771264/srb20575.gif
[13:02] NEV3R: ¯\_(ツ)_/¯
[13:02] toaster: ok i'll just do it
2018-04-08 13:03:40 +01:00
toaster
5f79a2f1df
Merge branch 'delag_maces' into 'master'
...
Delag Maces
See merge request STJr/SRB2Internal!141
2018-04-07 18:11:31 -04:00
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
mazmazz
bd6276a39e
Allow immediate alpha setting when speed = 0; refactoring
...
* Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha
* Change INT32 destvalue and speed to INT16
2018-04-07 07:09:04 -04:00
Digiku
7cf2c78522
Fix whitespace weirdness
2018-04-07 06:28:31 -04:00
mazmazz
27ca70d069
checkpoint
2018-04-07 05:52:01 -04:00
mazmazz
afa0aae131
Refactor flag handling toggles
2018-04-06 23:14:48 -04:00
mazmazz
73e4cab1e4
Little adjustments
...
* Swap MF_NOCLIMB and MF_EFFECT1
* Implement if Front Y Offset < 1 (== 0), then set alpha immediately
2018-04-06 22:34:45 -04:00
mazmazz
8d3c9d91f1
Merge branch 'le-fadefof' into le-fadefof-remove-storedthinker
2018-04-06 22:22:42 -04:00
mazmazz
3427c304f4
Merge branch 'master' into le-fadefof
2018-04-06 22:22:23 -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