Commit graph

7458 commits

Author SHA1 Message Date
lachwright 0cd3e4fd62 Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
Monster Iestyn 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
lachwright fb9248793a Fix errormode compilation error 2019-09-25 23:09:05 +08:00
toaster 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
lachwright 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
toaster 9504d078e4 Don't lock on if something is literally intangible. 2019-09-25 15:12:19 +01:00
toaster 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
lachwright 77613018f8 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright 264d82c8d0 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00
lachwright 68ee7a6658 Fixed spectators taking unwarranted damage in splitscreen 2019-09-25 17:13:03 +08:00
Lachlan Wright 5de1225b3e Hopefully added the newline back? 2019-09-25 05:06:04 -04:00
Lachlan Wright 3b30b9d656 Add parentheses over change 2019-09-25 05:00:43 -04:00
lachwright 09868d2999 Dust devil fixes 2019-09-25 16:32:06 +08:00
Lachlan Wright 637490e2de AI players no longer take shield damage in Ultimate mode 2019-09-24 23:49:20 -04:00
Jaime Passos c7f6db5c07 remove unused macros 2019-09-24 19:54:16 -03:00
Jaime Passos a197449854 INT32 -> boolean 2019-09-24 19:49:24 -03:00
Jaime Passos 886fe2ad86 remove unused struct 2019-09-24 19:46:52 -03:00
Jaime Passos b022ebe912 better crosshair 2019-09-24 19:44:30 -03:00
Jaime Passos f7c1727959 fix automap FRACBITS confusion 2019-09-24 19:11:52 -03:00
lachwright 51cee6d5bd removed outdated comment 2019-09-25 03:16:04 +08:00
lachwright dc637736ea Trigonometric input capping 2019-09-25 03:12:56 +08:00
James R e69dd9bd75 Automate the silly joystick menu items definition 2019-09-23 20:54:53 -07:00
James R 5cdbde25c1 All for a cvar... 2019-09-23 20:23:40 -07:00
Steel Titanium 6a870b4467
Various of changes
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
Jaime Passos d9507d62f8 ignore TRANSPARENTPIXEL 2019-09-23 19:20:59 -03:00
Jaime Passos 61aa84d15a pixel alpha mistake 2019-09-23 18:27:43 -03:00
Jaime Passos 9c7b3f1d80 patch fixes 2019-09-23 18:25:53 -03:00
lachwright 98d0a0d98e Added bounce-off behavior for multi-hit enemies/bosses 2019-09-24 03:54:04 +08:00
lachwright 3fdf48f9b0 Further cleanup 2019-09-24 03:21:01 +08:00
lachwright 41d718dabf Cleanup 2019-09-24 03:10:41 +08:00
lachwright de294d84e7 Lots of CA_GLIDEANDCLIMB changes:
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
Steel Titanium dfee7efd33
Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Steel Titanium 73146a8338
Restore code that somehow got reverted???
How did this even happen??
2019-09-22 20:30:07 -04:00
lachwright e897f5df45 Sneakers affect max glide speed, changed glideslide behavior 2019-09-23 02:56:01 +08:00
lachwright 0772ee693c Merge remote-tracking branch 'origin/master' into knuxstuff
Update to master branch
2019-09-23 00:21:35 +08:00
lachwright e9d211d2bc reallowed strafe key leeway, increased leeway strength 2019-09-23 00:21:28 +08:00
lachwright 203f9d8c1a Trying out a new glide 2019-09-22 21:11:49 +08:00
toaster 753c1bcb50 Merge branch 'hitbox-tweaks' into 'master'
Small hitbox tweaks

See merge request STJr/SRB2Internal!341
2019-09-22 06:43:28 -04:00
sphere f7ad5501e1 Increase emblem and token hitbox sizes. 2019-09-22 04:19:09 +02:00
sphere f8c97aeb27 Tweak bubble grabbing behavior. 2019-09-22 04:05:22 +02:00
toaster 07120aeda4 Merge branch 'logloaded' into 'master'
Mark new-style log names as loaded in addons menu

See merge request STJr/SRB2Internal!340
2019-09-20 13:39:08 -04:00
toaster c36123aa56 Mark new-style log names as loaded. 2019-09-20 17:43:41 +01:00
Alam Ed Arias 9b4f1b60b9 Merge branch 'public_next' into private 2019-09-20 12:33:34 -04:00
Alam Ed Arias bf28a7f5bc Merge branch 'master' into next 2019-09-20 12:32:32 -04:00
Alam Ed Arias 92779487a4 avoid the source code from getting the wrong EOL 2019-09-20 12:32:18 -04:00
toaster 113568095a * Resolve compiling issues with logmessages.
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
2019-09-20 17:22:09 +01:00
Alam Ed Arias 8d3d5566b8 Undo file mode change on menu files 2019-09-20 12:18:57 -04:00
toaster 7da89e3bc9 Merge branch 'camerafix' into 'master'
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
toaster a6c9525de6 Merge branch 'new_algae' into 'master'
New animated DSZ kelp (plus ACZ cacti & DSZ coral)

See merge request STJr/SRB2Internal!332
2019-09-20 11:45:46 -04:00
toaster 661966ced6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae 2019-09-20 16:45:06 +01:00