Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Overbrewed
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Unity
Overbrewed
Commits
0360332c
Commit
0360332c
authored
Sep 22, 2019
by
Sebastian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
9c803572
592a96cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
17 deletions
+7
-17
Assets/_Game/Imports/fonts/__MACOSX.meta
Assets/_Game/Imports/fonts/__MACOSX.meta
+1
-1
Assets/_Game/Scenes/Credits.unity
Assets/_Game/Scenes/Credits.unity
+4
-4
Assets/_Game/Scripts/UI/Assembly-CSharp.csproj.meta
Assets/_Game/Scripts/UI/Assembly-CSharp.csproj.meta
+1
-2
Assets/_Game/Scripts/UI/UI.sln.meta
Assets/_Game/Scripts/UI/UI.sln.meta
+1
-2
Assets/_Game/VFX/TapFluid/Textures.meta
Assets/_Game/VFX/TapFluid/Textures.meta
+0
-8
No files found.
Assets/
Demigiant/DOTween/Editor
.meta
→
Assets/
_Game/Imports/fonts/__MACOSX
.meta
View file @
0360332c
fileFormatVersion: 2
guid:
2cdc087867a94f948a66639756a8a3e3
guid:
74fd32b8a82a08841abd27b278fdf4b0
folderAsset: yes
DefaultImporter:
externalObjects: {}
...
...
Assets/_Game/Scenes/Credits.unity
View file @
0360332c
...
...
@@ -407,10 +407,10 @@ RectTransform:
m_Father
:
{
fileID
:
366235576
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
0
,
y
:
0
}
m_AnchoredPosition
:
{
x
:
400
,
y
:
225.09
}
m_SizeDelta
:
{
x
:
252.1
,
y
:
147
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
.5
}
m_AnchorMax
:
{
x
:
1
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
-3.600006
,
y
:
10.800018
}
m_SizeDelta
:
{
x
:
-603.8
,
y
:
114.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&697258949
MonoBehaviour
:
...
...
Assets/_Game/
VFX/TapFluid/Scripts
.meta
→
Assets/_Game/
Scripts/UI/Assembly-CSharp.csproj
.meta
View file @
0360332c
fileFormatVersion: 2
guid: 0e1551d854a4a8247877583fdb2fba9a
folderAsset: yes
guid: 938fe1540aa4aac42981219f8e6e8caf
DefaultImporter:
externalObjects: {}
userData:
...
...
Assets/_Game/
VFX/TapFluid/Shaders
.meta
→
Assets/_Game/
Scripts/UI/UI.sln
.meta
View file @
0360332c
fileFormatVersion: 2
guid: 2a0fa2311110f744ea309bab75e9f600
folderAsset: yes
guid: bc3f13c3a929b244eb70dfac58545015
DefaultImporter:
externalObjects: {}
userData:
...
...
Assets/_Game/VFX/TapFluid/Textures.meta
deleted
100644 → 0
View file @
9c803572
fileFormatVersion: 2
guid: 696677aa871f3804781570d7d57a564c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment