JoshuaReason
|
446b37e9f5
|
Update to mass replace to filter to selection
|
5 years ago |
Joshua Reason
|
ee04ebde5e
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
Joshua Reason
|
e671902d0d
|
Connected cLients are visible to all other clients + Login UI updates
|
5 years ago |
s3607057 (Angus Niven)
|
f5295378f4
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
s3607057 (Angus Niven)
|
95b9d6c530
|
New four-player racetrack level, running from x = -15 to x = 15.
|
5 years ago |
Claire Peta
|
094ec36394
|
Meeting fixes for running once
|
5 years ago |
s3607057 (Angus Niven)
|
1a517e43e1
|
Updated racetrack level.
|
5 years ago |
s3607057 (Angus Niven)
|
3b30ed0f25
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
s3607057 (Angus Niven)
|
8942ea8d9b
|
Started a fixed racetrack level with a starting pen, walls, water, and pits.
|
5 years ago |
ClairePeta
|
096edc62a8
|
Fixed old port issue
Added colours for each animal (Tested with selection black out) - need Joshua's help for server push
|
5 years ago |
Joshua Reason
|
2688a10ca9
|
Added unity scenes to LFS + cleaned up scene folder
|
5 years ago |
ClairePeta
|
d7c8810087
|
Animal sprites didnt get pushed correctly
|
5 years ago |
Joshua Reason
|
f6f6f8b0eb
|
Updated readme for semester 2
|
5 years ago |
Claire Peta
|
dac57cd66c
|
Remove colour and added some more animals to allow for eight players, script set up to hard code a colour for each animal - colours not actually set up specifically yet
|
5 years ago |
Claire Peta
|
31364ee301
|
Re-Build with different sizing and video upload for Presentation video
|
5 years ago |
JoshuaReason
|
8b16e941a1
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a
|
5 years ago |
JoshuaReason
|
6a49087a02
|
Fixed some stuff + did a build
|
5 years ago |
Joshua Reason
|
46434ffbd1
|
apk2
|
5 years ago |
JoshuaReason
|
a63b83e9ae
|
Pushed scene settings for android
|
5 years ago |
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 |