Commit 7390077c authored by Michael Ochmann's avatar Michael Ochmann
Browse files

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop

parents 75b273af 26cd597e
No preview for this file type
No preview for this file type
......@@ -32,10 +32,6 @@ public:
return collision_data_manager_;
}
auto& collision_components() {
return collision_components_;
}
private:
void register_movement_component(movement_component* comp);
void unregister_movement_component(movement_component* comp);
......
dome_diffuse.dds : 17
piratenschiff_material.dds : 4
deathstar_material.dds : 23
coin.dds : 22
next_id : 24
planet_textur.dds : 19
victim2_diffuse.dds : 16
black.dds.001.dds : 8
greyscale_normal.dds.001.dds : 14
deathstar.dds : 20
dome_material.dds : 18
beam_stripes.dds : 13
weighted_companion_cube_export_material.dds : 3
black.dds : 7
greyscale_normal.dds : 2
piratenschiff_diffuse.dds : 5
Meteor_normal_2.dds : 21
beam.dds : 12
piratenschiff_normal.dds : 6
Meteor_LOW_Normals.dds : 10
cannon.dds : 11
Meteor_normal_2.dds : 21
victim_diffuse.dds : 15
greyscale_normal.dds : 2
black.dds : 7
beam_stripes.dds : 13
weighted_companion_cube_export_material.dds : 3
deathstar.dds : 20
dome_material.dds : 18
greyscale_normal.dds.001.dds : 14
black.dds.001.dds : 8
planet_textur.dds : 19
victim2_diffuse.dds : 16
weighted_companion_cube_export.dds : 1
cannon.dds : 11
Meteor_LOW_Normals.dds : 10
Texture_Meteor.dds : 9
next_id : 24
coin.dds : 22
deathstar_material.dds : 23
weighted_companion_cube_export.dds : 1
piratenschiff_material.dds : 4
dome_diffuse.dds : 17
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment