Commit Graph
-
775e8b9Fixed Diagonal + added Wait by 2019-09-19 15:32:34 +1000 -
c535a24Changed a few prefab sections & fixed some misalignments. by 2019-09-19 15:30:33 +1000 -
b67bcdeLowered difficulty mins on some of our level sections so they'll show up earlier. Made difficulty scale up faster with track length. Fixed a misalignment of the in-ground trap components. by 2019-09-19 14:51:44 +1000 -
58eed26Fixed an accidental misalignment between the 4-player spawning pen and the track. by 2019-09-19 14:33:19 +1000 -
1b97696Added turntable conveyer belts with appropriate icons. by 2019-09-19 14:22:15 +1000 -
32af52cFixed 4-player spawn to account for double-moves, changed MapManager to prevent more than one link section spawning in a row. by 2019-09-19 14:08:39 +1000 -
e3fc896Cleaning up MapManager slightly. by 2019-09-18 22:16:02 +1000 -
98e81ecMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-09-18 22:05:39 +1000 -
be9a258Added a bunch of longer map sections. Added a simple weighting system for map sections (set for each section in the inspector), so that the proper map sections don't get drowned out by all the varieties of length-1 link sections. Removed the pit and conveyer belts from the 4-player spawn, so that we can use it for a demo. by 2019-09-18 21:20:42 +1000 -
e522277Toggled a whole bunch of debug.Logs because they were killing me and slowing the loading time for the game. Got blocks spawning based on the players locations Removed duplicate logic blocks(Correct colours are back!) by 2019-09-18 19:11:56 +1000 -
6bfb58fFinished the environment turns for the traps Added fog to the camera by 2019-09-18 15:31:54 +1000 -
5ee1be6Conveyorbelt works by 2019-09-17 19:48:00 +1000 -
a099ad2(Josh_Dev_branch) Commented out Debugs from map Generator because it slowed the start by 20seconds by 2019-09-16 16:43:08 +1000 -
3afffa1-Updated water to new system + Jumping has a bounce effect by 2019-09-16 16:42:11 +1000 -
ff6fe09Merge conflicts with with some logic blocks by 2019-09-16 12:06:36 +1000 -
77f91e6Merge remote-tracking branch 'origin/master' into Josh_Dev_branch by 2019-09-16 11:55:19 +1000 -
aa8b44bPushing works by 2019-09-16 11:45:11 +1000 -
547e82aTweaked how min and max difficulty work for adding new map sections. Added a bunch of new length-1 sections to join longer sections together if need be. Weighted the selection more towards longer sections. Divided possible map sections into multiple lists (each managed by a script object) to make them easier to work with. by 2019-09-16 08:36:56 +1000 -
c0ad428base push working but extremely buggy by 2019-09-14 17:51:03 +1000 -
798a8d8Client deaths moves them from screen. Lobby fix to display 8 names Icons in client scene Small Menu changes - remove tutorial scene by 2019-09-13 18:54:02 +1000 -
0bccb8dAdded more conditions to map section selection, based on width & difficulty, with width reducing & difficuty increasing as the game continues. Also split camera movement in RacetrackGameMode off into its own function in preparation for expanding it, so it doesn't clutter up OnRoundEnd. by 2019-09-12 18:07:00 +1000 -
61a73dcSet max players to 8 instead of 2(used for testing) by 2019-09-12 14:18:16 +1000 -
3298be6Fix the spawning getting the right pen at the start of the game by 2019-09-12 14:04:37 +1000 -
09108d3Had 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 by 2019-09-12 12:59:38 +1000 -
742d88cStarted working on push by 2019-09-12 12:22:35 +1000 -
fbbdc46Two 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 by 2019-09-11 15:23:34 +1000 -
c55b13bstart working on Derived block for water. by 2019-09-09 16:19:00 +1000 -
2406b82Merge remote-tracking branch 'origin/master' into Josh_Dev_branch by 2019-09-09 13:24:34 +1000 -
d78130eRotation is now cleaner by 2019-09-09 13:21:47 +1000 -
0e5b672worked on characters animation by 2019-09-09 10:28:14 +1000 -
3a6ae2fAdded an 8-player starting area. Changed player-spawning slightly: instead of skipping index 0 for odd numbers of players, each starting pen section starts with no squares marked isSpawnable, and lists of squares to mark as spawnable on instantiation depending on the number of players. RacetrackGameMode.cs is currently hardcoded to call the map initialiser with five players, until I can figure out how to get the number of connected players when OnPreGameStart is called. by 2019-09-08 18:54:36 +1000 -
eddea68Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-09-08 17:20:37 +1000 -
465a8ebImplemented a procedural track creation framework. Track sections will now be added from a list prefabs, after checking that they can connect to the previous section. Sections that have passed out of camera view will disappear. Created a new scene using the procedural generator. The Lobby will now load it on starting a game. by 2019-09-08 01:21:18 +1000 -
e03b095Player 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 by 2019-09-06 16:54:22 +1000 -
4f457d6Fixed some positioning issues. by 2019-09-05 22:48:08 +1000 -
3412026Created a map section template containing one of every block type, for easy duplication. by 2019-09-05 22:28:02 +1000 -
83288f7Working on Character controller by 2019-09-05 14:31:41 +1000 -
85e91dejpg icons by 2019-09-03 15:20:06 +1000 -
424ebb5PNG icons for logic blocks by 2019-09-03 14:02:43 +1000 -
97e9b8bLimit Connected Clients (Tested with 2 phones and laptop, laptop was kicked back to main connection screen) Limit number can be set in the LoginUIManager.cs script by 2019-09-03 13:58:54 +1000 -
20d7fe8Small changes made before class by 2019-08-29 15:07:06 +1000 -
91bcfedStarted working on more modular move by 2019-08-28 16:51:44 +1000 -
8bd42e3Character lives displayed inplace of score, removed scenescore as not being used added line so character and client lives update tested with one client by 2019-08-28 13:19:15 +1000 -
8d81b73Fixed the diagonal left and right block so character jumps diagonally by 2019-08-28 11:20:08 +1000 -
4eee92eStarted making htings more OO by 2019-08-26 22:25:45 +1000 -
8f6a4c4Cleaned up GameMode and GameManager by 2019-08-26 12:59:47 +1000 -
86b613eStarted to clean up GameManager + merged with Angus's changes by 2019-08-26 11:44:51 +1000 -
b22596cMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-26 11:38:06 +1000 -
84e56fcfixed clinets still being blacked out on reconnection by 2019-08-26 11:37:42 +1000 -
923c5dfSplit 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. by 2019-08-22 15:35:09 +1000 -
612a714Change the colour of the background so ita actually legible by 2019-08-22 14:31:39 +1000 -
35798a6Fix prefab + script issue for inground trap clean testing code + comments by 2019-08-22 12:53:00 +1000 -
27ef03aSeparated 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. by 2019-08-21 18:29:50 +1000 -
92b8452Checked with single player for the collision with traps. Corrected the connectedclients list Still need to set up the environment turn to trigger the animations by 2019-08-20 19:26:05 +1000 -
77315b2last push from class by 2019-08-15 18:15:42 +1000 -
8809d90Added boulder coroutine to raise and fall 2.0f by 2019-08-15 15:14:01 +1000 -
b72f2d0Cannon, 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 by 2019-08-15 14:37:00 +1000 -
0f9d8dfImplemented 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. by 2019-08-15 02:04:48 +1000 -
170c11aCannon fixed and tested - need to limit the pushing of the character! by 2019-08-14 18:43:06 +1000 -
507735aTrivial commit to enable pushing. by 2019-08-14 17:48:59 +1000 -
97428e6Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-14 17:47:49 +1000 -
d7f847dAdjusted 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. by 2019-08-14 17:47:31 +1000 -
3ed2099Trap 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 by 2019-08-14 17:16:29 +1000 -
f14e183Corrected the RaceTrack gamemode to link to the correct GameMode scene. by 2019-08-14 15:45:35 +1000 -
b99047dAdded conveyor belt to racetrack. by 2019-08-14 05:53:56 +1000 -
f157289Revert "Hoping that pushing these inconsequential changes with immediate commit will get Sourcetree to actually do its job..." by 2019-08-14 05:38:39 +1000 -
1427e76Hoping that pushing these inconsequential changes with immediate commit will get Sourcetree to actually do its job... by 2019-08-14 05:37:37 +1000 -
e5d1237Pits & cannons added to racetrack. Modified the pit prefab (sorry Claire), the surrounding blocks clashed with neighbouring pits/walls/water/etc. Starting the game will now take you to the 4-player alpha racetrack rather than Colour Collide. Camera now scrolls along the racetrack level at a rate of 1 block per turn. Currently nothing happens to people who fall behind it, except that you can't see them. Pets will no longer paint blocks in their colour. (I had to modify the ColorCollide.cs script for this, as I could not figure out how to turn a script into a .asset object as was done for ColorCollide.asset.) by 2019-08-14 05:07:58 +1000 -
e5cf27bWork in Progress - Scripting up Traps by 2019-08-09 19:48:52 +1000 -
dbc30f7Finalizing of model/prefabs for Traps by 2019-08-09 15:21:32 +1000 -
60e9ecfAnimal colour hex fix Trap creation by 2019-08-07 21:20:51 +1000 -
28aaff8Hot Fix: missing end of comment in GameMode by 2019-08-07 12:36:59 +1000 -
8a6c5bbStarted cleaning up Gamemode and GameManager by 2019-08-07 12:35:33 +1000 -
c0b73c4Limited moves to four + added move*2 to starting blocks by 2019-08-07 11:08:20 +1000 -
c84e426Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-07 11:02:19 +1000 -
446b37eUpdate to mass replace to filter to selection by 2019-08-07 11:01:48 +1000 -
ee04ebdMerge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-05 20:07:57 +1000 -
e671902Connected cLients are visible to all other clients + Login UI updates by 2019-08-05 20:07:41 +1000 -
f529537Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-05 19:37:47 +1000 -
95b9d6cNew four-player racetrack level, running from x = -15 to x = 15. by 2019-08-05 19:36:59 +1000 -
094ec36Meeting fixes for running once by 2019-08-05 15:49:49 +1000 -
1a517e4Updated racetrack level. by 2019-08-05 02:06:20 +1000 -
3b30ed0Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-08-05 00:15:24 +1000 -
8942ea8Started a fixed racetrack level with a starting pen, walls, water, and pits. by 2019-08-05 00:14:49 +1000 -
096edc6Fixed old port issue Added colours for each animal (Tested with selection black out) - need Joshua's help for server push by 2019-08-04 17:27:18 +1000 -
2688a10Added unity scenes to LFS + cleaned up scene folder by 2019-08-04 10:00:25 +1000 -
d7c8810Animal sprites didnt get pushed correctly by 2019-08-03 11:17:51 +1000 -
f6f6f8bUpdated readme for semester 2 by 2019-08-01 06:01:00 +0000 -
dac57cdRemove 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 by 2019-08-01 15:25:09 +1000 -
31364eeRe-Build with different sizing and video upload for Presentation video by 2019-06-01 16:00:04 +1000 -
8b16e94Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-30 17:38:22 +1000 -
6a49087Fixed some stuff + did a build by 2019-05-30 17:37:45 +1000 -
46434ffapk2 by 2019-05-30 16:54:07 +1000 -
a63b83ePushed scene settings for android by 2019-05-30 16:36:39 +1000 -
ab13483Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a by 2019-05-30 16:32:18 +1000 -
05ef0caDid a build, don't know what changed by 2019-05-30 16:31:12 +1000 -
2cfa6faChange 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 by 2019-05-30 16:21:37 +1000 -
5af247aZipped apk by 2019-05-30 15:07:03 +1000 -
f65993aBuild Added by 2019-05-30 14:56:08 +1000 -
ffa4619Have Score updating by 2019-05-30 13:59:40 +1000