Commit Graph

  • 492d895 (HEAD -> master) Made new, smaller starting areas to promote collisions and jostling at the start of the game. (The original starting areas are still there, just no longer used.) Tweaked the cannon script so that they fire as soon as the countdown hits 0, rather than on the subsequent turn. Added traps & terrain features to the snaking map sections to make them more interesting. Added item spawns to the bigger snaking section. by s3607057 (Angus Niven) 2019-11-08 01:08:41 +1100
  • abd6027 Rewrote the jumping logic to avoid infinite loops when jumping onto a character in front of a wall - characters will now jump back to the first open square available. by s3607057 (Angus Niven) 2019-11-06 19:51:20 +1100
  • 38d8786 Fixed the conveyor belt issue that was causing map errors. by s3607057 (Angus Niven) 2019-11-03 02:00:52 +1100
  • 377c5d4 Corrected a spawn location in the seven-player lineup. by s3607057 (Angus Niven) 2019-11-02 22:05:59 +1100
  • d97f9b4 And a few more that I just realised should be there. by s3607057 (Angus Niven) 2019-11-02 20:16:02 +1100
  • 4d8da3b Restored debug statements to MapManager.cs. by s3607057 (Angus Niven) 2019-11-02 20:12:41 +1100
  • e827f23 Dummy commit to trick SourceTree into letting me push... by s3607057 (Angus Niven) 2019-11-02 20:00:17 +1100
  • 6699c42 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by s3607057 (Angus Niven) 2019-11-02 19:58:31 +1100
  • f8ec899 Fixed issue where players could respawn floating in the air after falling off the track, if the spot they fell from was near the respawn location. by s3607057 (Angus Niven) 2019-11-02 19:56:59 +1100
  • ac31864 Fix the order stuff that my fix for the block issue messed up a little by ClairePeta 2019-11-02 12:45:22 +1100
  • 9ab1d1d Fixed a few errors in track prefabs. by s3607057 (Angus Niven) 2019-11-01 23:39:20 +1100
  • fb9b352 Small changes i had here and ones i made to try and fix an error by ClairePeta 2019-11-01 18:49:46 +1100
  • 937cdbb Increase to 8 players for server build by Claire Peta 2019-10-22 16:04:05 +1100
  • 174888b Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-18 23:23:11 +1100
  • ae12fa3 fixed rotate converoy belt section by Joshua Reason 2019-10-18 23:22:56 +1100
  • 5f09ba2 Small fix to hopefully fix a bug where people respawn on the same block. by s3607057 (Angus Niven) 2019-10-18 23:00:58 +1100
  • 53cb01b Fixed up the 8-player spawn, added a map section that was mistakenly left off the roster. by s3607057 (Angus Niven) 2019-10-18 22:29:25 +1100
  • 35f4b9d Fix characters dying and order based on x at start of game by ClairePeta 2019-10-18 19:42:05 +1100
  • 914ad9d updated webgl build in Project by Joshua Reason 2019-10-18 18:47:19 +1100
  • 58ab77d Fixed a missing entry on the Width 5 map section list. by s3607057 (Angus Niven) 2019-10-18 17:09:53 +1100
  • b21ed90 Added music, Added remaining icons, Edited the icon for the game to rounded corners, Code and debug cleaning, Done client and server build pushed to teams by ClairePeta 2019-10-18 14:27:22 +1100
  • fbb4da7 Fixed map generation bug in build by Joshua Reason 2019-10-18 13:49:56 +1100
  • 4604ae7 removed missile from start inventory by Joshua Reason 2019-10-17 22:31:50 +1100
  • a59a33c did some bug fixes by Joshua Reason 2019-10-17 22:21:46 +1100
  • 7e1f85b Did some webGL fixes + port stuff by Joshua Reason 2019-10-17 21:43:47 +1100
  • d09abf7 Fix lives lost, and small code cleaning by Claire Peta 2019-10-17 19:23:35 +1100
  • 77f1c8d Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-10-17 18:57:16 +1100
  • 55cadb7 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-10-17 18:55:44 +1100
  • d495887 Changed respawn function so that you will always respawn at ground level, after some weirdness with respawning on top of crystals. by s3607057 (Angus Niven) 2019-10-17 18:55:01 +1100
  • 100e4f1 Messing around with HTML by JoshuaReason 2019-10-17 18:54:20 +1100
  • db19ee9 Made the cannons able to start at different points in their countdowns. Made falling off things cost lives (player is currently notified a turn late). by s3607057 (Angus Niven) 2019-10-17 18:36:56 +1100
  • 7268595 Chicken Wing by Claire Peta 2019-10-17 18:24:40 +1100
  • 7dca2b4 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by s3607057 (Angus Niven) 2019-10-17 17:57:12 +1100
  • c3cd229 Fixed problems with falling of the far side of the track, made the pit trap logic the same as the falling-off-the-side logic, removed some sub-par link sections that were clogging up the lists of possibilities. by s3607057 (Angus Niven) 2019-10-17 17:56:57 +1100
  • 3cfd98a Fix the cow, Fix the spawn stuff by Claire Peta 2019-10-17 17:16:44 +1100
  • 2386dda Fixed shot if client doesn't have resource by JoshuaReason 2019-10-17 16:59:19 +1100
  • 2213a1c Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by s3607057 (Angus Niven) 2019-10-17 15:50:27 +1100
  • ecb0fe6 Fixed conveyor belt going the wrong way in Backbelt 5-1 (and added a variant with a slightly different pit arrangement).Added a couple of extra link sections. by s3607057 (Angus Niven) 2019-10-17 15:49:24 +1100
  • 14fc595 Maybe fixed double move respawn by JoshuaReason 2019-10-17 15:38:27 +1100
  • 895f008 Update server menu settings by Claire Peta 2019-10-17 14:45:24 +1100
  • ed6c1de Update how to play section for client main menu by Claire Peta 2019-10-17 14:36:30 +1100
  • 07d2879 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Claire Peta 2019-10-17 14:23:48 +1100
  • 866c8e2 Fix conveyorbelt issue by Claire Peta 2019-10-17 14:15:42 +1100
  • ed38181 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-17 13:27:51 +1100
  • 121eed4 Updated hook + WebGL by Joshua Reason 2019-10-17 13:23:58 +1100
  • e08ae38 Fixed respawning-related issues (I hope). Players should now respawn only on open squares and never on traps. by s3607057 (Angus Niven) 2019-10-17 00:01:01 +1100
  • 3e7480f Added replace block + updated webgl build by Joshua Reason 2019-10-16 23:23:51 +1100
  • d6fd662 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-16 20:06:21 +1100
  • d3720b4 Did some bug fixing. Water pushes character off if someone ends up ontop by Joshua Reason 2019-10-16 20:03:37 +1100
  • aad9206 Have to head home, psu hof small changes i made while play testing for bugs and whatnot (forgot to stage all on previous push) by Claire Peta 2019-10-16 16:29:12 +1100
  • 96fcac2 Have to head home, psu hof small changes i made while play testing for bugs and whatnot by Claire Peta 2019-10-16 16:27:29 +1100
  • 5e29d62 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-15 23:12:54 +1100
  • 506cfb8 Falling works + fixed cannon prefab by Joshua Reason 2019-10-15 23:12:37 +1100
  • 3f25529 Added sprites to resources for client side so icons load for logic blocks, Turned on the video for the client main menu, fixed error with cannon missing link for text by ClairePeta 2019-10-15 21:24:07 +1100
  • de9fa19 Added winner scene, Added the how to play back into the client menu, Fixed the block spawning issue (ran about 10 rounds with no errors), Added another counter for the cannon so it shows both sides, Removed some Debugs, Made the fog not static, Players can sucessfully disconnect from the game - their character is also removed and the server doesnt wait for their input by ClairePeta 2019-10-12 10:57:23 +1100
  • 2c9f01a Applied new respawn logic to falling off the map as well. by s3607057 (Angus Niven) 2019-10-10 13:07:07 +1100
  • 24cb251 fixed some merge errors by Joshua Reason 2019-10-10 11:02:16 +1100
  • 521921d Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-10 10:41:49 +1100
  • 3e1b9c6 Webgl works alongside android + included in project by Joshua Reason 2019-10-10 10:40:32 +1100
  • c1309d9 Implemented new respawn logic: respawn location is the average loccation of players left on map, if any, or otherwise is the centre of the screen. Players will respawn in random open & unoccupied squares near this (within a radius of 1 if possible, widening the radius if there aren't enough open squares in that area). by s3607057 (Angus Niven) 2019-10-10 03:01:18 +1100
  • 0208a6d Billboard the player order on the backs of each character, Added a overlay/shadow to the lobby names to make theme easier to read, Added a coloured background and animal sprite to the client background so players remember who they are by ClairePeta 2019-10-09 20:43:08 +1100
  • 88cb075 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-08 10:33:16 +1100
  • e80bfaf Got webGL build working, some bugs still by Joshua Reason 2019-10-08 10:33:00 +1100
  • 6861601 Rotated the turntable conveyor block to make the picture clearer. Moved the snaking levels into the width-3 section, and added them to the list of potential sections. Added a width-5 snaking section (still slightly WIP, want to add hazards & obstacles to spice things up). by s3607057 (Angus Niven) 2019-10-03 17:08:56 +1000
  • 941f5df Tested code that works for block spawning also commented out some debug.log stuff by Claire Peta 2019-10-03 16:20:01 +1000
  • b3b8469 fixed gizmos breaking things on play by JoshuaReason 2019-10-03 15:47:09 +1000
  • 502e6df Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-10-03 15:37:32 +1000
  • 74bfd13 Block gizmos visible in Prefab view by JoshuaReason 2019-10-03 15:37:05 +1000
  • 3a3270e Uncomment stuff for collectable spawning testing + icon by Claire Peta 2019-10-03 15:21:41 +1000
  • 5b31d42 Fixed wrong bool ticked on one of the map sections. by s3607057 (Angus Niven) 2019-10-03 15:19:57 +1000
  • b618124 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-10-03 14:50:42 +1000
  • eab76a8 fixed hookshot serialization + added isvisible function by JoshuaReason 2019-10-03 14:50:08 +1000
  • c7dc3a5 Added item spawn locations to all existing map section prefabs. Also pushed a second snaking map section. by s3607057 (Angus Niven) 2019-10-03 14:49:13 +1000
  • 5d9a6ca Fixed the character script after merge :) by Claire Peta 2019-10-03 14:02:48 +1000
  • 6564026 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-03 13:55:58 +1000
  • 365b660 Update to the block spawning script, added the call line to where the new map section is added to update the spawning positions(commented out for now) also started looking into handling a client disconnecting and removing them from the client list to avoid errors by Claire Peta 2019-10-03 13:30:19 +1000
  • 07946d3 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by Joshua Reason 2019-10-03 12:16:11 +1000
  • 186a1dd Fixed cannon so we aren't waiting for it. Started to add hook shot. by Joshua Reason 2019-10-03 12:14:04 +1000
  • 764cb2c Block spawning update by ClairePeta 2019-10-02 15:27:55 +1000
  • a360fe8 Fixed the cannon and converyor belt traps, and set up Block to mark some as spawnable locations - please noone touch the blockspawn script - im still working on it by ClairePeta 2019-09-29 16:26:32 +1000
  • 6f594d0 Hopefully fixed issue with the missing spawn block in the 4-player pen. by s3607057 (Angus Niven) 2019-09-28 16:51:21 +1000
  • 25610a9 Removed some link sections from the roster (the 7-widths and the ones that had water/pits next to the edge, because those looked weird). by s3607057 (Angus Niven) 2019-09-26 16:06:16 +1000
  • 3432f74 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by s3607057 (Angus Niven) 2019-09-26 15:56:31 +1000
  • 16eb8a0 Another 4-player spawn revision. by s3607057 (Angus Niven) 2019-09-26 15:55:33 +1000
  • 1105ee3 Fix max players to 8 Fix crystal and boulder prefab and loss of life by Claire Peta 2019-09-26 15:54:05 +1000
  • 19d90e3 Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-09-26 15:36:23 +1000
  • 79f0289 fixed dying on a half turn, removed old half turns by JoshuaReason 2019-09-26 15:35:40 +1000
  • 014d93b Revised the four-player spawn prefab to fix an imbalance we noticed while testing. by s3607057 (Angus Niven) 2019-09-26 15:28:43 +1000
  • 76374fc And removed the spammy debug statements that are no longer needed. by s3607057 (Angus Niven) 2019-09-26 15:15:00 +1000
  • 1cb4324 Camera will now track the average position of all players on the track, and catch up to the leading player if they are off the screen. by s3607057 (Angus Niven) 2019-09-26 15:12:22 +1000
  • 9e5e2fb Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-09-26 14:34:40 +1000
  • bec7885 Pushing logic block changes from last week by JoshuaReason 2019-09-26 14:31:43 +1000
  • 47b91aa Added ability for player one to start game by Joshua Reason 2019-09-26 12:13:41 +1000
  • 6506309 Fixed character play order, checked max players (it was already 8?!?), fixed timing on the boulder and crystals - less inbetween wait time = less time between rounds by ClairePeta 2019-09-25 20:48:20 +1000
  • 50ac156 Forgot to push lafter class last night by Claire Peta 2019-09-20 12:36:14 +1000
  • 2a0c9f8 Added a new map section as an example of what I was talking about this evening. by s3607057 (Angus Niven) 2019-09-19 23:13:08 +1000
  • 51a1960 Yet another fix to misaligned pits. by s3607057 (Angus Niven) 2019-09-19 16:24:36 +1000
  • 2fe1a12 Fixed another prefab section with misaligned pits. by s3607057 (Angus Niven) 2019-09-19 16:02:29 +1000
  • abd9926 Fixed bug that was misplacing the spawning area due to startX being changed between games in MapManager.asset. by s3607057 (Angus Niven) 2019-09-19 15:50:09 +1000
  • 571822a Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by JoshuaReason 2019-09-19 15:36:16 +1000