Commit graph

7043 commits

Author SHA1 Message Date
toaster
95f848d0ee 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
7f33a402a4 Merge branch 'automap-fixes' into 'master'
Automap fixes

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

See merge request STJr/SRB2Internal!343
2019-09-27 08:50:55 -04:00
toaster
c1dea190a8 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
88ad1937d6 Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright
7563e7be6f P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
lachwright
5b92f15e44 Added A_Boss3ShockThink to dehacked.c 2019-09-26 18:57:25 +08:00
lachwright
f9cf4746b2 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
lachwright
4d31ebf47a Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
lachwright
7d4c39a738 Fix errormode compilation error 2019-09-25 23:09:05 +08:00
lachwright
9f4c65dc01 Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling) 2019-09-25 22:36:48 +08:00
lachwright
09c9ff0217 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright
bd1809f742 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00
lachwright
aff47ebd1e Fixed spectators taking unwarranted damage in splitscreen 2019-09-25 17:13:03 +08:00
Lachlan Wright
319cf62980 Hopefully added the newline back? 2019-09-25 05:06:04 -04:00
Lachlan Wright
e13c16ea9d Add parentheses over change 2019-09-25 05:00:43 -04:00
lachwright
02746c0a7c Dust devil fixes 2019-09-25 16:32:06 +08:00
Lachlan Wright
d53e652028 AI players no longer take shield damage in Ultimate mode 2019-09-24 23:49:20 -04:00
Jaime Passos
a2514fb8c1 remove unused macros 2019-09-24 19:54:16 -03:00
Jaime Passos
2689fe38d9 INT32 -> boolean 2019-09-24 19:49:24 -03:00
Jaime Passos
80db38c0ce remove unused struct 2019-09-24 19:46:52 -03:00
Jaime Passos
484c673d5f better crosshair 2019-09-24 19:44:30 -03:00
Jaime Passos
54450d34e6 fix automap FRACBITS confusion 2019-09-24 19:11:52 -03:00
lachwright
67aa0cd2f6 removed outdated comment 2019-09-25 03:16:04 +08:00
lachwright
63c0c21d8e Trigonometric input capping 2019-09-25 03:12:56 +08:00
James R
cf14b6257c Automate the silly joystick menu items definition 2019-09-23 20:54:53 -07:00
James R
c5effff659 All for a cvar... 2019-09-23 20:23:40 -07:00
Steel Titanium
cecbf95002 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
0346c28cc0 ignore TRANSPARENTPIXEL 2019-09-23 19:20:59 -03:00
Jaime Passos
be6c8b08ea pixel alpha mistake 2019-09-23 18:27:43 -03:00
Jaime Passos
fac1a2b36e patch fixes 2019-09-23 18:25:53 -03:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Steel Titanium
8e50a7214c Restore code that somehow got reverted???
How did this even happen??
2019-09-22 20:30:07 -04:00
toaster
dbcb8d4090 Merge branch 'hitbox-tweaks' into 'master'
Small hitbox tweaks

See merge request STJr/SRB2Internal!341
2019-09-22 06:43:28 -04:00
sphere
42d1fa6e88 Increase emblem and token hitbox sizes. 2019-09-22 04:19:09 +02:00
sphere
c4784e71eb Tweak bubble grabbing behavior. 2019-09-22 04:05:22 +02:00
toaster
fe626b699f 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
a6ad704d6c Mark new-style log names as loaded. 2019-09-20 17:43:41 +01:00
Alam Ed Arias
a236241b53 Merge branch 'public_next' into private 2019-09-20 12:33:34 -04:00
Alam Ed Arias
93da2cf8fe Merge branch 'master' into next 2019-09-20 12:32:32 -04:00
Alam Ed Arias
6d78290131 avoid the source code from getting the wrong EOL 2019-09-20 12:32:18 -04:00
toaster
9770b8bf22 * 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
924b76d4ee Undo file mode change on menu files 2019-09-20 12:18:57 -04:00
toaster
d7ba804e22 Merge branch 'camerafix' into 'master'
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
toaster
f9c996f8a6 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
4d62bb4620 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae 2019-09-20 16:45:06 +01:00
toaster
9c7d8d8990 Merge branch 'playerfixes' into 'master'
Some Player fixes and enhancements

Closes #216, #219, #222, and #224

See merge request STJr/SRB2Internal!334
2019-09-20 11:39:32 -04:00