Joshua Reason
521921d131
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Data/Networking/Server/Realtime/Server.asset
# Assets/Scripts/Networking/Server/ClientList.cs
5 years ago
Joshua Reason
3e1b9c674e
Webgl works alongside android + included in project
5 years ago
s3607057 (Angus Niven)
c1309d9165
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).
Also made it so that players who fall behind the camera will lose a life & respawn, as intended.
5 years ago
ClairePeta
0208a6d7c5
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
5 years ago
Joshua Reason
88cb07544d
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Joshua Reason
e80bfafbe2
Got webGL build working, some bugs still
5 years ago
s3607057 (Angus Niven)
68616012ac
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).
5 years ago
Claire Peta
941f5df196
Tested code that works for block spawning
also commented out some debug.log stuff
5 years ago
JoshuaReason
b3b84695aa
fixed gizmos breaking things on play
5 years ago
JoshuaReason
502e6df32e
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
JoshuaReason
74bfd13ced
Block gizmos visible in Prefab view
5 years ago
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