Skip to content

Commit

Permalink
updated dev from master
Browse files Browse the repository at this point in the history
  • Loading branch information
@GerardClotet
GerardClotet committed Apr 16, 2019
1 parent e7cc269 commit 8bc4965
Show file tree
Hide file tree
Showing 28 changed files with 680 additions and 372 deletions.
216 changes: 122 additions & 94 deletions Game/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,46 +30,60 @@
<InGameUi>
<images>

<image name="box_abilities_grey">
<section x="1" y="545" w="165" h="43"/>
<position x="557" y="675"/>
<image name="loot_item_panel">
<section x="640" y="238" w="244" h="257"/>
<flag value="loot" />
</image>

<image name="ability1_button">
<section x="714" y="91" w="22" h="31"/>
<position x="114" y="589"/>
</image>

<image name="ability2_button">
<section x="766" y="91" w="22" h="31"/>
<position x="174" y="589"/>
</image>

<image name="ulti_button">
<section x="807" y="91" w="47" h="31"/>
<position x="222" y="589"/>
</image>


<image name="life_bar">
<section x="110" y="482" w="134" h="26"/>
<position x="113" y="78"/>
<position x="32" y="133"/>
</image>
<image name="bag">
<section x="245" y="482" w="37" h="42"/>
<position x="1210" y="675"/>
<position x="1210" y="660"/>
</image>
<image name="squareButton">
<section x="283" y="482" w="35" h="15"/>
<position x="1170" y="700"/>
<section x="275" y="546" w="30" h="30"/>
<position x="1170" y="669"/>
</image>
<image name="LButton">
<section x="319" y="482" w="35" h="15"/>
<position x="125" y="23 "/>
<section x="244" y="525" w="30" h="19"/>
<position x="173" y="19 "/>
</image>
<image name="RButton">
<section x="355" y="482" w="35" h="15"/>
<position x="198" y="23 "/>
<section x="244" y="545" w="30" h="19"/>
<position x="252" y="19 "/>
</image>
<image name="box_player">
<section x="391" y="482" w="63" h="80"/>
<section x="1033" y="1" w="94" h="109"/>
<position x="40" y="21"/>
</image>
<!--
<image name="level_box">
<section x="1 " y="519" w="57" h="24"/>
<position x="41" y="118"/>
<position x="40" y="134"/>
</image>
-->
<image name="coin">
<section x="59" y="519" w="25" h="25"/>
<position x="1000" y="41"/>
</image>
<image name="panelTest">
<section x="721" y="480" w="338" h="308"/>
<position x="150" y="190"/>
<flag isPanel = "1" panelName = "panelTest"/>
<position x="1055" y="31"/>
</image>

</images>
Expand All @@ -80,7 +94,7 @@
<staticSection x="110" y="482" w="134" h="26"/>
<dynamicSection x="111" y="515" w="132" h="24"/>
<damageSection x="32" y="595" w="115" h="26"/>
<position x="113" y="78"/>
<position x="32" y="133"/>
<type value="player"/>
</healthbar>

Expand All @@ -94,21 +108,21 @@


<clocks>
<clock name=" clock 1">
<section x="651" y="0" w="123" h="123"/>
<position x="650" y="550"/>
<clock name="ability1_clock">
<section x="859" y="126" w="51" h="51"/>
<position x="100" y="630"/>
<type value="ability1"/>
</clock>

<clock name=" clock 2">
<section x="780" y="214" w="123" h="123"/>
<position x="850" y="550"/>
<clock name="ability2_clock">
<section x="859" y="126" w="51" h="51"/>
<position x="160" y="630"/>
<type value="ability2"/>
</clock>

<clock name=" clock 3">
<section x="780" y="214" w="123" h="123"/>
<position x="1050" y="550"/>
<clock name="ulti_clock">
<section x="859" y="126" w="51" h="51"/>
<position x="220" y="630"/>
<type value="ulti"/>

</clock>
Expand All @@ -121,39 +135,34 @@


<InGameUiM>
<images> <!-- sword image changed to test -->
<image name="sword">
<!--
<section x="167" y="545" w="36" h="36"/>
<position x="561" y="679 "/> -->

<section x="784" y="0" w="120" h="120"/>
<position x="650" y="550 "/>

<images>
<image name="basic_marche">
<section x="650" y="126" w="51" h="51"/>
<position x="40" y="630 "/>
</image>
<image name="sword_ability">
<section x="0" y="482" w="36" h="36"/>
<position x="601" y="679"/>
<image name="ability1_marche">
<section x="704" y="126" w="51" h="51"/>
<position x="100" y="630"/>
</image>
<image name="glove">
<section x="37" y="482" w="36" h="36"/>
<position x="641" y="679"/>
<image name="ability2_marche">
<section x="755" y="126" w="51" h="51"/>
<position x="160" y="630"/>
</image>
<image name="orbe">
<section x="74" y="482" w="35" h="36"/>
<position x="681" y="679"/>
<image name="ulti_marche">
<section x="807" y="126" w="51" h="51"/>
<position x="220" y="630"/>
</image>
<image name="marche">
<section x="455" y="482" w="58" h="77"/>
<position x="41" y="22"/>
<section x="641" y="1" w="84" h="92"/>
<position x="41" y="37"/>
</image>
<image name="player2">
<section x="514" y=" 482" w="55" h="28"/>
<position x="188" y="41"/>
<section x="342" y=" 481" w="64" h="64"/>
<position x="229" y="41"/>
</image>
<image name="player3">
<section x="570" y="482" w="55" h="28"/>
<position x="115" y="41"/>
<section x="283" y="481" w="58" h="64"/>
<position x="153" y="41"/>
</image>
</images>
</InGameUiM>
Expand All @@ -162,32 +171,32 @@
<InGameUiS>
<images>
<image name="basic_shara">
<section x="167" y="545" w="36" h="36"/>
<position x="561" y="679 "/>
<section x="650" y="126" w="51" h="51"/>
<position x="40" y="630 "/>
</image>
<image name="ability1_shara">
<section x="0" y="482" w="36" h="36"/>
<position x="601" y="679"/>
<section x="704" y="126" w="51" h="51"/>
<position x="100" y="630"/>
</image>
<image name="ability2_shara">
<section x="37" y="482" w="36" h="36"/>
<position x="641" y="679"/>
<section x="755" y="126" w="51" h="51"/>
<position x="160" y="630"/>
</image>
<image name="ulti_shara">
<section x="74" y="482" w="35" h="36"/>
<position x="681" y="679"/>
<section x="807" y="126" w="51" h="51"/>
<position x="220" y="630"/>
</image>
<image name="shara">
<section x="257" y="545" w="47" h="64"/>
<position x="55" y="35"/>
<section x="1129" y="1" w="96" h="100"/>
<position x="41" y="29"/>
</image>
<image name="player2">
<section x="514" y=" 511" w="55" h="28"/>
<position x="188" y="41"/>
<section x="407" y="481" w="62" h="62"/>
<position x="229" y="41"/>
</image>
<image name="player3">
<section x="514" y=" 482" w="55" h="28"/>
<position x="115" y="41"/>
<section x="342" y=" 481" w="64" h="64"/>
<position x="153" y="41"/>
</image>
</images>
</InGameUiS>
Expand All @@ -197,32 +206,32 @@
<InGameUiR>
<images>
<image name="basic_ritz">
<section x="167" y="545" w="36" h="36"/>
<position x="561" y="679 "/>
<section x="650" y="126" w="51" h="51"/>
<position x="40" y="630 "/>
</image>
<image name="ability1_ritz">
<section x="0" y="482" w="36" h="36"/>
<position x="601" y="679"/>
<section x="704" y="126" w="51" h="51"/>
<position x="100" y="630"/>
</image>
<image name="ability2_ritz">
<section x="37" y="482" w="36" h="36"/>
<position x="641" y="679"/>
<section x="755" y="126" w="51" h="51"/>
<position x="160" y="630"/>
</image>
<image name="ulti_ritz">
<section x="74" y="482" w="35" h="36"/>
<position x="681" y="679"/>
<section x="807" y="126" w="51" h="51"/>
<position x="220" y="630"/>
</image>
<image name="ritz">
<section x="204" y="545" w="53" h="64"/>
<position x="41" y="35"/>
<section x="940" y="1" w="92" h="96"/>
<position x="41" y="33"/>
</image>
<image name="player2">
<section x="570" y="482" w="55" h="28"/>
<position x="188" y="41"/>
<section x="283" y=" 481" w="58" h="64"/>
<position x="229" y="41"/>
</image>
<image name="player3">
<section x="514" y="511" w="55" h="28"/>
<position x="115" y="41"/>
<section x="407" y="481" w="62" h="62"/>
<position x="153" y="41"/>
</image>
</images>
</InGameUiR>
Expand Down Expand Up @@ -266,17 +275,14 @@
<section x="0" y="1531" w="1280" h="720"/>
<position x="0" y="0"/>
</image>
<image name="TitleSettings">
<section x="911" y="111" w="269" h="65"/>
<position x="504" y="109"/>
</image>
</images>

<labels>
<label name="test">
<position x="0" y="0"/>
<color R="255" G="255" B="255" A="255"/>
<text value="Hello this is just a test to see
if this can handle different lines
I doubt it xD Lmao"/>

</label>

</labels>

<panelBars>
Expand All @@ -285,21 +291,23 @@
<section_bar x="1102" y="618" w="165" h="43"/>
<position x="588" y="267"/>
<section_thumb x="1115" y="558" w="29" h="38"/>
<image_idle x="504" y="722" w="58" h="59"/>
<image_hover x="221" y="721" w="61" h="61"/>
<image_idle x="470" y="481" w="55" h="53"/>
<image_hover x="219" y="566" w="56" h="54"/>
<type value = "HORIZONTAL"/>
</panelBar>
<panelBar name="fxSlider">
<section_bar x="1102" y="618" w="165" h="43"/>
<position x="588" y="364"/>
<section_thumb x="1115" y="558" w="29" h="38"/>
<image_idle x="504" y="722" w="58" h="59"/>
<image_hover x="221" y="721" w="61" h="61"/>
<type value = "HORIZONTAL"/>
</panelBar>

</panelBars>

<PanelCheckboxes>

<!--
<PanelCheckbox name="test_checkbox" function = "FpsCap">
<panelPosition x="588" y="473"/>
<panelSection x="293" y="666" w="200" h="36"/>
Expand All @@ -316,7 +324,7 @@
</checkboxLabels>
</PanelCheckbox>

-->
</PanelCheckboxes>

<buttons>
Expand All @@ -332,6 +340,11 @@

<SettingsInGame>

<images>

</images>


<labels>
<label name="test">
<position x="530" y="70"/>
Expand All @@ -341,16 +354,31 @@
</labels>

<buttons>
<button name="button_backMenu" function = "GoBackToStartMenu">
<idleSec x="1061" y="772" w="195" h="37"/>
<hoverSec x="1061" y="732" w="196" h="39" />
<clickSec x="1061" y="692" w="196" h="39" />
<position x="530" y="500"/>
</button>
<button name="button_backGame" function = "GoBackToGame">
<idleSec x="585" y="678" w="93" h="40"/>
<hoverSec x="585" y="719" w="94" h="42" />
<clickSec x="585" y="762" w="95" h="42" />
<position x="588" y="561"/>
<position x="530" y="561"/>
</button>
</buttons>

</SettingsInGame>

<Inventory>
<images>
<image name="inventoryPanel">
<section x="1" y="1" w="369" h="406"/>
<position x="750" y="190"/>
</image>
</images>
</Inventory>

</scene>


Expand Down
Binary file modified Game/gui/atlasUi.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8bc4965

Please sign in to comment.