Testing_Sandbox.git

miepzerino

2023-12-07 0ec8b19380b2feb928369877ad7f9d09c5264bf9

refs
author	miepzerino <o.skotnik@gmail.com>
	Thursday, December 7, 2023 23:33 +0000
committer	miepzerino <o.skotnik@gmail.com>
	Thursday, December 7, 2023 23:33 +0000
commit	0ec8b19380b2feb928369877ad7f9d09c5264bf9
tree	2f6976f1922e5241092f599f7b240d013142627a tree \| zip \| gz
parent	65fd422300270fd39e12dcddaf011e1acfc050b6 view \| diff bcbfc823391cf95c5873e905fb0f6fec335e080c view \| diff

Merge branch 'develop'

9 files modified

1 files renamed

97 files added

1 files deleted

	Assets/Audio.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/Music.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/Music/Happy.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/Music/Happy.wav.meta	23 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/Music/Menu.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/Music/Menu.wav.meta	23 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Enemy.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Enemy/EXPLOSION_Short_Smooth_Crackle_stereo.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Enemy/EXPLOSION_Short_Smooth_Crackle_stereo.wav.meta	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Enemy/EnemyDeath.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Enemy/EnemyDeath.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Player.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Player/PlayerDeathSound.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Player/PlayerDeathSound.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Player/PlayerHit.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Player/PlayerHit.wav.meta	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/ButtonHover.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/ButtonHover.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/ButtonPress.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/ButtonPress.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/Money.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/Money.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/NoMoney.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/NoMoney.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/Respawn.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/Respawn.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/SavedOptions.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/UI/SavedOptions.wav.meta	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Weapons.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Weapons/FIREARM_Handgun_B_FS92_9mm_Fire_Short_Reverb_Tail_RR1_stereo.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Weapons/FIREARM_Handgun_B_FS92_9mm_Fire_Short_Reverb_Tail_RR1_stereo.wav.meta	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Weapons/gunshot.wav	diff \| view \| raw \| blame \| history
	Assets/Audio/SFX/Weapons/gunshot.wav.meta	24 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefab.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefab/Player.prefab	270 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefab/Player.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Presets.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Presets/PixelArtTextureImporter.preset	483 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Presets/PixelArtTextureImporter.preset.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/GameplayScene.unity	1085 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/GameplayScene.unity.meta	diff \| view \| raw \| blame \| history
	Assets/Scenes/SampleScene.unity	352 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/ParallexEffect.cs	41 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/ParallexEffect.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/PlayerController.cs	70 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/PlayerController.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Settings/Renderer2D.asset	3 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/Faceset.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/Faceset.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/PlayerInputActions.inputactions	838 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/PlayerInputActions.inputactions.meta	14 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Attack.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Attack.png.meta	215 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Dead.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Dead.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Idle.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Idle.png.meta	215 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Item.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Item.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Jump.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Jump.png.meta	215 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Special1.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Special1.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Special2.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Special2.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Walk.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SeparateAnim/Walk.png.meta	479 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SpriteSheet.png	diff \| view \| raw \| blame \| history
	Assets/Sprites/GrayNinja/SpriteSheet.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG1.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG1.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG2.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG2.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG3.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/BG3.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Decors.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Decors.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/ExampleTiles.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/ExampleTiles.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Mockup2x.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Mockup2x.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Tileset.png	diff \| view \| raw \| blame \| history
	Assets/TileSets/FreeCuteTileset/Tileset.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Assets/UI.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/UI/Fonts.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/UI/Fonts/m5x7.ttf	diff \| view \| raw \| blame \| history
	Assets/UI/Fonts/m5x7.ttf.meta	21 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Unity_logo.png	diff \| view \| raw \| blame \| history
	Assets/Unity_logo.png.meta	127 ●●●●● diff \| view \| raw \| blame \| history
	Packages/manifest.json	2 ●●●●● diff \| view \| raw \| blame \| history
	Packages/packages-lock.json	18 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/EditorBuildSettings.asset	2 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/EditorSettings.asset	14 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/PresetManager.asset	10 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/ProjectSettings.asset	2 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/SceneTemplateSettings.json	121 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/TagManager.asset	3 ●●●●● diff \| view \| raw \| blame \| history
	UserSettings/Layouts/default-2022.dwlt	1175 ●●●●● diff \| view \| raw \| blame \| history
	UserSettings/Search.index	13 ●●●●● diff \| view \| raw \| blame \| history
	UserSettings/Search.settings	76 ●●●●● diff \| view \| raw \| blame \| history