Major_Project_A

Commit Graph

Author	SHA1	Message	Date
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
Claire Peta	31ad6bef1c	- Adjust camera position in 6 new scenes	5 years ago
Claire Peta	6aa5aa5c0a	- More multiplayer levels - Game name change	5 years ago
Claire Peta	f3cf6cb74d	- Create simple Main Menu with setting options, tutorial option or multi player option - Create pop up messages at start of each tutorial level and when collecting a new block - New level designs for the multiplayer games -	5 years ago
Joshua Reason	64be9103e8	More UI work	5 years ago
Joshua Reason	420c2d23e0	Started on Logic Trough UI	5 years ago
Claire Peta	174d50aaf6	- not sure what i did, end of thursday class commit :)	5 years ago
JoshuaReason	cd9c83aa29	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
JoshuaReason	a228060237	Character moves automatically	5 years ago
Claire Peta	593fdc2e5b	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago
Claire Peta	09a6e3d348	- Simple UI for start of scene one and block collection (in scene one) - New Menu Scene for start of game	5 years ago
JoshuaReason	6320a8cbe8	-For Loop -Jump Block -Pro tools	5 years ago
JoshuaReason	95692e403b	Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a	5 years ago

... 2 3 4 5 6

261 Commits (3e1b9c674e081b5f0ada0fbe9b1e11f23bb25ead) All Branches Search

261 Commits (3e1b9c674e081b5f0ada0fbe9b1e11f23bb25ead)

All Branches