s3607057 (Angus Niven)
4d8da3bb20
Restored debug statements to MapManager.cs.
5 years ago
s3607057 (Angus Niven)
e827f23777
Dummy commit to trick SourceTree into letting me push...
5 years ago
s3607057 (Angus Niven)
6699c42a2b
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
s3607057 (Angus Niven)
f8ec8998a1
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.
5 years ago
ClairePeta
ac31864b8b
Fix the order stuff that my fix for the block issue messed up a little
5 years ago
s3607057 (Angus Niven)
9ab1d1d334
Fixed a few errors in track prefabs.
5 years ago
ClairePeta
fb9b352db3
Small changes i had here and ones i made to try and fix an error
5 years ago
Claire Peta
937cdbb3f5
Increase to 8 players for server build
5 years ago
Joshua Reason
174888b134
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
Joshua Reason
ae12fa33c8
fixed rotate converoy belt section
5 years ago
s3607057 (Angus Niven)
5f09ba29be
Small fix to hopefully fix a bug where people respawn on the same block.
5 years ago
s3607057 (Angus Niven)
53cb01b5e5
Fixed up the 8-player spawn, added a map section that was mistakenly left off the roster.
5 years ago
ClairePeta
35f4b9dcb8
Fix characters dying and order based on x at start of game
5 years ago
Joshua Reason
914ad9db19
updated webgl build in Project
5 years ago
s3607057 (Angus Niven)
58ab77df6a
Fixed a missing entry on the Width 5 map section list.
5 years ago
ClairePeta
b21ed9040f
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
5 years ago
Joshua Reason
fbb4da7234
Fixed map generation bug in build
5 years ago
Joshua Reason
4604ae77c7
removed missile from start inventory
5 years ago
Joshua Reason
a59a33c039
did some bug fixes
5 years ago
Joshua Reason
7e1f85b7e4
Did some webGL fixes + port stuff
5 years ago
Claire Peta
d09abf7567
Fix lives lost, and small code cleaning
5 years ago
JoshuaReason
77f1c8de8b
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
5 years ago
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
s3607057 (Angus Niven)
d49588727e
Changed respawn function so that you will always respawn at ground level, after some weirdness with respawning on top of crystals.
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