Major_Project_A

Commit Graph

Author	SHA1	Message	Date
JoshuaReason	35bb46e571	Started Gamemode rework	5 years ago
Claire Peta	57d423d041	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	5 years ago
Joshua Reason	0285acbb43	updated prefabs	5 years ago
Joshua Reason	ebc2bcbfef	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a # Conflicts: # Assets/Third Party Assets/ProCore/ProGrids/About/Editor/pg_AboutWindow.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Constant.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Enum.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IconUtility.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IgnoreSnapAttribute.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Editor.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_GridRenderer.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ParameterWindow.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Preferences.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ToggleContent.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Hover.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Normal.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Divider.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Normal.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Pressed.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_Off.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_On.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Close.png.meta # Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Open.png.meta # Assets/Third Party Assets/ProCore/ProGrids/MonoBehaviour/pg_IgnoreSnap.cs.meta # Assets/Third Party Assets/ProCore/ProGrids/Shader/pg_GridShader.shader.meta	5 years ago
Joshua Reason	b73a3b3414	removed testing scenes. Multiplayer works but is not polished.	5 years ago
Claire Peta	ad79bb39cd	fixed material issues with trees and plants	5 years ago
Claire Peta	348a98d9d1	ProGrids	5 years ago
Joshua Reason	d34b21ffb8	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Joshua Reason	91215e8d33	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	5 years ago
Claire Peta	6c4336683d	Finshed all tutorial levels - just waiting on drag and drop implementation added progrids again fix floating collectables in chicken run levels	5 years ago
Claire Peta	84ef031f23	Changes during meeting @ rmit	5 years ago
JoshuaReason	38a64af971	Fixed lobby and client	5 years ago
Joshua Reason	173db575e0	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Joshua Reason	9209d5aef5	push from home	5 years ago
Claire Peta	219c7d3ed7	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	5 years ago
Joshua Reason	568f3bdfe2	Started on Lobby	5 years ago
Claire Peta	a9d54114bf	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	5 years ago
Claire Peta	f402f20c5a	Portal colour change working with testing script	5 years ago
Claire Peta	09313e934e	Tutorial Levels 1-5 complete with new assets, Updage UI bakcground images with new assets, change character walking animation	5 years ago
Claire Peta	d83771c314	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Claire Peta	72e6d4bdbb	Send/recieve moves from client and character move on server	5 years ago
JoshuaReason	bb15732a7d	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a into HEAD # Conflicts: # Assets/Scenes/Networking Test Scenes/ServerScene.unity	5 years ago
JoshuaReason	cdd05f686e	Added Kubikos world asset	5 years ago
Claire Peta	e99ec4db8b	Getting character instantiating	5 years ago
Joshua Reason	9eac5192b7	Can send list over network	5 years ago
Joshua Reason	4d88e32f90	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Joshua Reason	9e5e19a712	Logging in works	5 years ago
Claire Peta	aad3911d23	EOD Wednesday: Changed portal to start grey for item collection level, colours and particle effects turned on once someone has collected enough items	5 years ago
Claire Peta	a419adf398	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)	5 years ago
Claire Peta	efd3c6a1b8	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Claire Peta	c2f2a69b6d	Small decoration and start of scoreboard, end of day thursday	5 years ago
JoshuaReason	c0c654fb00	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	b65569860b	Started Server Code	5 years ago
Claire Peta	64d6867465	Added jump coroutine and little bounce in long jump and hgh jump	5 years ago
Claire Peta	4ad8ba23f7	Added character little bounce on move and rotate	5 years ago
JoshuaReason	2dbe16bb4d	Merge	5 years ago
JoshuaReason	e8706ef10f	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a # Conflicts: # Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta # Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta # Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta # Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta # Assets/Models.meta	5 years ago
JoshuaReason	2b73df6bdc	Updated to take animation time	5 years ago
Claire Peta	8d80f0bb32	Push all the meta files character lerp animation	5 years ago
Claire Peta	06b43e7f11	I think i accidentally deleted this idk :S	5 years ago
Claire Peta	c4e3b8d283	Added free unity asset pack and updated scenes	5 years ago
JoshuaReason	4880cb57f4	Level 1 works	5 years ago
Claire Peta	8120fee09e	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Claire Peta	b46be54c14	Update text components -Added difficulty button	5 years ago
JoshuaReason	b02e6c0cd2	fixed character + added inventories	5 years ago
JoshuaReason	0fed0cab02	fixed Color	5 years ago
JoshuaReason	d8169cd5bd	Made collectables work	5 years ago
Joshua Reason	90a7ac5688	Made logic tray be able to work in any level + efefcts character	5 years ago
Joshua Reason	5349c2720c	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Joshua Reason	8acdf3fbd8	Inventory mostly working + colors!	5 years ago

1 2 3 4 5

223 Commits (abd9926b8098cdd5d8e50d209d8ceb3942fabc25) All Branches Search

223 Commits (abd9926b8098cdd5d8e50d209d8ceb3942fabc25)

All Branches