JoshuaReason
55cadb7609
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Data/Inventory/BaseInventory.asset
# Assets/Data/Logic Blocks/Missile.asset
5 years ago
JoshuaReason
100e4f1ece
Messing around with HTML
5 years ago
s3607057 (Angus Niven)
db19ee9723
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).
5 years ago
Claire Peta
726859573f
Chicken Wing
5 years ago
s3607057 (Angus Niven)
7dca2b421e
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
s3607057 (Angus Niven)
c3cd229d15
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.
5 years ago
Claire Peta
3cfd98a474
Fix the cow,
Fix the spawn stuff
5 years ago
JoshuaReason
2386dda271
Fixed shot if client doesn't have resource
5 years ago
s3607057 (Angus Niven)
2213a1c62f
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
s3607057 (Angus Niven)
ecb0fe6dc8
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.
5 years ago
JoshuaReason
14fc59540f
Maybe fixed double move respawn
5 years ago
Claire Peta
895f00863b
Update server menu settings
5 years ago
Claire Peta
ed6c1de76f
Update how to play section for client main menu
5 years ago
Claire Peta
07d28791c2
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Claire Peta
866c8e2e02
Fix conveyorbelt issue
5 years ago
Joshua Reason
ed38181c6d
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Joshua Reason
121eed4535
Updated hook + WebGL
5 years ago
s3607057 (Angus Niven)
e08ae38e70
Fixed respawning-related issues (I hope). Players should now respawn only on open squares and never on traps.
5 years ago
Joshua Reason
3e7480ff17
Added replace block + updated webgl build
5 years ago
Joshua Reason
d6fd6628b0
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Joshua Reason
d3720b4dae
Did some bug fixing. Water pushes character off if someone ends up ontop
5 years ago
Claire Peta
aad9206184
Have to head home, psu hof small changes i made while play testing for bugs and whatnot (forgot to stage all on previous push)
5 years ago
Claire Peta
96fcac2b78
Have to head home, psu hof small changes i made while play testing for bugs and whatnot
5 years ago
Joshua Reason
5e29d6213b
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Joshua Reason
506cfb8f2c
Falling works + fixed cannon prefab
5 years ago
ClairePeta
3f25529235
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
5 years ago
ClairePeta
de9fa199f3
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
5 years ago
s3607057 (Angus Niven)
2c9f01a405
Applied new respawn logic to falling off the map as well.
5 years ago
Joshua Reason
24cb2510c1
fixed some merge errors
5 years ago
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