Skip to content

Develop #18

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

Open
MarcFly wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Develop #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4b67d92
Timer done
MarcFly Dec 17, 2017
06fc127
Merge pull request #13 from MarcFly/InGame-Timer
MarcFly Dec 17, 2017
f2bc486
timer done
MarcFly Dec 17, 2017
3cd3169
Coin and score working
MarcFly Dec 17, 2017
7fbe89b
Merge branch 'Develop' into UI
Andreu997 Dec 17, 2017
3f50da2
Merge pull request #16 from MarcFly/UI
Andreu997 Dec 17, 2017
e351647
Updated initial volume
Andreu997 Dec 17, 2017
4617a65
Coin and Score Counter
MarcFly Dec 17, 2017
1e8302d
Coin and Score Counter
MarcFly Dec 17, 2017
cce5ed4
now the player can fly in godmode (w/s-up/down)
Andreu997 Dec 17, 2017
51198b3
Merge branch 'Develop' into Coins
MarcFly Dec 17, 2017
db453e1
Merge pull request #17 from MarcFly/Coins
MarcFly Dec 17, 2017
1dd7a5e
crash solved
Andreu997 Dec 17, 2017
aa77a3e
Scale was not given
MarcFly Dec 17, 2017
ea629b9
added collision and make th ecounter work
MarcFly Dec 17, 2017
4f6f8dc
killing enemies gives score + save coins/score
Andreu997 Dec 17, 2017
b6433d5
Now life, coins and score are loaded when loading
Andreu997 Dec 17, 2017
d4302a6
Texture/animation for coins
Andreu997 Dec 17, 2017
5874a55
Coins position updated
Andreu997 Dec 17, 2017
c35e336
recommit
Andreu997 Dec 17, 2017
0f68e96
No F if no G(ame)
MarcFly Dec 17, 2017
6e62bcf
Music between menu-play
Andreu997 Dec 17, 2017
1893334
changed volum for save file
Andreu997 Dec 17, 2017
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
34 changes: 32 additions & 2 deletions 1/Game/Maps/Lvl_1.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="15" tilewidth="64" tileheight="64" nextobjectid="104">
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="15" tilewidth="64" tileheight="64" nextobjectid="138">
<properties>
<property name="scale" type="float" value="1"/>
<property name="start_x" type="int" value="516"/>
Expand Down Expand Up @@ -6839,6 +6839,32 @@
<object id="86" type="66" x="6336" y="512" width="64" height="448"/>
<object id="87" type="66" x="5952" y="896" width="384" height="64"/>
<object id="88" type="66" x="0" y="0" width="448" height="448"/>
<object id="106" type="69" x="960" y="768" width="64" height="64"/>
<object id="107" type="69" x="576" y="768" width="64" height="64"/>
<object id="108" type="69" x="768" y="576" width="64" height="64"/>
<object id="109" type="69" x="960" y="576" width="64" height="64"/>
<object id="110" type="69" x="1216" y="448" width="64" height="64"/>
<object id="111" type="69" x="1024" y="448" width="64" height="64"/>
<object id="112" type="69" x="1088" y="704" width="64" height="64"/>
<object id="113" type="69" x="1344" y="704" width="64" height="64"/>
<object id="114" type="69" x="1664" y="576" width="64" height="64"/>
<object id="115" type="69" x="2112" y="576" width="64" height="64"/>
<object id="116" type="69" x="2944" y="576" width="64" height="64"/>
<object id="117" type="69" x="3456" y="576" width="64" height="64"/>
<object id="118" type="69" x="3584" y="768" width="64" height="64"/>
<object id="119" type="69" x="3776" y="768" width="64" height="64"/>
<object id="120" type="69" x="3968" y="768" width="64" height="64"/>
<object id="121" type="69" x="4160" y="768" width="64" height="64"/>
<object id="122" type="69" x="4224" y="768" width="64" height="64"/>
<object id="123" type="69" x="4480" y="768" width="64" height="64"/>
<object id="124" type="69" x="4352" y="512" width="64" height="64"/>
<object id="125" type="69" x="4608" y="512" width="64" height="64"/>
<object id="126" type="69" x="4736" y="384" width="64" height="64"/>
<object id="127" type="69" x="5056" y="384" width="64" height="64"/>
<object id="129" type="69" x="5248" y="384" width="64" height="64"/>
<object id="130" type="69" x="5632" y="384" width="64" height="64"/>
<object id="131" type="69" x="6016" y="384" width="64" height="64"/>
<object id="132" type="69" x="6400" y="384" width="64" height="64"/>
</objectgroup>
<objectgroup color="#00007f" name="Trigger Collision">
<properties>
Expand All @@ -6851,7 +6877,7 @@
<properties>
<property name="type" type="int" value="1"/>
</properties>
<object id="92" type="0" x="537" y="574"/>
<object id="92" type="0" x="576" y="576"/>
<object id="93" type="1" x="772" y="770"/>
<object id="94" type="3" x="1169.7" y="51.5152"/>
<object id="95" type="3" x="2000" y="57.5758"/>
Expand All @@ -6862,5 +6888,9 @@
<object id="101" type="3" x="5221.21" y="157.576"/>
<object id="102" type="1" x="5478.79" y="378.788"/>
<object id="103" type="1" x="4075.76" y="763.636"/>
<object id="104" type="4" x="878" y="565"/>
<object id="135" type="4" x="4818" y="751.667"/>
<object id="136" type="4" x="2383" y="788"/>
<object id="137" type="4" x="1426" y="661.333"/>
</objectgroup>
</map>
27 changes: 19 additions & 8 deletions 1/Game/Maps/Lvl_2.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="15" tilewidth="64" tileheight="64" nextobjectid="64">
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="15" tilewidth="64" tileheight="64" nextobjectid="75">
<properties>
<property name="parallax_speed" type="float" value="1"/>
<property name="scale" type="float" value="1"/>
Expand Down Expand Up @@ -4553,7 +4553,7 @@
<object id="31" type="66" x="1280" y="640" width="63" height="317"/>
<object id="32" type="66" x="1216" y="384" width="191" height="64"/>
<object id="33" type="66" x="1600" y="256" width="191" height="190"/>
<object id="34" type="66" x="1664" y="768" width="64" height="64"/>
<object id="34" type="66" x="1664" y="640" width="64" height="320"/>
<object id="35" type="66" x="1664" y="575" width="703" height="65"/>
<object id="36" type="66" x="2111" y="448" width="66" height="127"/>
<object id="37" type="66" x="2047" y="258" width="193" height="189"/>
Expand Down Expand Up @@ -4581,6 +4581,14 @@
<object id="59" type="66" x="4799" y="511" width="66" height="320"/>
<object id="60" type="66" x="3456" y="832" width="2944" height="63"/>
<object id="61" type="66" x="704" y="63" width="5694" height="63"/>
<object id="64" type="69" x="0" y="704" width="64" height="64"/>
<object id="65" type="69" x="640" y="704" width="64" height="64"/>
<object id="66" type="69" x="1536" y="192" width="64" height="64"/>
<object id="67" type="69" x="1792" y="192" width="64" height="64"/>
<object id="68" type="69" x="2816" y="512" width="64" height="64"/>
<object id="69" type="69" x="3072" y="512" width="64" height="64"/>
<object id="70" type="69" x="2880" y="768" width="64" height="64"/>
<object id="71" type="69" x="3264" y="768" width="64" height="64"/>
</objectgroup>
<objectgroup color="#4f09e8" name="Trigger Collision">
<properties>
Expand All @@ -4594,11 +4602,14 @@
<property name="type" type="int" value="1"/>
</properties>
<object id="9" type="0" x="333" y="690" width="24" height="23"/>
<object id="10" type="3" x="527" y="725"/>
<object id="11" type="1" x="1657" y="192"/>
<object id="12" type="1" x="2141" y="199"/>
<object id="13" type="3" x="2975" y="549"/>
<object id="14" type="3" x="3076" y="791"/>
<object id="15" type="1" x="4332" y="200"/>
<object id="10" type="1" x="527" y="725"/>
<object id="11" type="3" x="1657" y="192"/>
<object id="12" type="3" x="2141" y="199"/>
<object id="13" type="1" x="2975" y="549"/>
<object id="14" type="1" x="3076" y="791"/>
<object id="15" type="3" x="4332" y="200"/>
<object id="72" type="4" x="1265" y="492"/>
<object id="73" type="4" x="2223" y="491"/>
<object id="74" type="4" x="4898" y="534"/>
</objectgroup>
</map>
Binary file added 1/Game/audio/music/menu_music.ogg
View file
Open in desktop
Binary file not shown.
14 changes: 12 additions & 2 deletions 1/Game/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,22 @@
</collisions>

<audio>
<master_volume value="0"/>"
<master_volume value="1"/>"
<music_volume value="1"/>
<fx_volume value="0"/>
<fx_volume value="1"/>
<fade_time value="2"/>
<repeat value="0"/>
</audio>

<gui>
<atlas file="gui/atlas.png"/>
<objects>

<obj group="3" x="70" y="50" size="3" type="15" posx="0" posy="0"/>
<obj group="3" x="70" y="20" size="3" type="1" posx="0" posy="0" content="Score"/>
<obj group="3" x="700" y="50" size="3" type="15" posx="0" posy="1000"/>
<obj group="3" x="680" y="20" size="3" type="1" posx="0" posy="0" content="Coins Collected"/>

<obj x="0" y="0" w="1024" h="768" size="1" type="2" posx="0" posy="0" group="4"/>
<obj x="1026" y="1" w="118" h="65" size="1" type="11" posx="800" posy="600" group="0" content="START GAME" offx="22" offy="20"/>
<obj x="1026" y="1" w="118" h="65" size="1" type="7" posx="800" posy="520" group="0" content="CONTINUE" offx="22" offy="20"/>
Expand All @@ -57,6 +63,10 @@
<obj x="1026" y="1" w="118" h="65" size="1" type="8" posx="500" posy="600" group="0" content="CREDITS" offx="22" offy="20"/>
<obj x="1027" y="70" w="631" h="375" size="1" type="2" posx="200" posy="300" group="2"/>
<obj x="1026" y="1" w="118" h="65" size="1" type="9" posx="350" posy="600" group="0" content="EXIT" offx="22" offy="20"/>

<obj group="3" x="400" y="50" w="200" h="200" max_time="150" size="3" type="14" posx="600" posy="200"/>
<obj group="3" x="395" y="20" size="3" type="1" posx="0" posy="0" content="Timer"/>

</objects>
</gui>

Expand Down
74 changes: 60 additions & 14 deletions 1/Game/savegame.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<window />
<textures />
<audio>
<master_volume value="0" />
<master_volume value="1" />
</audio>
<fonts />
<gui />
Expand All @@ -13,10 +13,10 @@
</map>
<pathfinding />
<collisions />
<entities>
<entities time="4294934554">
<entity type="0" entity_id="0">
<speed x="0" y="0" />
<position x="537" y="580" />
<position x="576" y="644" />
<state type="0" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="40" h="60" />
Expand All @@ -25,10 +25,12 @@
<max_speed x="8" y="16" />
<render_scale value="1" />
<life value="4" />
<score value="0" />
<coins value="0" />
</entity>
<entity type="1" entity_id="0">
<speed x="2" y="1" />
<position x="809" y="788" />
<position x="804" y="783" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -39,7 +41,7 @@
</entity>
<entity type="3" entity_id="0">
<speed x="1.41421354" y="0" />
<position x="1190" y="51" />
<position x="1189" y="51" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -50,7 +52,7 @@
</entity>
<entity type="3" entity_id="1">
<speed x="1.41421354" y="0" />
<position x="2021" y="57" />
<position x="2020" y="57" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -61,7 +63,7 @@
</entity>
<entity type="3" entity_id="2">
<speed x="1.41421354" y="0" />
<position x="2708" y="57" />
<position x="2707" y="57" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -72,7 +74,7 @@
</entity>
<entity type="1" entity_id="1">
<speed x="2" y="1" />
<position x="1949" y="602" />
<position x="1944" y="597" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -83,7 +85,7 @@
</entity>
<entity type="1" entity_id="2">
<speed x="2" y="1" />
<position x="3252" y="575" />
<position x="3247" y="570" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -94,7 +96,7 @@
</entity>
<entity type="3" entity_id="3">
<speed x="1.41421354" y="0" />
<position x="4005" y="296" />
<position x="4004" y="296" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -105,7 +107,7 @@
</entity>
<entity type="3" entity_id="4">
<speed x="1.41421354" y="0" />
<position x="5242" y="157" />
<position x="5241" y="157" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -116,7 +118,7 @@
</entity>
<entity type="1" entity_id="3">
<speed x="2" y="1" />
<position x="5515" y="396" />
<position x="5510" y="391" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -127,7 +129,7 @@
</entity>
<entity type="1" entity_id="4">
<speed x="2" y="1" />
<position x="4112" y="781" />
<position x="4107" y="776" />
<state type="1" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
Expand All @@ -136,9 +138,53 @@
<max_speed x="2" y="1" />
<render_scale value="2" />
</entity>
<entity type="4" entity_id="0">
<speed x="0" y="0" />
<position x="878" y="565" />
<state type="0" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
<acceleration x="0" y="0" />
<jump_force value="0" />
<max_speed x="0" y="0" />
<render_scale value="0.5" />
</entity>
<entity type="4" entity_id="1">
<speed x="0" y="0" />
<position x="4818" y="751" />
<state type="0" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
<acceleration x="0" y="0" />
<jump_force value="0" />
<max_speed x="0" y="0" />
<render_scale value="0.5" />
</entity>
<entity type="4" entity_id="2">
<speed x="0" y="0" />
<position x="2383" y="788" />
<state type="0" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
<acceleration x="0" y="0" />
<jump_force value="0" />
<max_speed x="0" y="0" />
<render_scale value="0.5" />
</entity>
<entity type="4" entity_id="3">
<speed x="0" y="0" />
<position x="1426" y="661" />
<state type="0" />
<flip value="false" />
<collision_box offset_x="" offset_y="" w="30" h="30" />
<acceleration x="0" y="0" />
<jump_force value="0" />
<max_speed x="0" y="0" />
<render_scale value="0.5" />
</entity>
</entities>
<scene />
<renderer>
<camera x="-237" y="-180" />
<camera x="-276" y="-180" />
</renderer>
</savegame>
Binary file added 1/Game/textures/coins.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 51 additions & 1 deletion 1/Game/textures/sprites.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@
<speed x="0" y="0"/>
<flip value="false"/>
</entity>
<entity type="4">
<max_speed x="0" y="0"/>
<acceleration x="0" y="0"/>
<jump_force value="0"/>
<collision_box offset_x="" offset_y="" h="30" w="30"/>
<render_scale value="0.5"/>
<state value="0"/>
<speed x="0" y="0"/>
<flip value="false"/>
</entity>
</map>
<!--///////////////////////////////////////////////////////////////////-->
<!-- ENTITY ANIMATIONS -->
Expand Down Expand Up @@ -78,7 +88,27 @@
<!-- Last Frame is while still going down-->
</animation>
</animations>


<animations type="3" source="FlyingFish.png" w="22" h="15">
<animation name="idle" offset_x="0" offset_y="0" speed="0.2" loop="false">
<rect x="0" y="0"/>
</animation>
<animation name="move" offset_x="0" offset_y="0" speed="0.2" loop="true">
<rect x="0" y="0"/>
<rect x="24" y="0"/>
<rect x="48" y="0"/>
<rect x="72" y="0"/>
<rect x="96" y="0"/>
<rect x="120" y="0"/>
</animation>
<animation name="jump" offset_x="0" offset_y ="0" speed="0.2" loop="false" >
<rect x="0" y="0"/>
</animation >
<animation name="fall" offset_x="0" offset_y="0" speed="0.2" loop="false">
<rect x="0" y="0"/>
</animation>
</animations>

<animations type="1" source="Snake.png" w="22" h="21">
<animation name="idle" offset_x="18" offset_y="12" speed="0.6" loop="true">
<rect x="0" y="0"/>
Expand Down Expand Up @@ -123,6 +153,26 @@
<animation name="fall" offset_x="0" offset_y="0" speed="0.2" loop="false">
<rect x="0" y="0"/>
</animation>

</animations>
<animations type="4" source="coins.png" w="96" h="96">
<animation name="idle" offset_x="32" offset_y="36" speed="0.1" loop="true">
<rect x="5" y="52"/>
<rect x="127" y="52"/>
<rect x="244" y="52"/>
<rect x="364" y="52"/>
<rect x="483" y="52"/>
<rect x="604" y="52"/>
</animation>
<animation name="move" offset_x="0" offset_y="0" speed="0.2" loop="true">
<rect x="0" y="0"/>
</animation>
<animation name="jump" offset_x="0" offset_y ="0" speed="0.2" loop="false" >
<rect x="0" y="0"/>
</animation >
<animation name="fall" offset_x="0" offset_y="0" speed="0.2" loop="false">
<rect x="0" y="0"/>
</animation>
</animations>

<!--///////////////////////////////////////////////////////////////////-->
Expand Down
Loading