9431497f7d
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/p_map.c
# src/p_user.c
2019-09-29 18:49:53 +02:00
26ecab14d7
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
60cbc2e6b4
Remove unused locals
2019-09-29 21:29:37 +08:00
71603006dc
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
8abb6129c1
Hardcode pumice ball
...
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
22e3c37e5d
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
2019-09-29 11:58:33 +02:00
598047ae8b
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
bea7224ebf
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00
52562c4125
whoops, didn't mean to include this
2019-09-28 20:45:44 +01:00
cf852e7d39
Fix crash if speed is too high
...
Also update libopenmpt
2019-09-27 23:53:19 -04:00
0aba0aa4b9
Merge remote-tracking branch 'origin/master' into openglskydome2
2019-09-27 22:47:10 -03:00
fa444a37eb
Added < 0 checks to all three variables added in last commit
...
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
2019-09-27 23:15:38 +01:00
240aa34794
Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request
2019-09-27 21:16:11 +01:00
ff8c43664a
Merge branch 'addons-menu-cleanup' into 'master'
...
Addons menu cleanup
See merge request STJr/SRB2Internal!316
2019-09-27 08:55:36 -04:00
55a2f1ee1f
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
40a7b67a86
Merge branch 'dsz3shockwave' into 'master'
...
Deep Sea Zone 3 hardcoding
Closes #185
See merge request STJr/SRB2Internal!349
2019-09-27 08:54:57 -04:00
65d9c52884
Merge branch 'automap-fixes' into 'master'
...
Automap fixes
See merge request STJr/SRB2Internal!348
2019-09-27 08:52:59 -04:00
3f1d84a6b3
Merge branch 'patch-fixes' into 'master'
...
Patch fixes (Resolves #230 )
Closes #230
See merge request STJr/SRB2Internal!347
2019-09-27 08:52:41 -04:00
4d058d1d25
Merge branch 'lachfixes' into 'master'
...
Several bug fixes!
Closes #210 , #192 , and #189
See merge request STJr/SRB2Internal!345
2019-09-27 08:52:23 -04:00
c091174f2e
Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master'
...
Resolve "Tails AI should die when taking damage in Ultimate"
Closes #231
See merge request STJr/SRB2Internal!344
2019-09-27 08:51:11 -04:00
c97037e98e
Merge branch 'inputstuff' into 'master'
...
Trigonometric input capping
See merge request STJr/SRB2Internal!343
2019-09-27 08:50:55 -04:00
ee2d88d4b7
Merge branch 'internal-hotplug-stableid' into 'master'
...
Controller hotplug support.
See merge request STJr/SRB2Internal!342
2019-09-27 08:50:34 -04:00
bc128dffdc
Fix compiling errors, thanks to toaster.
2019-09-26 23:15:52 +02:00
264c60fb70
P_SetTarget fixes, added SPR_SHCK to hw_light.c
2019-09-27 02:13:02 +08:00
ec1712064c
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH)
...
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 17:06:29 +01:00
d5e0ac1450
Added A_Boss3ShockThink to dehacked.c
2019-09-26 18:57:25 +08:00
c9c9f95057
Lowered shockwave speed
2019-09-26 17:12:03 +08:00
0cd3e4fd62
Hardcoded DSZ3 shockwave
2019-09-26 05:27:51 +08:00
75ee3193f4
Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last.
...
1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha)
2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself
3) ??? profit
Untested and uncompiled atm, but I have some confidence this might work
2019-09-25 20:27:41 +01:00
fb9248793a
Fix errormode compilation error
2019-09-25 23:09:05 +08:00
313fed2a59
Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side.
2019-09-25 15:49:37 +01:00
c1750d9359
Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)
2019-09-25 22:36:48 +08:00
9504d078e4
Don't lock on if something is literally intangible.
2019-09-25 15:12:19 +01:00
2a452ddcf5
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was?
...
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.
To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.
Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 14:36:20 +01:00
77613018f8
(Crudely) fixed camera jitter on certain FOF slopes
2019-09-25 21:15:19 +08:00
264d82c8d0
Fixed Brak's flames not animating
2019-09-25 20:32:56 +08:00
68ee7a6658
Fixed spectators taking unwarranted damage in splitscreen
2019-09-25 17:13:03 +08:00
5de1225b3e
Hopefully added the newline back?
2019-09-25 05:06:04 -04:00
3b30b9d656
Add parentheses over change
2019-09-25 05:00:43 -04:00
09868d2999
Dust devil fixes
2019-09-25 16:32:06 +08:00
637490e2de
AI players no longer take shield damage in Ultimate mode
2019-09-24 23:49:20 -04:00
c7f6db5c07
remove unused macros
2019-09-24 19:54:16 -03:00
a197449854
INT32 -> boolean
2019-09-24 19:49:24 -03:00
886fe2ad86
remove unused struct
2019-09-24 19:46:52 -03:00
b022ebe912
better crosshair
2019-09-24 19:44:30 -03:00
f7c1727959
fix automap FRACBITS confusion
2019-09-24 19:11:52 -03:00
51cee6d5bd
removed outdated comment
2019-09-25 03:16:04 +08:00
dc637736ea
Trigonometric input capping
2019-09-25 03:12:56 +08:00
e69dd9bd75
Automate the silly joystick menu items definition
2019-09-23 20:54:53 -07:00
5cdbde25c1
All for a cvar...
2019-09-23 20:23:40 -07:00
MascaraSnake
