James R
|
387a068edf
|
P_MobjFlip does not return boolean
|
2019-11-18 15:55:21 -08:00 |
|
James R
|
b57253f8cc
|
dist is unused
|
2019-11-18 15:53:30 -08:00 |
|
James R
|
4a963d363e
|
Mixed code...
|
2019-11-18 15:52:14 -08:00 |
|
James R
|
5793ba8220
|
locvars not needed
|
2019-11-18 15:48:29 -08:00 |
|
MascaraSnake
|
04fbb5dbd3
|
Merge branch 'cobalt-ai' into 'master'
CobaltBW's Tails AI
See merge request STJr/SRB2Internal!358
|
2019-11-18 17:26:28 -05:00 |
|
MascaraSnake
|
9052105215
|
Merge branch 'f_wipes' into 'master'
Colormapped fades
See merge request STJr/SRB2Internal!469
|
2019-11-18 17:21:09 -05:00 |
|
MascaraSnake
|
66cc8046a5
|
Merge branch 'dragonbomber' into 'master'
Dragonbomber
See merge request STJr/SRB2Internal!489
|
2019-11-18 17:10:30 -05:00 |
|
Jaime Passos
|
e30d85e265
|
adjust duration
|
2019-11-18 19:08:04 -03:00 |
|
Jaime Passos
|
925940b44e
|
Merge remote-tracking branch 'origin/master' into f_wipes
|
2019-11-18 18:48:19 -03:00 |
|
toaster
|
7bcaa5c359
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
# Conflicts:
# src/p_map.c
|
2019-11-18 21:33:51 +00:00 |
|
MascaraSnake
|
2ca069e5ba
|
Merge branch 'titlecards' into 'master'
Titlecards
See merge request STJr/SRB2Internal!492
|
2019-11-18 16:22:32 -05:00 |
|
MascaraSnake
|
5324107edf
|
Merge branch 'jester-fireball' into 'master'
Mario fireball by Jester (resolves #296)
Closes #296
See merge request STJr/SRB2Internal!487
|
2019-11-18 15:56:33 -05:00 |
|
Jaime Passos
|
8ce00492c2
|
Merge remote-tracking branch 'origin/master' into titlecards
|
2019-11-18 17:55:47 -03:00 |
|
Steel Titanium
|
8db5fb30e2
|
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
|
2019-11-18 15:41:57 -05:00 |
|
MascaraSnake
|
18d0f2bd90
|
Merge branch 'nightstail' into 'master'
NiGHTS tail
See merge request STJr/SRB2Internal!482
|
2019-11-18 15:41:52 -05:00 |
|
Steel Titanium
|
dc9a09f837
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
MascaraSnake
|
064d9c2566
|
Merge branch 'capsuletweaks' into 'master'
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
|
2019-11-18 15:24:13 -05:00 |
|
MascaraSnake
|
ecd021abdf
|
Merge branch 'fhzenemytweaks' into 'master'
Hardcode DrT's FHZ improvements (resolves #295).
Closes #295
See merge request STJr/SRB2Internal!483
|
2019-11-18 15:21:59 -05:00 |
|
MascaraSnake
|
2df5fd3b30
|
Merge branch 'poledance' into 'master'
Make ACZ3's slapstick signpost taller (resolves #267).
Closes #267
See merge request STJr/SRB2Internal!473
|
2019-11-18 15:14:48 -05:00 |
|
MascaraSnake
|
abdfc2d237
|
Merge branch 'exit-move-lj' into 'master'
Post-exit movement
See merge request STJr/SRB2Internal!486
|
2019-11-18 15:10:15 -05:00 |
|
MascaraSnake
|
59af56480e
|
Merge branch 'titlecard-lowercase-support' into 'master'
Lowercase support in titlecards
See merge request STJr/SRB2Internal!481
|
2019-11-18 15:05:02 -05:00 |
|
MascaraSnake
|
6f8a84b8cc
|
Merge branch 'endingmus' into 'master'
Ending music and associated
See merge request STJr/SRB2Internal!475
|
2019-11-18 14:33:22 -05:00 |
|
toaster
|
ea8502050b
|
compilation fixes (no review yet, currently just about to have dinner)
|
2019-11-18 19:22:51 +00:00 |
|
MascaraSnake
|
269b2be9f7
|
Merge branch 'reset-rollangle' into 'master'
Reset rollangle
See merge request STJr/SRB2Internal!494
|
2019-11-18 14:11:32 -05:00 |
|
MascaraSnake
|
d7bdcb5f4c
|
Merge branch 'signpost-cleanup' into 'master'
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
|
2019-11-18 14:00:05 -05:00 |
|
MascaraSnake
|
ccf3be6ad8
|
Merge branch 'pingimprovements' into 'master'
Better ping implementation.
See merge request STJr/SRB2Internal!488
|
2019-11-18 13:58:41 -05:00 |
|
MascaraSnake
|
0c0b544bcf
|
Merge branch 'metalbwarp' into 'master'
Fix Metal Sonic not correctly flipping with gravity (Resolve #289).
Closes #289
See merge request STJr/SRB2Internal!472
|
2019-11-18 13:39:22 -05:00 |
|
Jaime Passos
|
649d040cfe
|
restore zigzags
|
2019-11-18 15:32:48 -03:00 |
|
Jaime Passos
|
0f9aa2fcb0
|
V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements
|
2019-11-18 15:18:27 -03:00 |
|
Jaime Passos
|
1f9dc8aaa1
|
missing prototype
|
2019-11-18 15:13:31 -03:00 |
|
Jaime Passos
|
e3ad4f5731
|
perplayer
|
2019-11-18 15:12:55 -03:00 |
|
Jaime Passos
|
8005112879
|
invert conditional
|
2019-11-18 15:06:07 -03:00 |
|
MascaraSnake
|
6426825810
|
Merge branch 'damnnothere' into 'master'
Disable the GL sprite shadows behind a #define.
See merge request STJr/SRB2Internal!485
|
2019-11-18 13:05:43 -05:00 |
|
MascaraSnake
|
686c04292f
|
Merge branch 'firefuck' into 'master'
Firefuck (resolves #291).
Closes #291
See merge request STJr/SRB2Internal!476
|
2019-11-18 13:05:00 -05:00 |
|
Jaime Passos
|
bb8b49b738
|
LF_WARNINGTITLE
|
2019-11-18 15:04:40 -03:00 |
|
MascaraSnake
|
f17dd3768f
|
Merge branch 'papersign3' into 'master'
I fucked up papersigns (Resolve #288).
Closes #288
See merge request STJr/SRB2Internal!471
|
2019-11-18 13:03:46 -05:00 |
|
Jaime Passos
|
a644fe6e77
|
oh sh
|
2019-11-18 14:32:34 -03:00 |
|
Jaime Passos
|
75468a1d5d
|
map header option
|
2019-11-18 14:08:47 -03:00 |
|
Jaime Passos
|
23a5801a09
|
lua
|
2019-11-18 13:50:44 -03:00 |
|
Jaime Passos
|
8ad20c1108
|
Organize
|
2019-11-18 12:56:41 -03:00 |
|
lachwright
|
2bbd25d207
|
Important fixes & mine lob speed reduction
|
2019-11-18 22:57:26 +08:00 |
|
Jaime Passos
|
7bd19aaed1
|
arg
|
2019-11-18 11:42:45 -03:00 |
|
Jaime Passos
|
f37e0de8c5
|
stuff
|
2019-11-18 11:39:54 -03:00 |
|
lachwright
|
53dd55e953
|
Allow positive momentum retention when jumping off rollout rocks
|
2019-11-18 22:36:25 +08:00 |
|
lachwright
|
275833eb51
|
Whoops, deleted a little too much by accident
|
2019-11-18 16:26:15 +08:00 |
|
lachwright
|
97e9555cd9
|
Make camera use signpost's ground z coordinate instead of the player's z coordinate
|
2019-11-18 16:22:12 +08:00 |
|
lachwright
|
11521b793d
|
Fix controllable flight ending when player hits the ground while being carried by Tailsbot
|
2019-11-18 15:55:55 +08:00 |
|
lachwright
|
cd38e4ba1a
|
Add flight indicator
|
2019-11-18 15:17:27 +08:00 |
|
lachwright
|
d0d723b841
|
Don't let the bot decide to fly if it doesn't have the ability to fly
|
2019-11-18 13:37:09 +08:00 |
|
lachwright
|
730ab79c08
|
Allow AI Tails to carry the player
|
2019-11-18 13:30:07 +08:00 |
|