Major_Project_A

Commit Graph

Author	SHA1	Message	Date
Joshua Reason	3afffa1575	-Updated water to new system + Jumping has a bounce effect	5 years ago
Joshua Reason	aa8b44bdee	Pushing works	5 years ago
JoshuaReason	c0ad428fa2	base push working but extremely buggy	5 years ago
ClairePeta	798a8d8d31	Client deaths moves them from screen. Lobby fix to display 8 names Icons in client scene Small Menu changes - remove tutorial scene	5 years ago
Claire Peta	09108d3a1f	Had the remove lives in the } instead of outside :S tested and confirmed changed the start prefab so i dont have to play like 20 rounds of the game until i can die, will change back after more testing	5 years ago
Joshua Reason	742d88cb89	Started working on push	5 years ago
ClairePeta	fbbdc46b5c	Two people cant choose the same animal, even if one is selected before another peson connects. Life is now lost/deducted once at the end of the round instead of one per move (causing multiple lifes lost if in the pit) when lives reach zero players die	5 years ago
JoshuaReason	c55b13be62	start working on Derived block for water.	5 years ago
JoshuaReason	d78130ec4d	Rotation is now cleaner	5 years ago
Joshua Reason	0e5b672e0a	worked on characters animation	5 years ago
ClairePeta	e03b0951cd	Player is 'dead' when lives reach zero, client scene stays in 'waiting for players' server doesnt wait for 'dead' players move list character for now dissappears	5 years ago
JoshuaReason	83288f76c0	Working on Character controller	5 years ago
SWIN\jreason	91bcfed8bd	Started working on more modular move	5 years ago
ClairePeta	8d81b73dee	Fixed the diagonal left and right block so character jumps diagonally	5 years ago
Joshua Reason	4eee92e17e	Started making htings more OO	5 years ago
ClairePeta	27ef03ad62	Separated the traps that need to be called after each turn and then after each round in the traps script Tested it in the racetrack scene it gets a list of all the objects at runtime so when the functions are called will trigger them one at a time. Also got the characters moving correctly with the conveyor belts and the shooting cannon.	5 years ago
Claire Peta	77315b21b4	last push from class	5 years ago
Claire Peta	b72f2d042c	Cannon, Water, Crystals and Conveyor all scripted and working with character animation Only tested in tutorial scene and hard coded the "Character" name, set up to get names or characters animals based on the connected clients list, but has yet to be tested	5 years ago
s3607057 (Angus Niven)	0f9d8df6bc	Implemented appropriate behaviour for having fallen into a hole: character loses their remaining moves for the round, respawns minus one life if they fell into a pit, or may jump out if they're in water. Changes to the FloatingOnWater prefab were necessary both to make the lose-your-remaining moves functions work (the block undernearth with the isWalkable and isWater flags), and to make it possible to fall into water on my build (shifting the box collider down by 1). If the latter causes issues on Claire's build, it can be reverted without affecting the rest of this commit, until we figure out how to make it work on all our machines.	5 years ago
ClairePeta	170c11a7e3	Cannon fixed and tested - need to limit the pushing of the character!	5 years ago
ClairePeta	3ed20990ef	Trap scripts finished - for now - starting testing and will adjust if needed. Changed the prefab for the cannon to instantiate the shooting object each time, and a bool to specify if it will push characters left or right, made it easier for figuring it out and calling the right coroutine added coroutines to character script	5 years ago
Claire Peta	2cfa6facba	Change 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	5 years ago
Claire Peta	3a7ba7d8b9	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	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
JoshuaReason	ddf1b5718f	added text when a character moves	5 years ago
JoshuaReason	481f43b867	Can pick to clone inventory on start	5 years ago
Claire Peta	63b1ef13ad	Change starting cube colour	5 years ago
Joshua Reason	b73a3b3414	removed testing scenes. Multiplayer works but is not polished.	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	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
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	72e6d4bdbb	Send/recieve moves from client and character move on server	5 years ago
Claire Peta	e99ec4db8b	Getting character instantiating	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	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
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	b02e6c0cd2	fixed character + added inventories	5 years ago
JoshuaReason	d8169cd5bd	Made collectables work	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	420c2d23e0	Started on Logic Trough UI	5 years ago
Claire Peta	3c599999e8	- Fix object collision for new block - Adjust jump onto stump - Link levels together	5 years ago
Claire Peta	5eccaa7245	- Created end portal effects - added character collision with portal and 'new blocks' (print to debug log for now) - added portal and new blocks to five tutorial scenes	5 years ago
Joshua Reason	c492889df0	-Edge detection -Created block class -Turned objects in scene to prefabs -Moved Character movement out of update -Added keyboard controll class -Added some Utility classes -Fixed some folders	5 years ago

48 Commits (6bfb58f4be14741b35a95e45aec1e149e31ef778)