stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-26 20:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity
8485 commits 173 branches 41 tags 298 MiB
Commit graph

8485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
52562c4125 whoops, didn't mean to include this 2019-09-28 20:45:44 +01:00
Jaime Passos
8aefc03409 quick maths 2019-09-28 13:40:40 -03:00
Jaime Passos
6574e1a7d3 memory management 2019-09-28 12:50:07 -03:00
Jaime Passos
5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Steel Titanium
cf852e7d39
Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
Jaime Passos
fe60902df5 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
0aba0aa4b9 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Monster Iestyn
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
Monster Iestyn
240aa34794 Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request 2019-09-27 21:16:11 +01:00
toaster
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
toaster
55a2f1ee1f Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
toaster
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
toaster
65d9c52884 Merge branch 'automap-fixes' into 'master' 
Automap fixes

See merge request STJr/SRB2Internal!348
 2019-09-27 08:52:59 -04:00
toaster
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
toaster
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
toaster
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
toaster
c97037e98e Merge branch 'inputstuff' into 'master' 
Trigonometric input capping

See merge request STJr/SRB2Internal!343
 2019-09-27 08:50:55 -04:00
toaster
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
sphere
bc128dffdc Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright
264c60fb70 P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster
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
lachwright
d5e0ac1450 Added A_Boss3ShockThink to dehacked.c 2019-09-26 18:57:25 +08:00
lachwright
c9c9f95057 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
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