228 Commits (650630995024c7e59e26aa96e64711fc0355a228)
 

Author SHA1 Message Date
  Joshua Reason 4eee92e17e Started making htings more OO 5 years ago
  Joshua Reason 8f6a4c49ba Cleaned up GameMode and GameManager 5 years ago
  JoshuaReason 86b613e888 Started to clean up GameManager + merged with Angus's changes 5 years ago
  JoshuaReason b22596c107 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  JoshuaReason 84e56fc57b fixed clinets still being blacked out on reconnection 5 years ago
  s3607057 (Angus Niven) 923c5dfdf4 Split the racetrack script off into its own asset. The change to Data/Networking/Server/Realtime doesn't seem to be showing up in Sourcetree for some reason, though. It should have New Racetrack Game Mode.asset as its Value. 5 years ago
  Claire Peta 612a714021 Change the colour of the background so ita actually legible 5 years ago
  Claire Peta 35798a69d2 Fix prefab + script issue for inground trap 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 5 years ago
  ClairePeta 92b845258f Checked with single player for the collision with traps. 5 years ago
  Claire Peta 77315b21b4 last push from class 5 years ago
  Claire Peta 8809d906e3 Added boulder coroutine to raise and fall 2.0f 5 years ago
  Claire Peta b72f2d042c Cannon, Water, Crystals and Conveyor all scripted and working with character animation 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
  s3607057 (Angus Niven) 507735a541 Trivial commit to enable pushing. 5 years ago
  s3607057 (Angus Niven) 97428e6bff Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  s3607057 (Angus Niven) d7f847d462 Adjusted the spawning script & moved spawn points in the racetrack level to get the desired spawning arrangements - the middle point will be used only with an odd number of players, and the spawn points to the side will be used first. 5 years ago
  ClairePeta 3ed20990ef Trap scripts finished - for now - starting testing and will adjust if needed. 5 years ago
  s3607057 (Angus Niven) f14e183010 Corrected the RaceTrack gamemode to link to the correct GameMode scene. 5 years ago
  s3607057 (Angus Niven) b99047df21 Added conveyor belt to racetrack. 5 years ago
  s3607057 (Angus Niven) f15728953a Revert "Hoping that pushing these inconsequential changes with immediate commit will get Sourcetree to actually do its job..." 5 years ago
  s3607057 (Angus Niven) 1427e76aae Hoping that pushing these inconsequential changes with immediate commit will get Sourcetree to actually do its job... 5 years ago
  s3607057 (Angus Niven) e5d12374c6 Pits & cannons added to racetrack. 5 years ago
  ClairePeta e5cf27b937 Work in Progress - Scripting up Traps 5 years ago
  Claire Peta dbc30f7eca Finalizing of model/prefabs for Traps 5 years ago
  ClairePeta 60e9ecff0f Animal colour hex fix 5 years ago
  JoshuaReason 28aaff87b6 Hot Fix: missing end of comment in GameMode 5 years ago
  JoshuaReason 8a6c5bbcb6 Started cleaning up Gamemode and GameManager 5 years ago
  JoshuaReason c0b73c47f1 Limited moves to four + added move*2 to starting blocks 5 years ago
  JoshuaReason c84e426e4b Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  JoshuaReason 446b37e9f5 Update to mass replace to filter to selection 5 years ago
  Joshua Reason ee04ebde5e Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  Joshua Reason e671902d0d Connected cLients are visible to all other clients + Login UI updates 5 years ago
  s3607057 (Angus Niven) f5295378f4 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  s3607057 (Angus Niven) 95b9d6c530 New four-player racetrack level, running from x = -15 to x = 15. 5 years ago
  Claire Peta 094ec36394 Meeting fixes for running once 5 years ago
  s3607057 (Angus Niven) 1a517e43e1 Updated racetrack level. 5 years ago
  s3607057 (Angus Niven) 3b30ed0f25 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  s3607057 (Angus Niven) 8942ea8d9b Started a fixed racetrack level with a starting pen, walls, water, and pits. 5 years ago
  ClairePeta 096edc62a8 Fixed old port issue 5 years ago
  Joshua Reason 2688a10ca9 Added unity scenes to LFS + cleaned up scene folder 5 years ago
  ClairePeta d7c8810087 Animal sprites didnt get pushed correctly 5 years ago
  Joshua Reason f6f6f8b0eb Updated readme for semester 2 5 years ago
  Claire Peta dac57cd66c 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 5 years ago
  Claire Peta 31364ee301 Re-Build with different sizing and video upload for Presentation video 5 years ago
  JoshuaReason 8b16e941a1 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a 5 years ago
  JoshuaReason 6a49087a02 Fixed some stuff + did a build 5 years ago
  Joshua Reason 46434ffbd1 apk2 5 years ago
  JoshuaReason a63b83e9ae Pushed scene settings for android 5 years ago