Claire Peta
|
3a3270ed11
|
Uncomment stuff for collectable spawning testing + icon
|
5 years ago |
s3607057 (Angus Niven)
|
5b31d42f21
|
Fixed wrong bool ticked on one of the map sections.
|
5 years ago |
JoshuaReason
|
b6181246c8
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Prefabs/Map Sections/Start 4-player.prefab
|
5 years ago |
JoshuaReason
|
eab76a866f
|
fixed hookshot serialization + added isvisible function
|
5 years ago |
s3607057 (Angus Niven)
|
c7dc3a5dcc
|
Added item spawn locations to all existing map section prefabs. Also pushed a second snaking map section.
|
5 years ago |
Claire Peta
|
5d9a6caecf
|
Fixed the character script after merge :)
|
5 years ago |
Joshua Reason
|
6564026cc8
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
Claire Peta
|
365b6605cd
|
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
|
5 years ago |
Joshua Reason
|
07946d34b2
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Prefabs/Map Sections/Start 4-player.prefab
# Assets/Scripts/Character.cs
|
5 years ago |
Joshua Reason
|
186a1dd634
|
Fixed cannon so we aren't waiting for it. Started to add hook shot.
|
5 years ago |
ClairePeta
|
764cb2c537
|
Block spawning update
|
5 years ago |
ClairePeta
|
a360fe8d9c
|
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
|
5 years ago |
s3607057 (Angus Niven)
|
6f594d0436
|
Hopefully fixed issue with the missing spawn block in the 4-player pen.
|
5 years ago |
s3607057 (Angus Niven)
|
25610a9901
|
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).
|
5 years ago |
s3607057 (Angus Niven)
|
3432f74285
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
s3607057 (Angus Niven)
|
16eb8a02b4
|
Another 4-player spawn revision.
|
5 years ago |
Claire Peta
|
1105ee3d41
|
Fix max players to 8
Fix crystal and boulder prefab and loss of life
|
5 years ago |
JoshuaReason
|
19d90e38c5
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
79f0289d00
|
fixed dying on a half turn, removed old half turns
|
5 years ago |
s3607057 (Angus Niven)
|
014d93be9a
|
Revised the four-player spawn prefab to fix an imbalance we noticed while testing.
|
5 years ago |
s3607057 (Angus Niven)
|
76374fc784
|
And removed the spammy debug statements that are no longer needed.
|
5 years ago |
s3607057 (Angus Niven)
|
1cb4324a8c
|
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.
|
5 years ago |
JoshuaReason
|
9e5e2fb661
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Data/Inventory/BaseInventory.asset
# Assets/Data/Logic Blocks/Wait.asset
|
5 years ago |
JoshuaReason
|
bec7885400
|
Pushing logic block changes from last week
|
5 years ago |
Joshua Reason
|
47b91aac84
|
Added ability for player one to start game
|
5 years ago |
ClairePeta
|
6506309950
|
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
|
5 years ago |
Claire Peta
|
50ac156d92
|
Forgot to push lafter class last night
|
5 years ago |
s3607057 (Angus Niven)
|
2a0c9f8017
|
Added a new map section as an example of what I was talking about this evening.
|
5 years ago |
s3607057 (Angus Niven)
|
51a19604ad
|
Yet another fix to misaligned pits.
|
5 years ago |
s3607057 (Angus Niven)
|
2fe1a12481
|
Fixed another prefab section with misaligned pits.
|
5 years ago |
s3607057 (Angus Niven)
|
abd9926b80
|
Fixed bug that was misplacing the spawning area due to startX being changed between games in MapManager.asset.
|
5 years ago |
JoshuaReason
|
571822a948
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
775e8b93ef
|
Fixed Diagonal + added Wait
|
5 years ago |
s3607057 (Angus Niven)
|
c535a241a8
|
Changed a few prefab sections & fixed some misalignments.
|
5 years ago |
s3607057 (Angus Niven)
|
b67bcde3fa
|
Lowered 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.
|
5 years ago |
s3607057 (Angus Niven)
|
58eed26957
|
Fixed an accidental misalignment between the 4-player spawning pen and the track.
|
5 years ago |
s3607057 (Angus Niven)
|
1b97696e30
|
Added turntable conveyer belts with appropriate icons.
|
5 years ago |
s3607057 (Angus Niven)
|
32af52cf38
|
Fixed 4-player spawn to account for double-moves, changed MapManager to prevent more than one link section spawning in a row.
|
5 years ago |
s3607057 (Angus Niven)
|
e3fc896f4b
|
Cleaning up MapManager slightly.
|
5 years ago |
s3607057 (Angus Niven)
|
98e81ec3be
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Prefabs/Map Sections/Start 4-player.prefab
|
5 years ago |
s3607057 (Angus Niven)
|
be9a258618
|
Added 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.
|
5 years ago |
ClairePeta
|
e52227703c
|
Toggled 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!)
|
5 years ago |
ClairePeta
|
6bfb58f4be
|
Finished the environment turns for the traps
Added fog to the camera
|
5 years ago |
Joshua Reason
|
5ee1be61f3
|
Conveyorbelt works
|
5 years ago |
Joshua Reason
|
3afffa1575
|
-Updated water to new system + Jumping has a bounce effect
|
5 years ago |
Joshua Reason
|
ff6fe093b1
|
Merge conflicts with with some logic blocks
|
5 years ago |
Joshua Reason
|
77f91e6197
|
Merge remote-tracking branch 'origin/master' into Josh_Dev_branch
# Conflicts:
# Assets/Data/Logic Blocks/Diagonal Left.asset
# Assets/Data/Logic Blocks/Diagonal Right.asset
|
5 years ago |
Joshua Reason
|
aa8b44bdee
|
Pushing works
|
5 years ago |
s3607057 (Angus Niven)
|
547e82ab82
|
Tweaked 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.
|
5 years ago |
JoshuaReason
|
c0ad428fa2
|
base push working but extremely buggy
|
5 years ago |