Merge branch 'paralysis' of github.com:LinlyBoi/shocked-miguel into paralysis

Browse Source

...

This commit is contained in:

Weaponised Autism

2024-11-07 19:26:52 +02:00

parent cd3397603e 74337189d8

commit 765534a60e

118 changed files with 7 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/Characters/dog/.DS_Store vendored Normal file

Binary file not shown.

BIN

assets/Characters/dog/Sprites/.DS_Store vendored Normal file

Binary file not shown.

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 297 B

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 299 B

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 292 B

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 296 B

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 281 B

BIN

assets/Characters/dog/Sprites/Dog-idle/dog-idlet6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

assets/Characters/dog/Sprites/Dog/dog1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 621 B

BIN

assets/Characters/dog/Sprites/Dog/dog2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 662 B

BIN

assets/Characters/dog/Sprites/Dog/dog3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 555 B

BIN

assets/Characters/dog/Sprites/Dog/dog4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 565 B

BIN

assets/Characters/dog/Spritesheets/dog-idle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 786 B

BIN

assets/Characters/dog/Spritesheets/dog.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

assets/Characters/dog/dog.ase Normal file

Binary file not shown.

0

assets/miguel/Miguel-Idle.png → assets/Characters/miguel/Miguel-Idle.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 867 B After Width:  |  Height:  |  Size: 867 B

0

assets/miguel/Miguel-Walk.png → assets/Characters/miguel/Miguel-Walk.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 885 B After Width:  |  Height:  |  Size: 885 B

BIN

assets/environment/Forest/.DS_Store vendored Normal file

Binary file not shown.

BIN

assets/environment/Forest/Background Layers/.DS_Store vendored Normal file

Binary file not shown.

BIN

assets/environment/Forest/Background Layers/background.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

assets/environment/Forest/Background Layers/middleground.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 15 KiB

BIN

assets/environment/Forest/sprites/enemies/bee/bee-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 830 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 776 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 821 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 789 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 847 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 745 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 788 B

BIN

assets/environment/Forest/sprites/enemies/bee/bee-8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 782 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 710 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 673 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 619 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant-attack/piranha-plant-attack-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 681 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 710 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 673 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 616 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 637 B

BIN

assets/environment/Forest/sprites/enemies/piranha-plant/piranha-plant-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 670 B

BIN

assets/environment/Forest/sprites/enemies/slug/slug-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 503 B

BIN

assets/environment/Forest/sprites/enemies/slug/slug-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 498 B

BIN

assets/environment/Forest/sprites/enemies/slug/slug-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 478 B

BIN

assets/environment/Forest/sprites/enemies/slug/slug-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 470 B

BIN

assets/environment/Forest/sprites/misc/carrot/carrot-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 324 B

BIN

assets/environment/Forest/sprites/misc/carrot/carrot-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 296 B

BIN

assets/environment/Forest/sprites/misc/carrot/carrot-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 319 B

BIN

assets/environment/Forest/sprites/misc/carrot/carrot-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

BIN

assets/environment/Forest/sprites/misc/chest/chest-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 449 B

BIN

assets/environment/Forest/sprites/misc/chest/chest-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 363 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 208 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 195 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 433 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 547 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 542 B

BIN

assets/environment/Forest/sprites/misc/enemy-death/enemy-death-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 410 B

BIN

assets/environment/Forest/sprites/misc/hud/hud-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 390 B

BIN

assets/environment/Forest/sprites/misc/hud/hud-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 417 B

BIN

assets/environment/Forest/sprites/misc/hud/hud-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 458 B

BIN

assets/environment/Forest/sprites/misc/hud/hud-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 425 B

BIN

assets/environment/Forest/sprites/misc/star/star-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 261 B

BIN

assets/environment/Forest/sprites/misc/star/star-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 254 B

BIN

assets/environment/Forest/sprites/misc/star/star-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 233 B

BIN

assets/environment/Forest/sprites/misc/star/star-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 173 B

BIN

assets/environment/Forest/sprites/misc/star/star-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 240 B

BIN

assets/environment/Forest/sprites/misc/star/star-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 242 B

BIN

assets/environment/Forest/sprites/player/player-climb/player-climb-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 582 B

BIN

assets/environment/Forest/sprites/player/player-climb/player-climb-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 581 B

BIN

assets/environment/Forest/sprites/player/player-climb/player-climb-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 549 B

BIN

assets/environment/Forest/sprites/player/player-climb/player-climb-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 581 B

BIN

assets/environment/Forest/sprites/player/player-duck/player-duck-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 486 B

BIN

assets/environment/Forest/sprites/player/player-duck/player-duck-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 440 B

BIN

assets/environment/Forest/sprites/player/player-duck/player-duck-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 456 B

BIN

assets/environment/Forest/sprites/player/player-duck/player-duck-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 462 B

BIN

assets/environment/Forest/sprites/player/player-fall/player-fall-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 655 B

BIN

assets/environment/Forest/sprites/player/player-fall/player-fall-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 622 B

BIN

assets/environment/Forest/sprites/player/player-fall/player-fall-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 602 B

BIN

assets/environment/Forest/sprites/player/player-fall/player-fall-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 605 B

BIN

assets/environment/Forest/sprites/player/player-hurt/player-hurt-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 690 B

BIN

assets/environment/Forest/sprites/player/player-hurt/player-hurt-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 635 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 636 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 569 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 553 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 488 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 534 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 551 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 546 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 537 B

BIN

assets/environment/Forest/sprites/player/player-idle/player-idle-9.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 582 B

BIN

assets/environment/Forest/sprites/player/player-jump/player-jump-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 618 B

BIN

assets/environment/Forest/sprites/player/player-jump/player-jump-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 589 B

BIN

assets/environment/Forest/sprites/player/player-jump/player-jump-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 589 B

BIN

assets/environment/Forest/sprites/player/player-jump/player-jump-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 581 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 595 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 589 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 559 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 575 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 579 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 530 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 494 B

BIN

assets/environment/Forest/sprites/player/player-skip/player-skip-8.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 479 B

BIN

assets/environment/Forest/spritesheets/.DS_Store vendored Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More