Joshua Reason
|
c8af6003a0
|
messed with water
|
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
|
9 years ago |
Joshua Reason
|
cddb3f64a4
|
Fixed candy
Added Skybox
|
9 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.
|
9 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.
|
9 years ago |
Joshua Reason
|
fd41d1e870
|
fixed level2
fixed respawn
|
9 years ago |
Joshua Reason
|
6cf9cf39d0
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown
Conflicts:
playable/Assets/Scenes/Level1.unity
|
9 years ago |
Joshua Reason
|
a433c027bb
|
Added Menu
Added Dash bar
|
9 years ago |
Lachlan
|
f296d91add
|
new level, and other stuff. not much. was watching netflix all day, shits a massive timesink
|
9 years ago |
Joshua Reason
|
5c35060303
|
Fixed confetti
|
9 years ago |
Lachlan
|
d5d0727532
|
Added re-spawn timer (3s), object doesnt disappear while dead. Added mute button(F11/F12)
|
9 years ago |
Lachlan
|
17dc36e586
|
Added assets(weapons, BG(plzdontlookatmodelstoohard)), fire, tweaked dash a little
|
9 years ago |
Joshua Reason
|
42abbc50cb
|
Fixed being able to dash through walls.
Started to fix animations
|
9 years ago |
Joshua Reason
|
a4b6c31cbd
|
Added Dash input for P3 and P4
|
9 years ago |
Joshua Reason
|
5ef6b8a966
|
-Added dash attack
-Menu pause
|
9 years ago |
Joshua Reason
|
5d99fb56cf
|
-Spin Attack can only be used once in air
-colored trails and spotlights
|
9 years ago |
Joshua Reason
|
4cd88c6ea8
|
Added winning screen
|
9 years ago |
Joshua Reason
|
7509d63934
|
added menu:
-player choice amount
-confetti slider
-music
|
9 years ago |
Joshua Reason
|
1ec954b394
|
added player4
|
9 years ago |
Joshua Reason
|
11743d1552
|
Added scoring system
Added player 3
|
9 years ago |
Joshua Reason
|
0cc4e4b3fc
|
Merge remote-tracking branch 'origin/weapons'
Conflicts:
playable/Assets/Lachlan_jump_work.unity
|
9 years ago |
Joshua Reason
|
6c5056cd2e
|
Attempting to merge two weapon branch
|
9 years ago |
Joshua Reason
|
363a010527
|
Fixed issue with keyboard controls messing with joystick
|
9 years ago |
Lachlan
|
6d742d7ae4
|
Added weapons
|
9 years ago |
Joshua Reason
|
fcb83b6936
|
Added Xbox controller compatibility for player 1 and 2
|
9 years ago |
Joshua Reason
|
536df032a3
|
Player has millisecond of invulnerability after getting hit.
added rest time between attacks
|
9 years ago |
Joshua Reason
|
3476db4564
|
-Merged Player controllers into one tileable script.
-Added attacks.
-Spotlights now point at player instead of follow them
|
9 years ago |