steffo/stack
steffo/stack
1
Fork 0
mirror of https://github.com/Steffo99/stack.git synced 2024-11-25 09:14:19 +00:00
Code Activity

Riorganizzazione.

Browse source
This commit is contained in:
Steffo 2013-07-17 16:41:33 +02:00
parent 53cbc956d6
commit 0b1535f2ab
1 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
boom.project.gmx
View file

@ -128,7 +128,6 @@
<objects name="objects"> <objects name="objects">
<objects name="Oggetti"> <objects name="Oggetti">
<object>objects\o_generale</object> <object>objects\o_generale</object>
<object>objects\o_wall_norm</object>
<object>objects\o_CD</object> <object>objects\o_CD</object>
<objects name="Squadre"> <objects name="Squadre">
<object>objects\o_squadra_sin</object> <object>objects\o_squadra_sin</object>
@ -209,29 +208,58 @@
<object>objects\o_chiave_green</object> <object>objects\o_chiave_green</object>
</objects> </objects>
</objects> </objects>
<objects name="Muri"/> <objects name="Muri">
<objects name="Invulnerabili">
<<<<<<< HEAD
<object>objects\o_wall_inv</object>
<object>objects\o_wall_inv_L_D</object>
<object>objects\o_wall_inv_L_U</object>
<object>objects\o_wall_inv_R_U</object>
<object>objects\o_wall_inv_R_D</object>
<object>objects\o_wall_inv_classic</object>
<object>objects\o_wall_inv_totem</object>
<object>objects\o_wall_inv_sandbox</object>
<objects name="Speciali">
<object>objects\o_wall_inv_lock</object>
<object>objects\o_magnet</object>
</objects>
=======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
<objects name="Go To">
<object>objects\o_move_freeplay_levels</object>
<object>objects\o_move_strategy</object>
<object>objects\o_move_twotris</object>
<object>objects\o_move_maxi</object>
<object>objects\o_move_sidewalls</object>
<object>objects\o_move_classic</object>
<object>objects\o_move_stairs</object>
<object>objects\o_move_sandbox</object>
</objects>
<<<<<<< HEAD
=======
<object>objects\o_wall_inv</object>
<object>objects\o_wall_inv_L_D</object>
<object>objects\o_wall_inv_L_U</object>
<object>objects\o_wall_inv_R_U</object>
<object>objects\o_wall_inv_R_D</object>
<object>objects\o_wall_inv_classic</object>
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
</objects>
<objects name="Piazzabili">
<object>objects\o_wall_norm</object>
</objects>
</objects>
<<<<<<< HEAD
=======
</objects> </objects>
<objects name="Pezzi"> <objects name="Pezzi">
<object>objects\o_wall_inv</object>
<object>objects\o_move_freeplay_levels</object>
<object>objects\o_move_strategy</object>
<object>objects\o_wall_inv_classic</object>
<object>objects\o_wall_inv_totem</object> <object>objects\o_wall_inv_totem</object>
<object>objects\o_wall_inv_sandbox</object> <object>objects\o_wall_inv_sandbox</object>
<object>objects\o_wall_inv_L_D</object>
<object>objects\o_wall_inv_L_U</object>
<object>objects\o_wall_inv_R_U</object>
<object>objects\o_wall_inv_R_D</object>
<object>objects\o_move_twotris</object>
<object>objects\o_move_maxi</object>
<object>objects\o_move_sidewalls</object>
<object>objects\o_move_classic</object>
<object>objects\o_move_sandbox</object>
<object>objects\o_move_stairs</object>
<object>objects\o_wall_inv_lock</object> <object>objects\o_wall_inv_lock</object>
<object>objects\o_magnet</object> <object>objects\o_magnet</object>
<object>objects\o_sea</object> <object>objects\o_sea</object>
<object>objects\d_fix_count_ent</object> <object>objects\d_fix_count_ent</object>
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
</objects> </objects>
<objects name="Script"> <objects name="Script">
<object>objects\menus</object> <object>objects\menus</object>
@ -245,6 +273,8 @@
<object>objects\strategy</object> <object>objects\strategy</object>
<object>objects\boom</object> <object>objects\boom</object>
<object>objects\money</object> <object>objects\money</object>
<object>objects\d_fix_count_ent</object>
<object>objects\o_sea</object>
</objects> </objects>
</objects> </objects>
<rooms name="rooms"> <rooms name="rooms">