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
lachwright
fb9248793a
Fix errormode compilation error
2019-09-25 23:09:05 +08: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
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
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
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
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
toaster
880c2cdada
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
toaster
20d098de8f
Merge branch 'betterdirs' into 'master'
...
Better directory structure
See merge request STJr/SRB2Internal!321
2019-09-20 11:36:56 -04:00
toaster
361be5c659
Merge branch 'nmus-pk3' into 'master'
...
Support W_VerifyFile on PK3
See merge request STJr/SRB2Internal!328
2019-09-20 11:35:22 -04:00
toaster
d59c02fc0b
Merge branch 'timerfix' into 'master'
...
Timerres fix
Closes #213
See merge request STJr/SRB2Internal!338
2019-09-20 11:34:50 -04:00
toaster
35803d74cc
Merge branch 'camerafix-menu' into 'camerafix'
...
Camera Options submenu
See merge request STJr/SRB2Internal!337
2019-09-20 11:34:26 -04:00
toaster
971d35736a
Merge branch 'flats-png-macro-fix-please-just-work-already' into 'master'
...
Use byteptr.h macros in flats png
See merge request STJr/SRB2Internal!339
2019-09-20 11:34:10 -04:00
lachwright
19e0e43e87
test??
2019-09-20 12:07:57 +08:00
Alam Arias
bf55dd293e
Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 21:43:57 -04:00
Alam Arias
530b5784b8
platersprite_t is not the same as unsigned
2019-09-19 21:42:59 -04:00
Jaime Passos
322a0b8c41
Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 22:41:45 -03:00
Jaime Passos
ef7e8c5d58
use byteptr.h macros
2019-09-19 22:40:23 -03:00
sphere
4c7a7a7e0b
Small DSZ coral tweaks.
2019-09-20 00:51:44 +02:00
lachwright
222d4f2b7c
Improved orbital camera in Software; cam_adjust cvars changed to on by default
2019-09-20 02:02:17 +08:00
toaster
802ddf94b1
Always pretend cv_playersforexit is 4 in co-op special stages.
2019-09-19 18:44:55 +01:00
toaster
a3ea2274f4
Fix inconsistency between score tally screen and timerres cvar ( Resolves #213 ).
2019-09-19 17:43:23 +01:00
toaster
f8475eef26
Disable some code which sometimes makes the player enter walking frames when jumping up to a platform, such as the CEZ3 buttons, despite still being in jumping mode.
...
If this causes more problems than it solves it can be reverted, but doing a bunch of playthroughs of DSZ1/2, GFZ1, and CEZ3 didn't seem to uncover anything, so I'm tentatively putting it in this branch.
2019-09-19 13:20:52 +01:00
toaster
ca9e6e31da
* Resolve #224 (landing frames on ceiling contact).
...
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00
