Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UFrameIT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FrameIT
UFrameIT
Commits
8869eac3
Commit
8869eac3
authored
3 years ago
by
Marco Zimmer
Browse files
Options
Downloads
Patches
Plain Diff
merge fix 1
parent
adedc4b4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
+0
-6
0 additions, 6 deletions
Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
Assets/Scripts/Restart.cs
+0
-6
0 additions, 6 deletions
Assets/Scripts/Restart.cs
with
0 additions
and
12 deletions
Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
+
0
−
6
View file @
8869eac3
...
...
@@ -163,12 +163,6 @@ public bool rename(string newLabel)
public
abstract
GameObject
instantiateDisplay
(
GameObject
prefab
,
Transform
transform
);
public
static
void
Clear
()
{
MaxLabelId
=
0
;
UnusedLabelIds
.
Clear
();
}
public
virtual
void
delete
(
bool
keep_clean
=
true
)
{
//TODO: MMT: delete over there
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/Restart.cs
+
0
−
6
View file @
8869eac3
...
...
@@ -9,15 +9,9 @@ public void LevelReset()
Loader
.
LoadStage
(
StageStatic
.
stage
.
name
,
!
StageStatic
.
stage
.
use_install_folder
,
false
);
}
<<<<<<<
HEAD
Fact
.
Clear
();
SceneManager
.
LoadSceneAsync
(
SceneManager
.
GetActiveScene
().
buildIndex
);
=======
public
void
LoadMainMenue
()
{
SceneManager
.
LoadScene
(
"MainMenue"
);
>>>>>>>
MaZiFAU
}
public
void
LoadStartScreen
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment