d373b101fc
Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx
2019-08-04 01:10:34 -04:00
b99f06c0c9
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
2019-08-04 01:10:21 -04:00
353fefbd42
Slight refactor for jingle resume lapse time
2019-08-04 00:59:32 -04:00
81d0840301
Jingle resume: Don't set music position when music is replaced
2019-08-04 00:56:17 -04:00
da55b4b82a
Fix 1up intermission jingle not playing
2019-08-04 00:15:31 -04:00
6ecc062c6a
Fix HWR_DrawConsoleFill call extra input
2019-08-04 00:15:15 -04:00
8a41b530b3
Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle
2019-08-03 23:44:06 -04:00
dd9efebab5
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
2019-08-03 23:38:49 -04:00
5b284c8170
gcc7 compile fixes (Fall through; spr2 var comparison)
2019-08-03 23:01:10 -04:00
07d1363da9
gcc7 compile fixes (Fall through; spr2 var comparison)
2019-08-03 23:00:21 -04:00
5f2a45befd
Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp
2019-08-03 22:49:20 -04:00
a9b66109fc
Fix titlemap music bug
2019-08-03 22:49:12 -04:00
efc8e42083
Fix titlemap music bug
2019-08-03 22:48:40 -04:00
1b59b224c0
Merge branch 'master' into musicplus-feature-dying-fp
2019-08-03 22:22:39 -04:00
00c3329ba9
Ring sparkle mirroring
2019-08-03 18:28:53 -04:00
26689e168e
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle
2019-08-03 17:33:28 -04:00
8a0f1e7ed4
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
9f34a7aa82
Merge branch 'bossenable' into 'master'
...
Boss enable linedef (type 449)
See merge request STJr/SRB2Internal!272
2019-08-03 16:23:22 -04:00
97072d9faa
Merge branch 'snaptoground-fix' into 'master'
...
Snap to ground fix
Closes #165
See merge request STJr/SRB2Internal!274
2019-08-03 16:22:47 -04:00
5ef190fc69
Merge branch 'mpspec_cleanup' into 'master'
...
MP/Old Special Stage ring stuff
See merge request STJr/SRB2Internal!276
2019-08-03 16:22:23 -04:00
8f729c33d3
Merge branch 'linedef-award-rings' into 'master'
...
New award rings linedef executor
See merge request STJr/SRB2Internal!263
2019-08-03 16:21:58 -04:00
f9037509a1
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-03 19:06:45 +01:00
dff544404d
Merge branch 'master' into snaptoground-fix
2019-08-03 18:23:09 +01:00
38ecd00ac9
Merge branch 'speciallosesound' into 'master'
...
Fix old Special Stage failure sounds not always playing
See merge request STJr/SRB2Internal!275
2019-08-03 13:18:40 -04:00
c82c2ee815
Merge branch 'titlemaplua' into 'master'
...
Titlemap Lua
See merge request STJr/SRB2Internal!270
2019-08-03 13:14:46 -04:00
f3baac8577
Fix the minor issues since steel's busy
2019-08-03 08:04:02 -04:00
544a160fc3
Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1.
2019-08-03 12:25:46 +01:00
105df2395d
MI made a good argument for bossdisabled not being conditional on fromnetsave.
2019-08-03 12:09:18 +01:00
876f87e793
Have the ring bonus in MP Special Stages be based on the shared sum of all players'.
2019-08-02 23:56:25 +01:00
16c541ef1b
Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k
2019-08-02 23:51:22 +01:00
c4f0fdb783
Perfect bonus support for non-NiGHTS special stages
2019-08-02 22:52:53 +01:00
8d56133425
Fix old Special Stage failure sounds not always playing.
2019-08-02 20:02:55 +01:00
af38c0e227
Merge branch 'bustables_misc' into 'master'
...
Bustables and landing events
Closes #157 and #162
See merge request STJr/SRB2Internal!262
2019-08-02 13:16:53 -04:00
94c1873b8c
Merge branch 'anglestuff' into 'master'
...
Spring angles and ring angles
See merge request STJr/SRB2Internal!266
2019-08-02 13:10:23 -04:00
8520243ab6
Merge branch 'emeraldfixes' into 'master'
...
Special stage related fixes
See merge request STJr/SRB2Internal!269
2019-08-02 13:08:20 -04:00
146271e49d
Merge branch 'maniaspheresfix' into 'master'
...
MANIASPHERES de-hardcode
See merge request STJr/SRB2Internal!268
2019-08-02 13:06:52 -04:00
ee64d98e39
Merge branch 'spring-things' into 'master'
...
Additional spring flags
See merge request STJr/SRB2Internal!256
2019-08-02 13:06:38 -04:00
2503c2f392
Merge branch 'followmobj_scale' into 'master'
...
Smiles tail scale
See merge request STJr/SRB2Internal!273
2019-08-02 13:05:50 -04:00
aab3a029f2
Merge branch 'diagonalrings' into 'master'
...
Diagonal spring ring fixes
See merge request STJr/SRB2Internal!267
2019-08-02 13:03:11 -04:00
42a36de459
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
...
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 16:51:44 +01:00
d2c3b88020
Merge remote-tracking branch 'origin/master' into spring-things
2019-08-02 15:11:13 +02:00
f2349c5ce4
fixed sphere's CA2_MELEE stasis issue
2019-08-02 13:18:57 +01:00
ac058529c5
Whoops the second
2019-08-01 20:48:24 +01:00
67f7c9d7d9
Whoops, forgot this part
2019-08-01 20:17:15 +01:00
0821f7fb21
Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening
...
...which should hopefully stop that issue where you just teleport back to the ground. Assuming this works as expected.
Also this is untested lol.
2019-08-01 18:56:00 +01:00
8fa0641e99
Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too)
2019-08-01 18:12:26 +01:00
39c15e71b0
Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that...
2019-08-01 08:01:29 -04:00
f0fd9f7656
Ok, now the MobjThinker Lua hook is neutralised properly as well.
2019-08-01 11:35:04 +01:00
e2cd85d4da
I dunno how that got here
2019-07-31 20:57:08 -04:00
3177b27a11
Changes
...
Kill off the hack
2019-07-31 20:51:55 -04:00
7cb02985f4
* Added boss enable linedef (type 449).
...
- Frontside x offset = boss ID (determined via parameter for all bosses)
- Noclimb flag = disable mode
- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
- All bosses' MT_BOSSFLYPOINT search
- Boss 5's waypoint search
- Oldbrak's waypoint search (this one's for you, jood)
2019-07-31 23:17:17 +01:00
d6dacaaab2
ALL CAPS
...
Woops forgot to do this
2019-07-31 00:49:14 -04:00
58b56b2867
New ring sparkles
2019-07-31 00:47:42 -04:00
2ae07bdf3b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc
...
# Conflicts:
# src/p_user.c
2019-07-30 18:14:52 +01:00
7bff305672
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
...
* Move it into lua_script.h, so it's available to everything that needs it.
2019-07-30 17:57:57 +01:00
69e573517f
Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168 ).
2019-07-30 17:48:13 +01:00
d541bb7ead
* Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated.
2019-07-30 17:24:21 +01:00
18e43a5cef
* Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage.
...
* Correct a potential source of desync in P_GiveEmerald.
2019-07-30 16:44:40 +01:00
b77780e1e7
Fix building with MSVC
2019-07-29 19:02:45 -04:00
e50dc7c779
Merge branch 'public_next' into private
2019-07-29 18:31:01 -04:00
963d2f5da3
Merge branch 'master' into next
2019-07-29 18:05:33 -04:00
66f84efd02
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
f141220e82
Added escape pod. Okay, now I'm truly done with this branch. https://cdn.discordapp.com/attachments/249925765423038464/605506507345362964/srb20033.gif
2019-07-29 22:13:24 +01:00
deaee586ed
Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it.
2019-07-29 21:06:17 +01:00
a6a3048c8f
* Fix diagonal spring ring assortments being forced up/down with slopes.
2019-07-29 21:03:28 +01:00
62c708e64a
Two one liners related to angles, so doin' em in a single branch.
...
* If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it.
* If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
2019-07-29 20:29:02 +01:00
47554b57e4
* Made the evaluation screen even more attractive.
...
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
5dc095a47d
Further improvements on MI's request, just to be safe.
2019-07-28 22:53:27 +01:00
1d799630af
Made it possible to just call `EV_CrumbleChain(rover)` in Lua
2019-07-28 22:45:20 +01:00
18e2c2461f
Merge branch 'wavingflag' into 'master'
...
New CEZ scenery
See merge request STJr/SRB2Internal!257
2019-07-28 15:44:00 -04:00
384533165c
* Fix crash error in GL.
...
* Re-enable the perplayer stuff in V_DrawFadeFill - not worth having it disabled when it'll just have to be re-enabled later.
* Remove some "consistency with software" stuff in hw_draw.c that already has equivalents
2019-07-28 17:47:57 +01:00
f47c3f40d1
Smoothen emerald rotation a tad. (Not gonna upload a new test exe, it's basically identical...)
2019-07-28 14:59:42 +01:00
bebaf6f984
* Add comments for maintenence.
...
* Fix not-guaranteed-to-be-set-to-zero-ness of sparklloop
* Add blackrock sparkles to good ending.
* Don't have emerald sparkles be randomised.
* Adjust credits to include Sal (credits sprites + four merged internal MRs and a bunch of public ones) and a few other known contributors, plus remove oni's name (he requested i do it a whiiile ago)
2019-07-28 11:40:19 +01:00
7569e0b184
Good morning, fix three little things.
...
* Made the black rock animate backwards through its anim again, to match the 2.1 and earlier intro.
* Rid branch of mixed code declaration warnings.
* Other cleanup.
2019-07-28 10:41:00 +01:00
063e350c63
A good and bad ending cutscene now exist.
...
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)
Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
39f348f853
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into linedef-award-rings
2019-07-24 21:18:45 -04:00
60ffef9830
More simplified code
...
Also delay is in tics, per MS' request.
2019-07-24 21:18:07 -04:00
f67f9405bc
Merge remote-tracking branch 'origin/master' into flats-png
2019-07-24 19:07:36 -04:00
0eb6b24415
Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png
2019-07-24 18:17:01 -04:00
2075b525a9
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx
2019-07-22 22:22:12 -04:00
c35afa2c96
Merge branch 'master' into musicplus-sdlmixerx
2019-07-22 22:20:08 -04:00
af959ee309
Some fixup
2019-07-22 22:01:05 -04:00
cb278388f0
Merge branch 'recordattack-bg-fixes' into 'master'
...
Record Attack bg fixes
See merge request STJr/SRB2Internal!259
2019-07-20 11:33:06 -04:00
0f8c046c6f
On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway
2019-07-20 16:30:30 +01:00
6c2ef839c1
New award rings linedef executor
2019-07-18 22:42:46 -04:00
64517a1362
Fix !150 , too
2019-07-18 00:16:01 +01:00
1d5e8e249e
Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.
2019-07-17 23:25:49 +01:00
82acf2de6b
Fix Knuckles-in-quicksand messup.
2019-07-17 23:24:44 +01:00
385d34e67e
* Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
...
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
438c4d1d51
Fix spindash being broken in quicksand
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2019-07-17 21:33:18 +01:00
c8cfc3110f
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
6eaf7625a9
Merge branch 'master' into next
2019-07-16 18:26:46 +01:00
e50147f7f0
Merge branch 'master' into recordattack-bg-fixes
2019-07-16 17:04:42 +01:00
91502f1499
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
5ef4dda9b9
Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead.
...
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
2019-07-15 20:25:57 +01:00
d44a8ab78e
Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks
2019-07-14 22:36:14 +01:00
a1e6f5bdb3
remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/
2019-07-14 22:28:19 +01:00
f6842a80b4
Fixes for menus:
...
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
2019-07-14 21:58:48 +01:00
4e839596a1
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
fac6de9c2e
The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol.
...
(Neither were the CTF starts but those didn't directly cause any problems luckily)
2019-07-14 18:10:03 +01:00
79cf8eb08d
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 17:30:33 +02:00
5c54022a89
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
794235a848
Fix mixed code-and-declaration error
2019-07-14 16:19:48 +01:00
6cf82fbb43
Merge branch 'libopenmpt-fixes' into 'master'
...
Improved libopenmpt loading
See merge request STJr/SRB2Internal!251
2019-07-14 11:03:14 -04:00
ca7de207d4
Merge branch 'wallspike-fix' into 'master'
...
Fix wall spikes that start retracted
See merge request STJr/SRB2Internal!255
2019-07-14 10:55:10 -04:00
d30af084d7
Merge branch 'thinkerlists-fix' into 'master'
...
Thinkerlists fix
Closes #161
See merge request STJr/SRB2Internal!253
2019-07-14 10:52:56 -04:00
ee937c4df0
Add a blue variant of the waving flags.
2019-07-14 16:50:45 +02:00
cfc56c9541
Don't upscale the waving flags, make them twice as large instead
2019-07-14 15:30:00 +02:00
b3e953c8c3
Correct some extant fuckups.
2019-07-14 14:21:32 +01:00
911b0262ee
Whoops, forgot to revert this.
2019-07-14 02:31:33 +02:00
9c73424b4b
Add spring flags: float for horizontal & no gravity for diagonal.
2019-07-14 02:17:44 +02:00
106f6498e2
Add meleestate to MT_WALLSPIKE.
2019-07-14 01:29:36 +02:00
e68e510ca2
Assign sound to the wood debris object.
2019-07-13 23:15:56 +02:00
323d5d61d3
Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^)
2019-07-13 14:07:40 +01:00
47f138ac34
I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here.
2019-07-13 13:43:22 +01:00
166f1fac66
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
35adf2ce4a
fix leftshift of negative value MascaraSnake also gets
2019-07-09 21:48:18 +01:00
f62087ef30
Fix MascaraSnake's issues with sign-compare (hopefully)
2019-07-09 21:43:38 +01:00
63d337211e
Merge branch 'eggcolosseum' into 'master'
...
Egg Colosseum (CEZ3 remaster)
See merge request STJr/SRB2Internal!248
2019-07-09 16:32:24 -04:00
11a24b88ee
Merge branch 'seaegg_tweaks' into 'master'
...
Sea Egg
See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
dc71e297bb
Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well
2019-07-09 21:15:12 +01:00
60cb2de6a0
Seperate declarations from code
2019-07-09 15:51:11 -04:00
c1c6656b54
Merge branch 'master' into libopenmpt-fixes
2019-07-09 15:44:58 -04:00
848061d517
Fix compiling on Linux
2019-07-09 15:42:14 -04:00
2df90888bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
...
# Conflicts:
# src/p_mobj.c
# src/sounds.c
# src/sounds.h
2019-07-09 19:52:52 +01:00
3e305c0993
Merge branch 'toast_cleanup' into 'master'
...
PITY IN PINK and everything associated (formerly toast_fixes)
See merge request STJr/SRB2Internal!232
2019-07-09 14:31:25 -04:00
ef984eb336
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes (again)
See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
c1bea02f03
Merge branch 'rainfixesmkII' into 'master'
...
Accidentially broke rain in the rainfixes branch (oh, the irony!)
See merge request STJr/SRB2Internal!249
2019-07-09 14:24:14 -04:00
574cf2609f
Merge branch 'remove-character-flags' into 'master'
...
Remove character flags
Closes #27
See merge request STJr/SRB2Internal!246
2019-07-09 14:18:27 -04:00
21c6836fe0
Some few comments
2019-07-09 00:56:22 -04:00
e112856265
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes
2019-07-09 00:17:27 -04:00
9c2c81ba4e
Merge branch 'master' into libopenmpt-fixes
2019-07-08 23:37:56 -04:00
b571be865b
Merge branch 'sound-menu-fix' into 'master'
...
Sound options menu fixes
Closes #160
See merge request STJr/SRB2Internal!250
2019-07-08 19:42:47 -04:00
d3d24bc0bd
Removed the "disable" linedef effect, since it's useless now that the character flags are gone
2019-07-08 22:58:31 +02:00
5b741d8232
Simplified checks for ML_NETONLY and ML_NONET
2019-07-08 22:56:00 +02:00
4da108748b
Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks.
...
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
2019-07-08 21:17:40 +01:00
98b6280d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
...
# Conflicts:
# src/p_mobj.c
2019-07-08 13:53:31 +01:00
1f15209eb5
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks
...
# Conflicts:
# src/p_enemy.c
# src/p_mobj.c
2019-07-08 13:52:11 +01:00
a65925aeca
Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.
...
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
2019-07-08 13:39:21 +01:00
5e0d18be2d
Before I forget...
2019-07-08 13:36:02 +01:00
867f7ecfca
ha ha ha how can i possibly describe this commit
...
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
d2adb5e829
Update info.h
...
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 18:11:49 -04:00
ef05d81a4c
Change this, not that it really matters but
2019-07-06 00:39:36 -04:00
ec8f64100e
Hardcode brick debris
2019-07-06 00:36:02 -04:00
5baaba1d9e
Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.
...
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
2019-07-04 14:44:09 +01:00
b78fac66c4
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
2019-07-04 14:09:56 +01:00
3efb49487e
Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready.
...
Just making this commit now so I can merge in master...
2019-07-04 14:09:38 +01:00
a5074a846b
Implemented a skin-based linedef executor trigger
2019-07-03 09:19:29 +02:00
4ad1703ae3
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
...
This reverts commit c04b560e92
2019-07-03 00:58:02 +01:00
c04b560e92
Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
...
This reverts merge request !239
2019-07-02 23:49:10 +00:00
mazmazz
