zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2026-06-01 18:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Clément Le Bihan
2020-03-10 16:58:02 +01:00
parent 38856b9b1d ee4388bf2f
commit b95205b607
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/ui/rotate.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 449 B

lib/gamacon
+1 -1
Submodule lib/gamacon updated: eb501adc05...15fd9ad989
prefabs/game.gcprefab
+4 -2
View File
@@ -7,6 +7,7 @@
<sprite name="button_background" src="assets/ui/button_background.png" />
<sprite name="happiness" src="assets/ui/happiness.png" />
<sprite name="clown" src="assets/ui/clown.png" />
<sprite name="rotate" src="assets/ui/rotate.png" />
<sprite name="cobblestone" src="assets/sprites/cobblestone.png" />
<sprite name="comparator_on" src="assets/sprites/comparator_on.png" />
<sprite name="mossy_cobblestone" src="assets/sprites/cobblestone_mossy.png" />
@@ -44,17 +45,18 @@
</gc_entity>
<panel src="panel" x="7%" y="3%" width="30%" height="6%"/>
<button sprite="rotate" x="19%" y="3%" width="%" height="3%" tooltip="Rotate a texture" tooltip_y="-5" size="15"/>
<panel src="panel" x="100%" y="50%" width="50%" height="120%"/>
<text text="TEAMS" x="88%" y="40"/>
<panel src="panel" x="50%" y="98%" width="120%" height="4%"/>
<panel src="happiness" x="3%" y="98%" width="%" height="3%"/>
<text text="100%" x="6%" y="98%" size="13" tooltip="The level of happiness of your students.\n" padding_x="17">
<text text="100%" x="6%" y="98%" size="13" tooltip="The level of happiness of your students.\n" padding_x="17" tooltip_x="10" tooltip_y="5">
<game_display stats="happiness" />
</text>
<panel src="clown" x="10%" y="98%" width="%" height="3%" />
<text text="100%" x="13%" y="98%" size="13" tooltip="The level of stupidity of your students.\nThey start doing stupid things if you'are too kind with them.\n\nYou will loose if this stat reach 100%" padding_x="17">
<text text="100%" x="13%" y="98%" size="13" tooltip="The level of stupidity of your students.\nThey start doing stupid things if you'are too kind with them.\n\nYou will loose if this stat reach 100%" padding_x="17" tooltip_x="10" tooltip_y="5">
<game_display stats="stupidity" />
</text>
</gc_entities>