Commit ec978088 authored by Elias Broschin's avatar Elias Broschin
Browse files

Merge branch 'feature/gameplay/commons' of...

Merge branch 'feature/gameplay/commons' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into feature/gameplay/commons
parents a7f9b2a0 631ed302
......@@ -10,6 +10,8 @@
#include <physics/collision/ray.h>
#include <util/list_helper.h>
#include <util/make_unique.hpp>
#include <util/list_helper.h>
namespace gdw {
......@@ -26,6 +28,7 @@ namespace gdw {
if(equipped_item_ == item_type::NONE)
return;
switch(equipped_item_) {
case item_type::magnet_field: {
auto& placed_item = engine_.entity_manager().emplace_back(world_pos, glm::angleAxis(glm::radians(90.f), glm::vec3(1,0,0)));
......
......@@ -272,6 +272,7 @@ namespace gdw {
auto &victim = entity_manager.emplace_back(glm::vec3(-40.f, 3.f, z), glm::angleAxis(glm::radians(90.f), glm::vec3(0.f, 1.f, 0.f)));
victim.scale(glm::vec3(0.4f));
srand(time(0)*time(0));
int r = rand() % 2 + 1;
std::string col_name = "";
......
Subproject commit ad9ab973a17ebbf0471883a5d25d9f295c56af59
Subproject commit 3d4dbe849e8db70238497c1546f390aea8cf51bb
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