Commit Graph
-
dac57cd(HEAD -> master) Remove colour and added some more animals to allow for eight players, script set up to hard code a colour for each animal - colours not actually set up specifically yet by 2019-08-01 15:25:09 +1000 -
31364eeRe-Build with different sizing and video upload for Presentation video by 2019-06-01 16:00:04 +1000 -
8b16e94Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-30 17:38:22 +1000 -
6a49087Fixed some stuff + did a build by 2019-05-30 17:37:45 +1000 -
46434ffapk2 by 2019-05-30 16:54:07 +1000 -
a63b83ePushed scene settings for android by 2019-05-30 16:36:39 +1000 -
ab13483Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-30 16:32:18 +1000 -
05ef0caDid a build, don't know what changed by 2019-05-30 16:31:12 +1000 -
2cfa6faChange move text colour, Add how to for for-loop, add how to to access inventory, fix block spawning, fix fog sizing, add back button to lobby scene by 2019-05-30 16:21:37 +1000 -
5af247aZipped apk by 2019-05-30 15:07:03 +1000 -
f65993aBuild Added by 2019-05-30 14:56:08 +1000 -
ffa4619Have Score updating by 2019-05-30 13:59:40 +1000 -
32a975eFixed tutorial levels UI Fixed fog in tutorai levels by 2019-05-30 12:16:57 +1000 -
317836aFix alignment issues Tutorial scenes Complete Menu Client/Server Complete Add second how to video by 2019-05-29 22:06:38 +1000 -
07ad71bMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-28 22:39:14 +1000 -
ac7cfdefixed some assets by 2019-05-28 22:37:59 +1000 -
d89a37aGot 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 2019-05-28 22:37:46 +1000 -
db59122Change menu background EOD on Desktop by 2019-05-28 22:24:41 +1000 -
3a7ba7dLink 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 2019-05-28 16:54:17 +1000 -
1cc1c8fMAde for loops editable again by 2019-05-24 13:58:34 +1000 -
6df4a62EOD thursday class by 2019-05-23 18:15:16 +1000 -
bab4ddafixed Client time by 2019-05-23 17:42:28 +1000 -
e48e419fixed client inventory removing items + time is sent over by server by 2019-05-23 16:18:06 +1000 -
7ec0bfefixed max lengths of tray to account for for loops by 2019-05-23 15:16:21 +1000 -
a768a2fActually have for loops ui working now by 2019-05-23 13:11:13 +1000 -
1980455Semi working editable for loop by 2019-05-22 17:03:03 +1000 -
156dcc2Added global variables for settings limit plays to min of two and max of four remove player moves text from tutorial levels by 2019-05-21 12:18:33 +1000 -
d35aa05block spawn, change block to not walkable by 2019-05-19 19:37:25 +1000 -
6177a2dClient login cant continue without name, colour and animal selected/entered Game info display for five seconds before multiplayer game Created new combination blocks by 2019-05-18 20:58:07 +1000 -
ddf1b57added text when a character moves by 2019-05-16 17:27:57 +1000 -
cf76565TrayUI Removing fixed by 2019-05-16 16:25:26 +1000 -
d0a6e06Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-16 15:56:06 +1000 -
f546862Fixed logic tray max length + dropping things back into inventory duplication by 2019-05-16 15:53:14 +1000 -
aa2fa47pre-class changes by 2019-05-16 14:35:49 +1000 -
8e2f0f0background scene made, added image background to menus, server menu made, changed tutorial scenes by 2019-05-15 23:42:38 +1000 -
0e1cb55fonoshed Fixed tutorial pickup by 2019-05-09 18:42:08 +1000 -
70c5de5Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-09 18:22:42 +1000 -
e07200bstarted Fix tutorial level pickup by 2019-05-09 18:15:37 +1000 -
5ce9bf0i did a silly thing by 2019-05-09 18:11:47 +1000 -
140ae8di did more things by 2019-05-09 17:35:44 +1000 -
481f43bCan pick to clone inventory on start by 2019-05-09 17:02:51 +1000 -
a4c5badMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-09 16:53:20 +1000 -
97dce6dfixed Logic trough selection bug by 2019-05-09 16:52:33 +1000 -
48d116eI did things Fix tutorial levels, multiplayer info UI scence by 2019-05-09 16:14:16 +1000 -
dbf9e14Did some fixing for the inventory by 2019-05-09 14:43:46 +1000 -
3d85c4eAnimal and Colour selection from login menu (Base upload to now work on linked selection) by 2019-05-08 16:17:15 +1000 -
2495454Fixed fog issue in mobile build by 2019-05-06 22:34:27 +1000 -
267fdbafinal push pre-beta presentation by 2019-05-02 16:36:14 +1000 -
2897abeAdded spawn to collor collide two + temp fixed Jump by 2019-05-02 16:03:14 +1000 -
603fb14Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-02 15:53:20 +1000 -
a9a86b3Started working on equality for blocks fixed jump waiting by 2019-05-02 15:52:11 +1000 -
1798783adjust smaller demo scene, change lobby link to demo scene, remove names appearing when lobby scene loads by 2019-05-02 15:35:07 +1000 -
63b1ef1Change starting cube colour by 2019-05-02 14:58:34 +1000 -
1e438e5fixed scoreboard problem, linked score updated into scoreboard script, automatic load by 2019-05-02 13:48:51 +1000 -
ce9afb8Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-02 12:26:43 +1000 -
a566463Made players spawn in correct direction by 2019-05-02 12:26:26 +1000 -
c01e3faScoreboard scene and wip menu ui backgrounds by 2019-05-02 11:50:18 +1000 -
4f4f2c2Fixed 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 2019-05-01 12:55:26 +1000 -
b368c78Added leader score; Returned to lobby after disconnect Added round count by 2019-04-30 21:17:31 +1000 -
e9d51aa(Josh_Dev_branch) Clients wait for other Clients. Inventory is sent from server by 2019-04-29 16:47:44 +1000 -
8b1e2b3more work on gamemodes by 2019-04-28 21:16:07 +1000 -
35bb46eStarted Gamemode rework by 2019-04-26 16:34:34 +1000 -
57d423dmove 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 2019-04-25 18:29:36 +1000 -
0285acbupdated prefabs by 2019-04-25 13:42:07 +1000 -
ebc2bcbMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-25 13:37:37 +1000 -
b73a3b3removed testing scenes. Multiplayer works but is not polished. by 2019-04-25 13:36:21 +1000 -
ad79bb3fixed material issues with trees and plants by 2019-04-25 12:34:43 +1000 -
348a98dProGrids by 2019-04-25 12:02:23 +1000 -
d34b21fMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-24 00:15:18 +1000 -
91215e8Started 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 2019-04-24 00:14:56 +1000 -
6c43366Finshed all tutorial levels - just waiting on drag and drop implementation added progrids again fix floating collectables in chicken run levels by 2019-04-23 21:15:34 +1000 -
84ef031Changes during meeting @ rmit by 2019-04-22 20:15:14 +1000 -
38a64afFixed lobby and client by 2019-04-22 15:22:21 +1000 -
173db57Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-22 14:45:48 +1000 -
9209d5apush from home by 2019-04-22 14:45:06 +1000 -
219c7d3fixed 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 2019-04-21 16:31:01 +1000 -
568f3bdStarted on Lobby by 2019-04-21 10:32:38 +1000 -
a9d5411Remove 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 2019-04-17 17:36:02 +1000 -
f402f20Portal colour change working with testing script by 2019-04-14 22:53:06 +1000 -
09313e9Tutorial Levels 1-5 complete with new assets, Updage UI bakcground images with new assets, change character walking animation by 2019-04-12 18:35:09 +1000 -
d83771cMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-11 18:01:48 +1000 -
72e6d4bSend/recieve moves from client and character move on server by 2019-04-11 18:00:57 +1000 -
bb15732Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a into HEAD by 2019-04-11 17:06:11 +1000 -
cdd05f6Added Kubikos world asset by 2019-04-11 17:04:44 +1000 -
e99ec4dGetting character instantiating by 2019-04-11 16:45:43 +1000 -
9eac519Can send list over network by 2019-04-11 13:22:31 +1000 -
4d88e32Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-10 23:11:54 +1000 -
9e5e19aLogging in works by 2019-04-10 23:11:14 +1000 -
aad3911EOD Wednesday: Changed portal to start grey for item collection level, colours and particle effects turned on once someone has collected enough items by 2019-04-10 21:23:11 +1000 -
a419adfBrought 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 2019-04-09 22:06:35 +1000 -
efd3c6aMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-04 19:16:20 +1100 -
c2f2a69Small decoration and start of scoreboard, end of day thursday by 2019-04-04 19:15:23 +1100 -
c0c654fMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-04 19:08:24 +1100 -
b655698Started Server Code by 2019-04-04 19:07:51 +1100 -
64d6867Added jump coroutine and little bounce in long jump and hgh jump by 2019-04-04 18:21:07 +1100 -
4ad8ba2Added character little bounce on move and rotate by 2019-04-04 17:55:28 +1100 -
2dbe16bMerge by 2019-04-04 16:03:45 +1100 -
e8706efMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-04-04 16:02:00 +1100 -
2b73df6Updated to take animation time by 2019-04-04 16:00:37 +1100 -
8d80f0bPush all the meta files character lerp animation by 2019-04-04 15:55:46 +1100