RMIT
/
Major_Project_A
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity

Commit Graph

  • 32a975e Fixed tutorial levels UI Fixed fog in tutorai levels by JoshuaReason 2019-05-30 12:16:57 +1000
  • 317836a Fix alignment issues Tutorial scenes Complete Menu Client/Server Complete Add second how to video by Claire Peta 2019-05-29 22:06:38 +1000
  • 07ad71b Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-05-28 22:39:14 +1000
  • ac7cfde fixed some assets by Joshua Reason 2019-05-28 22:37:59 +1000
  • d89a37a Got combined blocks moving faster than single blocks so that animate in the same amount of time + fixed bug where players were waiting for other players to finish an action by Joshua Reason 2019-05-28 22:37:46 +1000
  • db59122 Change menu background EOD on Desktop by Claire Peta 2019-05-28 22:24:41 +1000
  • 3a7ba7d Link client to character, Add instructions for how to play with video slots, new simpler background design scene (need to finish and screenshot for bg image) Switching from laptop to desktop for bg scene by Claire Peta 2019-05-28 16:54:17 +1000
  • 1cc1c8f MAde for loops editable again by JoshuaReason 2019-05-24 13:58:34 +1000
  • 6df4a62 EOD thursday class by Claire Peta 2019-05-23 18:15:16 +1000
  • bab4dda fixed Client time by JoshuaReason 2019-05-23 17:42:28 +1000
  • e48e419 fixed client inventory removing items + time is sent over by server by JoshuaReason 2019-05-23 16:18:06 +1000
  • 7ec0bfe fixed max lengths of tray to account for for loops by JoshuaReason 2019-05-23 15:16:21 +1000
  • a768a2f Actually have for loops ui working now by Joshua Reason 2019-05-23 13:11:13 +1000
  • 1980455 Semi working editable for loop by SWIN\jreason 2019-05-22 17:03:03 +1000
  • 156dcc2 Added global variables for settings limit plays to min of two and max of four remove player moves text from tutorial levels by Claire Peta 2019-05-21 12:18:33 +1000
  • d35aa05 block spawn, change block to not walkable by Claire Peta 2019-05-19 19:37:25 +1000
  • 6177a2d Client login cant continue without name, colour and animal selected/entered Game info display for five seconds before multiplayer game Created new combination blocks by Claire Peta 2019-05-18 20:58:07 +1000
  • ddf1b57 added text when a character moves by JoshuaReason 2019-05-16 17:27:57 +1000
  • cf76565 TrayUI Removing fixed by JoshuaReason 2019-05-16 16:25:26 +1000
  • d0a6e06 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-05-16 15:56:06 +1000
  • f546862 Fixed logic tray max length + dropping things back into inventory duplication by JoshuaReason 2019-05-16 15:53:14 +1000
  • aa2fa47 pre-class changes by Claire Peta 2019-05-16 14:35:49 +1000
  • 8e2f0f0 background scene made, added image background to menus, server menu made, changed tutorial scenes by Claire Peta 2019-05-15 23:42:38 +1000
  • 0e1cb55 fonoshed Fixed tutorial pickup by JoshuaReason 2019-05-09 18:42:08 +1000
  • 70c5de5 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-05-09 18:22:42 +1000
  • e07200b started Fix tutorial level pickup by JoshuaReason 2019-05-09 18:15:37 +1000
  • 5ce9bf0 i did a silly thing by Claire Peta 2019-05-09 18:11:47 +1000
  • 140ae8d i did more things by Claire Peta 2019-05-09 17:35:44 +1000
  • 481f43b Can pick to clone inventory on start by JoshuaReason 2019-05-09 17:02:51 +1000
  • a4c5bad Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-05-09 16:53:20 +1000
  • 97dce6d fixed Logic trough selection bug by JoshuaReason 2019-05-09 16:52:33 +1000
  • 48d116e I did things Fix tutorial levels, multiplayer info UI scence by Claire Peta 2019-05-09 16:14:16 +1000
  • dbf9e14 Did some fixing for the inventory by JoshuaReason 2019-05-09 14:43:46 +1000
  • 3d85c4e Animal and Colour selection from login menu (Base upload to now work on linked selection) by Claire Peta 2019-05-08 16:17:15 +1000
  • 2495454 Fixed fog issue in mobile build by Claire Peta 2019-05-06 22:34:27 +1000
  • 267fdba final push pre-beta presentation by Claire Peta 2019-05-02 16:36:14 +1000
  • 2897abe Added spawn to collor collide two + temp fixed Jump by JoshuaReason 2019-05-02 16:03:14 +1000
  • 603fb14 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-05-02 15:53:20 +1000
  • a9a86b3 Started working on equality for blocks fixed jump waiting by JoshuaReason 2019-05-02 15:52:11 +1000
  • 1798783 adjust smaller demo scene, change lobby link to demo scene, remove names appearing when lobby scene loads by Claire Peta 2019-05-02 15:35:07 +1000
  • 63b1ef1 Change starting cube colour by Claire Peta 2019-05-02 14:58:34 +1000
  • 1e438e5 fixed scoreboard problem, linked score updated into scoreboard script, automatic load by Claire Peta 2019-05-02 13:48:51 +1000
  • ce9afb8 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-05-02 12:26:43 +1000
  • a566463 Made players spawn in correct direction by JoshuaReason 2019-05-02 12:26:26 +1000
  • c01e3fa Scoreboard scene and wip menu ui backgrounds by Claire Peta 2019-05-02 11:50:18 +1000
  • 4f4f2c2 Fixed UI sizing issue and plane background to ui image made new smaller level for colour collide demo presentation hard code four animals for players and changed the name shown in lobby so players know their animal and colour by Claire Peta 2019-05-01 12:55:26 +1000
  • b368c78 Added leader score; Returned to lobby after disconnect Added round count by Joshua Reason 2019-04-30 21:17:31 +1000
  • e9d51aa Clients wait for other Clients. Inventory is sent from server by SWIN\jreason 2019-04-29 16:47:44 +1000
  • 8b1e2b3 more work on gamemodes by Joshua Reason 2019-04-28 21:16:07 +1000
  • 35bb46e Started Gamemode rework by JoshuaReason 2019-04-26 16:34:34 +1000
  • 57d423d move code to game manager: change object texture and update player UI/collected vale created level scoreboard for amount of coloured gameobjects 10second timer, then loads the main scoreboard, ten second timer, then loads the new scene based on string given in inspector allow texture to load through script by Claire Peta 2019-04-25 18:29:36 +1000
  • 0285acb updated prefabs by Joshua Reason 2019-04-25 13:42:07 +1000
  • ebc2bcb Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-04-25 13:37:37 +1000
  • b73a3b3 removed testing scenes. Multiplayer works but is not polished. by Joshua Reason 2019-04-25 13:36:21 +1000
  • ad79bb3 fixed material issues with trees and plants by Claire Peta 2019-04-25 12:34:43 +1000
  • 348a98d ProGrids by Claire Peta 2019-04-25 12:02:23 +1000
  • d34b21f Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-04-24 00:15:18 +1000
  • 91215e8 Started work on multiplayer manager; Reworked logic functions so they find the next block Added scene for testing Added proGrids back Added Editor tool to move main camera to scene view Atl-Shit C by Joshua Reason 2019-04-24 00:14:56 +1000
  • 6c43366 Finshed all tutorial levels - just waiting on drag and drop implementation added progrids again fix floating collectables in chicken run levels by Claire Peta 2019-04-23 21:15:34 +1000
  • 84ef031 Changes during meeting @ rmit by Claire Peta 2019-04-22 20:15:14 +1000
  • 38a64af Fixed lobby and client by JoshuaReason 2019-04-22 15:22:21 +1000
  • 173db57 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-04-22 14:45:48 +1000
  • 9209d5a push from home by Joshua Reason 2019-04-22 14:45:06 +1000
  • 219c7d3 fixed collection object shadow and rotating colourcollide level blocks change colour on touch - need to put into character script, get material based on character colour by Claire Peta 2019-04-21 16:31:01 +1000
  • 568f3bd Started on Lobby by Joshua Reason 2019-04-21 10:32:38 +1000
  • a9d5411 Remove old free assets - Updated all scenes to new assets Changed main menu to name and colour options (script not applied yet) created new AI for multiplayer levels by Claire Peta 2019-04-17 17:36:02 +1000
  • f402f20 Portal colour change working with testing script by Claire Peta 2019-04-14 22:53:06 +1000
  • 09313e9 Tutorial Levels 1-5 complete with new assets, Updage UI bakcground images with new assets, change character walking animation by Claire Peta 2019-04-12 18:35:09 +1000
  • d83771c Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Claire Peta 2019-04-11 18:01:48 +1000
  • 72e6d4b Send/recieve moves from client and character move on server by Claire Peta 2019-04-11 18:00:57 +1000
  • bb15732 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a into HEAD by JoshuaReason 2019-04-11 17:06:11 +1000
  • cdd05f6 Added Kubikos world asset by JoshuaReason 2019-04-11 17:04:44 +1000
  • e99ec4d Getting character instantiating by Claire Peta 2019-04-11 16:45:43 +1000
  • 9eac519 Can send list over network by Joshua Reason 2019-04-11 13:22:31 +1000
  • 4d88e32 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-04-10 23:11:54 +1000
  • 9e5e19a Logging in works by Joshua Reason 2019-04-10 23:11:14 +1000
  • aad3911 EOD Wednesday: Changed portal to start grey for item collection level, colours and particle effects turned on once someone has collected enough items by Claire Peta 2019-04-10 21:23:11 +1000
  • a419adf Brought animal assets, Downloaded gem assets. Linked character animation (four legged), removed jump from move (walk animation instead), removed jump from rotate(jump animation instead) Created scoreboard(Collide level 2), made the portal colour changable (need works waiting on response from partner) by Claire Peta 2019-04-09 22:06:35 +1000
  • efd3c6a Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Claire Peta 2019-04-04 19:16:20 +1100
  • c2f2a69 Small decoration and start of scoreboard, end of day thursday by Claire Peta 2019-04-04 19:15:23 +1100
  • c0c654f Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-04-04 19:08:24 +1100
  • b655698 Started Server Code by JoshuaReason 2019-04-04 19:07:51 +1100
  • 64d6867 Added jump coroutine and little bounce in long jump and hgh jump by Claire Peta 2019-04-04 18:21:07 +1100
  • 4ad8ba2 Added character little bounce on move and rotate by Claire Peta 2019-04-04 17:55:28 +1100
  • 2dbe16b Merge by JoshuaReason 2019-04-04 16:03:45 +1100
  • e8706ef Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-04-04 16:02:00 +1100
  • 2b73df6 Updated to take animation time by JoshuaReason 2019-04-04 16:00:37 +1100
  • 8d80f0b Push all the meta files character lerp animation by Claire Peta 2019-04-04 15:55:46 +1100
  • 06b43e7 I think i accidentally deleted this idk :S by Claire Peta 2019-04-02 18:09:48 +1100
  • c4e3b8d Added free unity asset pack and updated scenes by Claire Peta 2019-04-02 17:44:19 +1100
  • 4880cb5 Level 1 works by JoshuaReason 2019-03-28 16:41:21 +1100
  • 8120fee Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Claire Peta 2019-03-28 16:33:45 +1100
  • b46be54 Update text components -Added difficulty button by Claire Peta 2019-03-28 16:32:51 +1100
  • b02e6c0 fixed character + added inventories by JoshuaReason 2019-03-28 16:32:15 +1100
  • 0fed0ca fixed Color by JoshuaReason 2019-03-28 16:25:47 +1100
  • d8169cd Made collectables work by JoshuaReason 2019-03-28 16:24:08 +1100
  • 90a7ac5 Made logic tray be able to work in any level + efefcts character by Joshua Reason 2019-03-28 13:27:05 +1100
  • 5349c27 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-03-27 23:38:21 +1100
  • 8acdf3f Inventory mostly working + colors! by Joshua Reason 2019-03-27 23:38:02 +1100
  • 31ad6be - Adjust camera position in 6 new scenes by Claire Peta 2019-03-27 12:40:20 +1100