Major_Project_A

Commit Graph

Author	SHA1	Message	Date
Claire Peta	6df4a62656	EOD thursday class	5 years ago
JoshuaReason	bab4dda14b	fixed Client time	5 years ago
JoshuaReason	e48e419c29	fixed client inventory removing items + time is sent over by server	5 years ago
JoshuaReason	7ec0bfeb4f	fixed max lengths of tray to account for for loops	5 years ago
Joshua Reason	a768a2f314	Actually have for loops ui working now	5 years ago
SWIN\jreason	1980455d86	Semi working editable for loop	5 years ago
Claire Peta	156dcc2235	Added global variables for settings limit plays to min of two and max of four remove player moves text from tutorial levels	5 years ago
Claire Peta	d35aa05de3	block spawn, change block to not walkable	5 years ago
Claire Peta	6177a2d071	Client login cant continue without name, colour and animal selected/entered Game info display for five seconds before multiplayer game Created new combination blocks	5 years ago
JoshuaReason	ddf1b5718f	added text when a character moves	5 years ago
JoshuaReason	cf76565e4d	TrayUI Removing fixed	5 years ago
JoshuaReason	d0a6e06016	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a # Conflicts: # Assets/Prefabs/UI/Player Canvas.prefab # Assets/Scenes/Client Scenes/ClientScene.unity	5 years ago
JoshuaReason	f5468621f3	Fixed logic tray max length + dropping things back into inventory duplication	5 years ago
Claire Peta	aa2fa478fc	pre-class changes	5 years ago
Claire Peta	8e2f0f0a40	background scene made, added image background to menus, server menu made, changed tutorial scenes	5 years ago
JoshuaReason	0e1cb55652	fonoshed Fixed tutorial pickup	5 years ago
JoshuaReason	70c5de5116	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	e07200b81a	started Fix tutorial level pickup	5 years ago
Claire Peta	5ce9bf0991	i did a silly thing	5 years ago
Claire Peta	140ae8df02	i did more things	5 years ago
JoshuaReason	481f43b867	Can pick to clone inventory on start	5 years ago
JoshuaReason	a4c5bad97d	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	97dce6d999	fixed Logic trough selection bug	5 years ago
Claire Peta	48d116ed18	I did things Fix tutorial levels, multiplayer info UI scence	5 years ago
JoshuaReason	dbf9e14b01	Did some fixing for the inventory	5 years ago
Claire Peta	3d85c4e4af	Animal and Colour selection from login menu (Base upload to now work on linked selection)	5 years ago
Claire Peta	24954548fb	Fixed fog issue in mobile build	5 years ago
Claire Peta	267fdba368	final push pre-beta presentation	5 years ago
JoshuaReason	2897abef90	Added spawn to collor collide two + temp fixed Jump	5 years ago
JoshuaReason	603fb14c13	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	a9a86b3252	Started working on equality for blocks fixed jump waiting	5 years ago
Claire Peta	1798783baf	adjust smaller demo scene, change lobby link to demo scene, remove names appearing when lobby scene loads	5 years ago
Claire Peta	63b1ef13ad	Change starting cube colour	5 years ago
Claire Peta	1e438e5225	fixed scoreboard problem, linked score updated into scoreboard script, automatic load	5 years ago
JoshuaReason	ce9afb8275	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	a566463e20	Made players spawn in correct direction	5 years ago
Claire Peta	c01e3fa0a8	Scoreboard scene and wip menu ui backgrounds	5 years ago
Claire Peta	4f4f2c28e3	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	5 years ago
Joshua Reason	b368c78f9e	Added leader score; Returned to lobby after disconnect Added round count	5 years ago
SWIN\jreason	e9d51aa805	Clients wait for other Clients. Inventory is sent from server	5 years ago
Joshua Reason	8b1e2b3d78	more work on gamemodes	5 years ago
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

1 2 3

114 Commits (6df4a626561fc4cd74515391c29aea63871aefd7) All Branches Search

114 Commits (6df4a626561fc4cd74515391c29aea63871aefd7)

All Branches