Commit Graph

  • 63727c7 (FINAL_BUILD) Added sfx files to assets by Joshua Reason 2015-06-02 15:44:04 +1000
  • 448a9d7 Actually FINAL BUILD by Joshua Reason 2015-06-01 08:19:43 +1000
  • e13b9aa Final Build by Joshua Reason 2015-06-01 08:15:00 +1000
  • 7fc54a9 (HEAD -> master) Menu Controll with controller by Joshua Reason 2015-06-01 08:00:40 +1000
  • 6dbe3e2 Added music to menu by Joshua Reason 2015-06-01 07:36:44 +1000
  • e8a226e Player Select Fix by unknown 2015-06-01 07:23:37 +1000
  • b88faaf GUI 4 Player Select Updated by unknown 2015-06-01 07:17:33 +1000
  • b8b8715 fixed pause menu by Joshua Reason 2015-06-01 06:55:02 +1000
  • 88091e3 added game Pause by Joshua Reason 2015-06-01 06:44:30 +1000
  • 2e57a38 Fixed title screen shader back to pink by unknown 2015-06-01 05:43:03 +1000
  • 834023d Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-06-01 05:34:49 +1000
  • 3bdfe62 Fixed Instructions Layout, added pause by unknown 2015-06-01 05:33:09 +1000
  • 42c3fe0 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-06-01 05:11:48 +1000
  • cf90d27 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 by Joshua Reason 2015-06-01 05:10:50 +1000
  • a2dabc3 Added Instructions in GUI by unknown 2015-06-01 05:08:05 +1000
  • f158859 added moving platform by Joshua Reason 2015-06-01 02:07:01 +1000
  • e0945be Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-06-01 01:39:46 +1000
  • 65c96b9 Changed Title Color Scheme and Shader, fixed GUI Menu by unknown 2015-06-01 01:39:07 +1000
  • c8c85dd Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-06-01 01:23:14 +1000
  • c8af600 messed with water by Joshua Reason 2015-06-01 01:22:19 +1000
  • 8662d77 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-06-01 01:20:55 +1000
  • d53cb55 hit boxes by unknown 2015-06-01 01:20:18 +1000
  • 3601531 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-06-01 01:07:50 +1000
  • 594e411 Remade Menu GUI with Background by unknown 2015-06-01 01:05:38 +1000
  • 64ce8cd Fixed gui for level2 by Joshua Reason 2015-06-01 00:27:51 +1000
  • 2fbb14b Fixed: count down by Joshua Reason 2015-05-31 23:37:10 +1000
  • 052af64 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-05-31 23:08:25 +1000
  • b6c73d1 Added Count down explosion. by unknown 2015-05-31 23:07:06 +1000
  • fcbac85 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-05-31 22:45:06 +1000
  • 5a517e7 Fixed Level1 UI by Joshua Reason 2015-05-31 22:44:38 +1000
  • d63976b playerid by unknown 2015-05-31 21:37:31 +1000
  • 7af3179 Added SmackDown text + frac by Joshua Reason 2015-05-31 21:23:13 +1000
  • f11a197 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-05-31 21:00:33 +1000
  • c6b66db Fixed Gui by Joshua Reason 2015-05-31 20:58:28 +1000
  • c55e801 level 1 fix by unknown 2015-05-31 20:39:38 +1000
  • 51622ff linked score gui to pinata by Joshua Reason 2015-05-31 19:17:54 +1000
  • 5e42de7 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-05-31 19:14:48 +1000
  • a7b1999 Updated Level1 Gui by Joshua Reason 2015-05-31 19:13:27 +1000
  • 28fa06a Flame colours, countdown timer by unknown 2015-05-31 19:11:40 +1000
  • 25a3461 added number objects by Joshua Reason 2015-05-31 17:58:59 +1000
  • 7d30511 Levels 1 and 2. count down on both. fire on 2 by unknown 2015-05-31 17:57:33 +1000
  • 4edadde Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-05-31 17:41:21 +1000
  • fab709a Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by unknown 2015-05-31 17:36:55 +1000
  • 27c5ace Added color, player tags, player tag script from Lachlan USB by Joshua Reason 2015-05-31 17:26:36 +1000
  • 98c76d8 Character colours, player number overhead(shit doesn't work, like the 1 key mute) , spin blocks dash is still fucked by Lachlan 2015-05-30 19:05:19 +1000
  • e5d26fe Fixed button input for player 3 and 4 (inputs mapped to wrong button) by Joshua Reason 2015-05-30 16:57:07 +1000
  • f39f111 Added player explosion, fixed being able to fix candy by dashing through player removed random files I accidentally saved in the music folder by Joshua Reason 2015-05-30 16:54:37 +1000
  • a825d5d Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-05-28 12:42:44 +1000
  • cddb3f6 Fixed candy Added Skybox by Joshua Reason 2015-05-28 12:37:18 +1000
  • acd871f Fixed hit boxes. Invul timer now .2s - they don't get double hit by spin and don't go through platforms when hit. by Lachlan 2015-05-27 19:04:17 +1000
  • f3a6df0 Death timer working (black hearts). Time for weeds and some almost expired beef schnitzel, it was real cheap but expired today. by Lachlan 2015-05-27 18:56:12 +1000
  • fd41d1e fixed level2 fixed respawn by Joshua Reason 2015-05-27 10:06:42 +1000
  • 6cf9cf3 Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown by Joshua Reason 2015-05-27 08:54:04 +1000
  • a433c02 Added Menu Added Dash bar by Joshua Reason 2015-05-27 08:47:12 +1000
  • f296d91 new level, and other stuff. not much. was watching netflix all day, shits a massive timesink by Lachlan 2015-05-26 19:03:22 +1000
  • 5c35060 Fixed confetti by Joshua Reason 2015-05-20 11:18:53 +1000
  • d5d0727 Added re-spawn timer (3s), object doesnt disappear while dead. Added mute button(F11/F12) by Lachlan 2015-05-17 01:51:44 +1000
  • 17dc36e Added assets(weapons, BG(plzdontlookatmodelstoohard)), fire, tweaked dash a little by Lachlan 2015-05-16 21:50:28 +1000
  • 42abbc5 Fixed being able to dash through walls. Started to fix animations by Joshua Reason 2015-05-15 11:40:08 +1000
  • a4b6c31 Added Dash input for P3 and P4 by Joshua Reason 2015-05-14 09:31:14 +1000
  • 5ef6b8a -Added dash attack -Menu pause by Joshua Reason 2015-05-14 09:28:33 +1000
  • 5d99fb5 -Spin Attack can only be used once in air -colored trails and spotlights by Joshua Reason 2015-05-13 09:11:30 +1000
  • d58f4d3 (Submit_prototype) Prototype by Lachlan 2015-05-10 17:57:13 +1000
  • 5f8300a (weapons) added katana by Lachlan 2015-05-07 19:01:30 +1000
  • 4cd88c6 Added winning screen by Joshua Reason 2015-05-06 07:20:56 +1000
  • 7509d63 added menu: -player choice amount -confetti slider -music by Joshua Reason 2015-05-06 01:45:15 +1000
  • 1ec954b added player4 by Joshua Reason 2015-05-05 23:53:53 +1000
  • 11743d1 Added scoring system Added player 3 by Joshua Reason 2015-05-05 23:42:27 +1000
  • 0cc4e4b Merge remote-tracking branch 'origin/weapons' by Joshua Reason 2015-05-05 22:08:08 +1000
  • 6c5056c Attempting to merge two weapon branch by Joshua Reason 2015-05-05 22:03:03 +1000
  • 363a010 Fixed issue with keyboard controls messing with joystick by Joshua Reason 2015-05-05 21:31:57 +1000
  • 6d742d7 Added weapons by Lachlan 2015-05-05 20:56:20 +1000
  • fcb83b6 Added Xbox controller compatibility for player 1 and 2 by Joshua Reason 2015-05-05 19:36:49 +1000
  • 536df03 Player has millisecond of invulnerability after getting hit. added rest time between attacks by Joshua Reason 2015-05-05 19:00:46 +1000
  • 3476db4 -Merged Player controllers into one tileable script. -Added attacks. -Spotlights now point at player instead of follow them by Joshua Reason 2015-05-05 18:10:44 +1000
  • 918efe6 added confetti on hit + respawn by Joshua Reason 2015-05-04 12:00:28 +1000
  • 2803b75 Added Health bar + landing on player will remove heart by Joshua Reason 2015-05-04 10:22:26 +1000
  • 8c7fcc6 Added in Pinata models, added animations. Animator still needs a bit of work. Updated player scripts to affect animations by Joshua Reason 2015-05-04 00:49:55 +1000
  • 8baa600 sorta works by Lachlan 2015-05-01 18:19:00 +1000
  • f24f5af I'm not too sure how this works. by Lachlan 2015-05-01 18:18:08 +1000
  • f1f9036 Initial Unity Project File by AlexRubio 2015-04-15 10:34:27 +1000
  • 26e9c8b Added gitignore by Joshua Reason 2015-04-15 10:20:54 +1000