JoshuaReason
|
ab13483d31
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Models.meta
# Assets/Scenes/TuteLevelFour.unity
# ProjectSettings/EditorBuildSettings.asset
|
5 years ago |
JoshuaReason
|
05ef0cad45
|
Did a build, don't know what changed
|
5 years ago |
Claire Peta
|
2cfa6facba
|
Change 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
|
5 years ago |
Joshua Reason
|
5af247a9d3
|
Zipped apk
|
5 years ago |
Joshua Reason
|
f65993aa8c
|
Build Added
|
5 years ago |
JoshuaReason
|
ffa4619081
|
Have Score updating
|
5 years ago |
JoshuaReason
|
32a975e626
|
Fixed tutorial levels UI
Fixed fog in tutorai levels
|
5 years ago |
Claire Peta
|
317836aa12
|
Fix alignment issues
Tutorial scenes Complete
Menu Client/Server Complete
Add second how to video
|
5 years ago |
Joshua Reason
|
07ad71b25b
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Data/Logic Blocks/Horse_Left.asset
# Assets/Data/Logic Blocks/Horse_Right.asset
|
5 years ago |
Joshua Reason
|
ac7cfde554
|
fixed some assets
|
5 years ago |
Joshua Reason
|
d89a37a6db
|
Got combined blocks moving faster than single blocks so that animate in the same amount of time + fixed bug where players were waiting for other players to finish an action
|
5 years ago |
Claire Peta
|
db591222b8
|
Change menu background
EOD on Desktop
|
5 years ago |
Claire Peta
|
3a7ba7d8b9
|
Link client to character, Add instructions for how to play with video slots, new simpler background design scene (need to finish and screenshot for bg image)
Switching from laptop to desktop for bg scene
|
5 years ago |
JoshuaReason
|
1cc1c8fe2c
|
MAde for loops editable again
|
5 years ago |
Claire Peta
|
6df4a62656
|
EOD thursday class
|
5 years ago |
JoshuaReason
|
bab4dda14b
|
fixed Client time
|
5 years ago |
JoshuaReason
|
e48e419c29
|
fixed client inventory removing items + time is sent over by server
|
5 years ago |
JoshuaReason
|
7ec0bfeb4f
|
fixed max lengths of tray to account for for loops
|
5 years ago |
Joshua Reason
|
a768a2f314
|
Actually have for loops ui working now
|
5 years ago |
SWIN\jreason
|
1980455d86
|
Semi working editable for loop
|
5 years ago |
Claire Peta
|
156dcc2235
|
Added global variables for settings
limit plays to min of two and max of four
remove player moves text from tutorial levels
|
5 years ago |
Claire Peta
|
d35aa05de3
|
block spawn, change block to not walkable
|
5 years ago |
Claire Peta
|
6177a2d071
|
Client login cant continue without name, colour and animal selected/entered
Game info display for five seconds before multiplayer game
Created new combination blocks
|
5 years ago |
JoshuaReason
|
ddf1b5718f
|
added text when a character moves
|
5 years ago |
JoshuaReason
|
cf76565e4d
|
TrayUI Removing fixed
|
5 years ago |
JoshuaReason
|
d0a6e06016
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
# Conflicts:
# Assets/Prefabs/UI/Player Canvas.prefab
# Assets/Scenes/Client Scenes/ClientScene.unity
|
5 years ago |
JoshuaReason
|
f5468621f3
|
Fixed logic tray max length + dropping things back into inventory duplication
|
5 years ago |
Claire Peta
|
aa2fa478fc
|
pre-class changes
|
5 years ago |
Claire Peta
|
8e2f0f0a40
|
background scene made, added image background to menus, server menu made, changed tutorial scenes
|
5 years ago |
JoshuaReason
|
0e1cb55652
|
fonoshed Fixed tutorial pickup
|
5 years ago |
JoshuaReason
|
70c5de5116
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
e07200b81a
|
started Fix tutorial level pickup
|
5 years ago |
Claire Peta
|
5ce9bf0991
|
i did a silly thing
|
5 years ago |
Claire Peta
|
140ae8df02
|
i did more things
|
5 years ago |
JoshuaReason
|
481f43b867
|
Can pick to clone inventory on start
|
5 years ago |
JoshuaReason
|
a4c5bad97d
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
97dce6d999
|
fixed Logic trough selection bug
|
5 years ago |
Claire Peta
|
48d116ed18
|
I did things
Fix tutorial levels, multiplayer info UI scence
|
5 years ago |
JoshuaReason
|
dbf9e14b01
|
Did some fixing for the inventory
|
5 years ago |
Claire Peta
|
3d85c4e4af
|
Animal and Colour selection from login menu
(Base upload to now work on linked selection)
|
5 years ago |
Claire Peta
|
24954548fb
|
Fixed fog issue in mobile build
|
5 years ago |
Claire Peta
|
267fdba368
|
final push pre-beta presentation
|
5 years ago |
JoshuaReason
|
2897abef90
|
Added spawn to collor collide two + temp fixed Jump
|
5 years ago |
JoshuaReason
|
603fb14c13
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
a9a86b3252
|
Started working on equality for blocks fixed jump waiting
|
5 years ago |
Claire Peta
|
1798783baf
|
adjust smaller demo scene, change lobby link to demo scene, remove names appearing when lobby scene loads
|
5 years ago |
Claire Peta
|
63b1ef13ad
|
Change starting cube colour
|
5 years ago |
Claire Peta
|
1e438e5225
|
fixed scoreboard problem, linked score updated into scoreboard script, automatic load
|
5 years ago |
JoshuaReason
|
ce9afb8275
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
a566463e20
|
Made players spawn in correct direction
|
5 years ago |