Pinata_Smackdown

Author	SHA1	Message	Date
Joshua Reason	7fc54a9a3b	Menu Controll with controller	9 years ago
Joshua Reason	6dbe3e2f8f	Added music to menu	9 years ago
unknown	e8a226ead2	Player Select Fix	9 years ago
unknown	b88faafee6	GUI 4 Player Select Updated	9 years ago
Joshua Reason	b8b8715f8b	fixed pause menu	9 years ago
Joshua Reason	88091e3942	added game Pause	9 years ago
unknown	2e57a386cf	Fixed title screen shader back to pink	9 years ago
unknown	834023d985	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown	9 years ago
unknown	3bdfe62013	Fixed Instructions Layout, added pause	9 years ago
Joshua Reason	42c3fe07e8	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Menu_Scene.unity	9 years ago
Joshua Reason	cf90d272bb	Fix bugs: added endscreen coloured hearts fix hearts removed explosion fix L1 hitboxes fixed falling off map fixed p3 dash L1 fixed dash bar p1 L1	9 years ago
unknown	a2dabc35f1	Added Instructions in GUI	9 years ago
Joshua Reason	f158859f17	added moving platform	9 years ago
unknown	e0945be384	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown	9 years ago
unknown	65c96b908d	Changed Title Color Scheme and Shader, fixed GUI Menu	9 years ago
Joshua Reason	c8c85dd883	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Level1.unity	9 years ago
Joshua Reason	c8af6003a0	messed with water	9 years ago
unknown	8662d77901	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown	9 years ago
unknown	d53cb55b13	hit boxes	9 years ago
unknown	36015317d6	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Objects/Countdown_1.fbx.meta playable/Assets/Objects/Countdown_2.fbx.meta playable/Assets/Objects/Countdown_3.fbx.meta playable/Assets/Objects/Countdown_4.fbx.meta playable/Assets/Objects/Countdown_5.fbx.meta	9 years ago
unknown	594e411aea	Remade Menu GUI with Background	9 years ago
Joshua Reason	64ce8cddf2	Fixed gui for level2	9 years ago
Joshua Reason	2fbb14bae0	Fixed: count down	9 years ago
unknown	052af64ea8	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Objects/Countdown_SmackDown.fbx.meta playable/Assets/Objects/Countdown_SmackDown_Frac.fbx.meta	9 years ago
unknown	b6c73d1f38	Added Count down explosion.	9 years ago
Joshua Reason	fcbac85f26	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown	9 years ago
Joshua Reason	5a517e7b9b	Fixed Level1 UI	9 years ago
unknown	d63976b2ba	playerid	9 years ago
Joshua Reason	7af3179085	Added SmackDown text + frac	9 years ago
Joshua Reason	f11a197776	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown	9 years ago
Joshua Reason	c6b66dbd35	Fixed Gui	9 years ago
unknown	c55e801bc4	level 1 fix	9 years ago
Joshua Reason	51622ffb2d	linked score gui to pinata	9 years ago
Joshua Reason	5e42de7fd3	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Objects/Countdown_1.fbx.meta playable/Assets/Objects/Countdown_2.fbx.meta playable/Assets/Objects/Countdown_3.fbx.meta playable/Assets/Objects/Countdown_4.fbx.meta playable/Assets/Objects/Countdown_5.fbx.meta	9 years ago
Joshua Reason	a7b1999099	Updated Level1 Gui	9 years ago
unknown	28fa06a3b3	Flame colours, countdown timer	9 years ago
Joshua Reason	25a3461e45	added number objects	9 years ago
unknown	7d30511031	Levels 1 and 2. count down on both. fire on 2	9 years ago
unknown	4edadde355	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Level1.unity playable/Assets/Scenes/Level2.unity playable/ProjectSettings/TagManager.asset	9 years ago
unknown	fab709a000	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Level1.unity playable/Assets/Scenes/Level2.unity playable/Assets/Scripts/playerController.cs	9 years ago
Joshua Reason	27c5aceffc	Added color, player tags, player tag script from Lachlan USB	9 years ago
Lachlan	98c76d8967	Character colours, player number overhead(shit doesn't work, like the 1 key mute) , spin blocks dash is still fucked	9 years ago
Joshua Reason	e5d26feb48	Fixed button input for player 3 and 4 (inputs mapped to wrong button)	9 years ago
Joshua Reason	f39f111922	Added player explosion, fixed being able to fix candy by dashing through player removed random files I accidentally saved in the music folder	9 years ago
Joshua Reason	a825d5d408	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Level1.unity playable/Assets/Scripts/playerController.cs	10 years ago
Joshua Reason	cddb3f64a4	Fixed candy Added Skybox	10 years ago
Lachlan	acd871f078	Fixed hit boxes. Invul timer now .2s - they don't get double hit by spin and don't go through platforms when hit.	10 years ago
Lachlan	f3a6df06b0	Death timer working (black hearts). Time for weeds and some almost expired beef schnitzel, it was real cheap but expired today.	10 years ago
Joshua Reason	fd41d1e870	fixed level2 fixed respawn	10 years ago
Joshua Reason	6cf9cf39d0	Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown Conflicts: playable/Assets/Scenes/Level1.unity	10 years ago

1 2

77 Commits (master) All Branches Search

77 Commits (master)

All Branches