Skip to content

gestalt v7 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DarkWeird wants to merge 4 commits into from
Closed

gestalt v7 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfc41a7
feature(reintegrate-gestaltv7): initial changes for gestaltv7 integra…
DarkWeird Sep 7, 2020
14a7031
feature(reintegrate-gestaltv7): gestalt-v7 compability (package)
DarkWeird Sep 9, 2020
2c5110d
feature(reintegrate-gestaltv7): move reflection package to nui package.
DarkWeird Sep 10, 2020
8630ecf
feature(reintegrate-gestaltv7): migrate ui types from engine to nui(…
DarkWeird Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions assets/ui/fireballLauncherSettingsScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"text": "Time Period"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "timePeriod",
"layoutInfo": {}
},
Expand All @@ -56,7 +56,7 @@
"text": "Offset for sync (in seconds)"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "offset",
"layoutInfo": {}
},
Expand All @@ -65,7 +65,7 @@
"text": "Maximum Distance"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "maxDistance",
"layoutInfo": {}
},
Expand All @@ -74,7 +74,7 @@
"text": "Damage Amount"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "damageAmount",
"layoutInfo": {}
}
Expand Down Expand Up @@ -104,23 +104,23 @@
"text": "X:"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "x"
},
{
"type": "UILabel",
"text": "Y: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "y"
},
{
"type": "UILabel",
"text": "Z: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "z"
},
{
Expand Down Expand Up @@ -177,7 +177,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
2 changes: 1 addition & 1 deletion assets/ui/mcqButtonDoorScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
4 changes: 2 additions & 2 deletions assets/ui/passwordDoorScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"text": "Invalid Password!"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "password"
}
]
Expand All @@ -43,7 +43,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
10 changes: 5 additions & 5 deletions assets/ui/setMcqButtonDoorScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"text": "Title"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "title",
"layoutInfo": {}
},
Expand All @@ -41,7 +41,7 @@
"text": "Message"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "message",
"layoutInfo": {},
"multiline": true
Expand All @@ -51,7 +51,7 @@
"text": "Options (comma separated)"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "options",
"layoutInfo": {}
},
Expand All @@ -60,7 +60,7 @@
"text": "Correct option"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "password",
"layoutInfo": {}
}
Expand All @@ -82,7 +82,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
8 changes: 4 additions & 4 deletions assets/ui/setPasswordDoorScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"text": "Title"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "title",
"layoutInfo": {}
},
Expand All @@ -41,7 +41,7 @@
"text": "Message"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "message",
"layoutInfo": {},
"multiline": true
Expand All @@ -51,7 +51,7 @@
"text": "Password"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "password",
"layoutInfo": {}
}
Expand All @@ -73,7 +73,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
14 changes: 7 additions & 7 deletions assets/ui/swingingBladeSettingsScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"text": "Time Period"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "timePeriod",
"layoutInfo": {}
},
Expand All @@ -56,7 +56,7 @@
"text": "Amplitude"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "amplitude",
"layoutInfo": {}
},
Expand All @@ -65,7 +65,7 @@
"text": "Offset (Phase Difference)"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "offset",
"layoutInfo": {}
}
Expand Down Expand Up @@ -95,23 +95,23 @@
"text": "Yaw:"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "yaw"
},
{
"type": "UILabel",
"text": "Pitch: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "pitch"
},
{
"type": "UILabel",
"text": "Roll: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "roll"
},
{
Expand Down Expand Up @@ -168,7 +168,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
12 changes: 6 additions & 6 deletions assets/ui/wipeOutSettingsScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"text": "Time Period"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "timePeriod",
"layoutInfo": {}
},
Expand All @@ -64,7 +64,7 @@
"text": "Offset (A fraction of Time Period)"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "offset",
"layoutInfo": {}
}
Expand Down Expand Up @@ -94,23 +94,23 @@
"text": "Yaw:"
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "yaw"
},
{
"type": "UILabel",
"text": "Pitch: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "pitch"
},
{
"type": "UILabel",
"text": "Roll: "
},
{
"type": "engine:UIText",
"type": "nui:UIText",
"id": "roll"
},
{
Expand Down Expand Up @@ -167,7 +167,7 @@
}
},
{
"type": "engine:RowLayout",
"type": "nui:rowLayout",
"id": "actionsRow",
"contents": [
{
Expand Down
23 changes: 5 additions & 18 deletions .../terasology/adventureassets/altarofresurrection/AltarOfResurrectionColliderComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
/*
* Copyright 2017 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.adventureassets.altarofresurrection;

import org.terasology.entitySystem.Component;
import org.terasology.engine.entitySystem.Component;

/**
* This is a marker component that is attached to a the altar of resurrection collider for dealing with the ActivateEvent and
* AttackEvent.
* This is a marker component that is attached to a the altar of resurrection collider for dealing with the
* ActivateEvent and AttackEvent.
*/

public class AltarOfResurrectionColliderComponent implements Component {
Expand Down
23 changes: 5 additions & 18 deletions .../org/terasology/adventureassets/altarofresurrection/AltarOfResurrectionRootComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
/*
* Copyright 2017 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.adventureassets.altarofresurrection;

import org.terasology.entitySystem.Component;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.world.block.ForceBlockActive;
import org.terasology.engine.entitySystem.Component;
import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.world.block.ForceBlockActive;

/**
* This component is attached to every altar of resurrection root entity.
Expand Down
Loading