toasterbabe
65e3cdc1fb
Fix Autobrake/analog not showing up properly in record attack mode.
2017-10-23 23:29:55 +01:00
toasterbabe
3a96c507a2
* Made PK3s fail the music lump check, because... that method of checking doesn't really work with it.
...
* Improve the output of listwad to identify unimportant, non-networked files. https://cdn.discordapp.com/attachments/237467298590490625/371314970002063370/srb20044.png
* Fixed mainwads being one too high due to the removal of rings.dta.
2017-10-21 16:18:28 +01:00
toasterbabe
50d6208913
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-10-21 14:28:44 +01:00
toasterbabe
eea5c9d56a
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into unca_scrooge
...
# Conflicts:
# src/dehacked.c
# src/info.h
# src/p_enemy.c
2017-10-21 12:48:41 +01:00
toasterbabe
49aa6ee339
Tweak to modifications to new level select.
2017-10-18 22:18:43 +01:00
toasterbabe
8372bde91b
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus
2017-10-18 21:02:50 +01:00
toasterbabe
9f46f84132
Disable REDXVI cheat by default.
2017-10-18 21:02:43 +01:00
Monster Iestyn
94b7d564e7
Merge branch 'ports-chopping-block' into 'master'
...
Ports chopping block
See merge request STJr/SRB2Internal!118
2017-10-18 14:39:57 -04:00
toasterbabe
77bcb5d502
Slow the flash.
2017-10-18 16:22:18 +01:00
toasterbabe
5c4247dd61
Allow for the combination of NiGHTS and record attack HUD.
2017-10-18 13:58:16 +01:00
toasterbabe
0fe1f9d63b
* "BAD DEMO!!" and "ANALOG" attachments to the input viewer
...
* Minor refactor
2017-10-18 13:22:57 +01:00
toasterbabe
c7b2c43ae5
Record attack input display!
...
https://cdn.discordapp.com/attachments/293238104096112641/369485020038955008/srb20041.gif
2017-10-16 16:25:31 +01:00
toasterbabe
04160f0081
Fixed the smilestails/any other followmobj not spawning at leveltime 0 in a fresh record attack boot!
2017-10-15 13:51:20 +01:00
toasterbabe
a4f10a4b96
Fixed replays of skins whose realnames differed from their normal names from not being readable (by fixing the writing).
2017-10-15 12:35:49 +01:00
TehRealSalt
f0b938eb98
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/p_saveg.c
2017-10-14 16:20:56 -04:00
TehRealSalt
8a676d8aa4
Added movebob removed viewheight
...
"movebob" lets you determine the strength of movement bobbing (does not
affect landing delta, that's technically not movement bobbing :p),
values range from 0.0 to 4.0. viewheight is now relative to
player->height.
2017-10-14 16:11:08 -04:00
Monster Iestyn
3e595b8f1b
Merge branch 'master' into ports-chopping-block
2017-10-14 20:47:04 +01:00
toasterbabe
8e389382ed
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit
...
# Conflicts:
# src/p_user.c
2017-10-14 19:12:15 +01:00
toasterbabe
1ba9d1fe6e
* Rudimentary (set everything every state or DIE) support for ghost followmobjs.
...
* Rename GZT_SPRITE to GZT_FRAME, since otherwise it's easy to confuse with EZT_SPRITE (which does something completely different).
* Fix issue where ghosts were facing wrong direction on spawn.
* Other minor refactorings.
* ...also, made smiles' tails pop up instead of down when skidding
2017-10-14 17:50:14 +01:00
toasterbabe
31dff22202
Fixed followmobj not getting deleted when removing mobjs. Why did I do it in this branch? I've got lots related to followmobjs to do here for demo purposes, so...
2017-10-12 13:15:24 +01:00
Alam Ed Arias
1918e256f1
use the right bitmask
2017-10-11 17:12:41 -04:00
Alam Ed Arias
e927008711
signed stuff before using abs()
2017-10-11 17:05:35 -04:00
Alam Ed Arias
cdde7ea8e5
not equal, NOT statement
2017-10-11 16:58:45 -04:00
Monster Iestyn
7ebaa58997
Removed makefile options that existed only for the removed ports
2017-10-11 19:11:35 +01:00
toasterbabe
f75d56f932
Beginner support for followitem. Doesn't handle it for ghosts; need to do that independently.
2017-10-11 17:45:32 +01:00
toasterbabe
8871b08007
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit
...
# Conflicts:
# src/p_user.c
2017-10-11 17:44:48 +01:00
toaster
e298e35ada
Merge branch 'smiling_on_the_inside' into 'master'
...
Smiles! (and some tweaks to Super)
See merge request !119
2017-10-11 10:40:11 -04:00
toasterbabe
7fcef5d44d
Huh, that's what was going on with the black magyks. Silly me!
2017-10-10 21:24:24 +01:00
toasterbabe
728a195e54
Fix NiGHTS desync message... by obliterating all its special casing.
2017-10-10 19:30:32 +01:00
toasterbabe
8217900c0d
* Make replays take analog mode, flipcam, directionchar and autobrake settings into account.
...
* Fix replays for the current state of internal, irrespective of that previous thing.
* Fix replay ghosts for everything.
* Known issues; NiGHTS still prints an error message about desyncing on map start, but plays back fine. Curious.
2017-10-10 17:56:38 +01:00
Wolfy
2fff5e9f6d
Fix empty WAD files printing the wrong sprite count.
2017-10-10 01:41:28 -05:00
Wolfy
ec9d47cb34
Use the new sprite system
2017-10-09 14:24:04 -05:00
Alam Ed Arias
79879bbd7b
Need to handle that FindFolder() does not fill musPos
2017-10-07 19:10:29 -04:00
Alam Ed Arias
021417500e
Do not use Win32's TRUE/FALSE is OS independent code
2017-10-07 19:08:29 -04:00
wolfy852
2cbed2aa4f
Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 17:21:42 -05:00
wolfy852
b298c7a541
Fix p_spec.c and r_things.h, get the compiler to shut up
...
This compiles with no errors or warnings, but hasn't been tested yet. Please review/test when you can.
2017-10-07 17:18:25 -05:00
Monster Iestyn
38c109ddd2
filtered out the FILTERS makefile option
2017-10-07 21:31:24 +01:00
Alam Ed Arias
1a8e99bf5c
Merge branch 'master' into FileManagement
2017-10-07 16:08:48 -04:00
Alam Ed Arias
c9a43f310d
Merge remote-tracking branch 'private/FileManagement' into FileManagement
2017-10-07 16:06:26 -04:00
Alam Ed Arias
602fbd356a
Merge branch 'master' into FileManagement
2017-10-07 16:06:10 -04:00
wolfy852
93584f6811
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 14:52:40 -05:00
wolfy852
a3cfa8dd5c
Fixes from toaster, plus some other stuff
2017-10-07 14:52:27 -05:00
wolfy852
69d0e84b00
Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 14:48:56 -05:00
wolfy852
efb30f93ab
Fixes from toaster, plus some other things
2017-10-07 14:48:49 -05:00
Monster Iestyn
b2bd073677
Slaughtered SDL 1.2 code
2017-10-07 18:32:50 +01:00
Alam Ed Arias
66201620dd
cleanup a few compiler warnings
2017-10-07 13:21:12 -04:00
Monster Iestyn
52620ac9b1
Obliterated OS/2
2017-10-07 18:11:14 +01:00
Alam Ed Arias
c60caa5169
Merge branch 'public_next' into master
2017-10-07 12:46:16 -04:00
Alam Ed Arias
96c014deeb
Merge branch 'master' into next
2017-10-07 12:44:28 -04:00
toasterbabe
e478fa830e
Remove the MF2_DONTDRAW set - this is effectively already handled by MF2_LINKDRAW.
2017-10-07 14:45:37 +01:00