Skip to content

MyBranch #1

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
albertec1 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

MyBranch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b1bc4
MyBranch
albertec1 Dec 1, 2019
2ecf146
Tetures working propperly with Identities
albertec1 Dec 6, 2019
d18243a
Both maps fixed
albertec1 Dec 7, 2019
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
29 changes: 17 additions & 12 deletions SantaRules/Game/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- Config file for the game -->

<config>
<app framerate_cap ="30">
<title>Santa Rules</title>
<app>
<title>Game Development Testbed</title>
<organization>UPC</organization>
</app>

Expand Down Expand Up @@ -31,12 +31,11 @@
<player_stats>
<character_width value="48"/>
<character_height value="75"/>
<InitialPos_x value="130"/>
<InitialPos_y value="185"/>
<InitialPos_x value="75"/>
<InitialPos_y value="20"/>
<PlayerVel_w value="3"/>
<PlayerVel_r value="6"/>
<Gravity value="4.0f"/>
<PlayerVel_Y value="450.0"/>
<falling_velocity value="10.0f"/>
<slide_distance value="40"/>
</player_stats>
Expand All @@ -54,12 +53,18 @@
</main_collider>
</colliders>
</player>
<enemy>
<enemy_stats>
<character_width value="48"/>
<character_height value="75"/>
<InitialPos_x value="270"/>
<InitialPos_y value="20"/>
<PlayerVel_w value="3"/>
<PlayerVel_r value="6"/>
<Gravity value="4.0f"/>
<falling_velocity value="10.0f"/>
<slide_distance value="40"/>
</enemy_stats>
</enemy>
</entityManager>

<scene>
<map_name name="map_1.tmx"></map_name>
<map_name name="map_2.tmx"></map_name>
<transition_time value ="1"/>
</scene>

</config>
44 changes: 22 additions & 22 deletions SantaRules/Game/maps/map_1.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.2" tiledversion="1.2.4" orientation="orthogonal" renderorder="right-down" width="150" height="45" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1">
<map version="1.2" tiledversion="1.2.5" orientation="orthogonal" renderorder="right-down" width="150" height="45" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1">
<tileset firstgid="1" name="Platformer_tileset" tilewidth="32" tileheight="32" tilecount="144" columns="16">
<image source="snow tileset.png" width="512" height="288"/>
</tileset>
<tileset firstgid="145" name="Platformer_tileset" tilewidth="32" tileheight="32" tilecount="144" columns="16">
<image source="snow tileset.png" width="512" height="288"/>
</tileset>
<layer id="3" name="Terrain" width="150" height="45" opacity="0.48">
<layer id="3" name="Terrain" width="150" height="45">
<data>
<tile/>
<tile/>
Expand Down Expand Up @@ -1550,14 +1550,14 @@
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile/>
Expand Down Expand Up @@ -1700,14 +1700,14 @@
<tile/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
Expand Down Expand Up @@ -1849,13 +1849,13 @@
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
Expand Down Expand Up @@ -1995,15 +1995,15 @@
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="97"/>
<tile gid="99"/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile/>
Expand Down Expand Up @@ -2145,21 +2145,21 @@
<tile gid="99"/>
<tile/>
<tile/>
<tile/>
<tile gid="55"/>
<tile gid="57"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="97"/>
<tile gid="98"/>
<tile gid="98"/>
<tile gid="99"/>
<tile gid="23"/>
<tile gid="25"/>
Expand Down Expand Up @@ -2301,16 +2301,16 @@
<tile/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile gid="98"/>
<tile/>
<tile/>
<tile gid="55"/>
<tile gid="56"/>
<tile gid="56"/>
<tile gid="56"/>
<tile gid="12"/>
<tile gid="25"/>
<tile/>
Expand Down Expand Up @@ -2451,10 +2451,10 @@
<tile/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
Expand Down Expand Up @@ -3215,8 +3215,8 @@
<tile gid="19"/>
<tile/>
<tile/>
<tile/>
<tile gid="55"/>
<tile gid="56"/>
<tile gid="57"/>
<tile gid="19"/>
<tile/>
Expand Down Expand Up @@ -4862,9 +4862,9 @@
<tile gid="114"/>
<tile/>
<tile/>
<tile gid="55"/>
<tile gid="56"/>
<tile gid="57"/>
<tile/>
<tile gid="59"/>
<tile/>
<tile/>
<tile/>
<tile gid="17"/>
Expand Down Expand Up @@ -5310,7 +5310,6 @@
<tile gid="114"/>
<tile gid="114"/>
<tile gid="55"/>
<tile gid="56"/>
<tile gid="57"/>
<tile/>
<tile/>
Expand All @@ -5324,6 +5323,7 @@
<tile/>
<tile/>
<tile/>
<tile/>
<tile gid="49"/>
<tile gid="134"/>
<tile gid="39"/>
Expand Down
6 changes: 4 additions & 2 deletions SantaRules/Game/maps/map_2.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.2" tiledversion="1.2.4" orientation="orthogonal" renderorder="right-down" width="150" height="45" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1">
<tileset firstgid="1" source="../SantaRules/Game/Spritesheets/snow_tileset.tsx"/>
<map version="1.2" tiledversion="1.2.5" orientation="orthogonal" renderorder="right-down" width="150" height="45" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1">
<tileset firstgid="1" name="snow_tileset" tilewidth="32" tileheight="32" tilecount="144" columns="16">
<image source="platformer_tileset.png" width="512" height="288"/>
</tileset>
<layer id="5" name="Terrain" width="150" height="45">
<data>
<tile/>
Expand Down
Loading