]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
update
authorPeter Schaefer <schaeferpm@gmail.com>
Fri, 24 Jun 2016 13:34:58 +0000 (15:34 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Fri, 24 Jun 2016 13:34:58 +0000 (15:34 +0200)
Weave/Game.cpp
models/boar.blend
models/boar.blend1

index 672ed578be8ce040360849725dccfad614a8f339..1189bc2cde0af7d7a3770ea8ad3fed3cfd1833f3 100644 (file)
@@ -79,7 +79,7 @@ Game::Game() : playing(true)
        lever1->setup(door2);\r
 \r
        //Lever* lever2 = new Lever(translate(vec3(86.f, -18.f, 5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_duck_2D.png");\r
-       Lever* lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_duck_2D.png");\r
+       Lever* lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png");\r
        current_world->addObject(lever2);\r
        lever2->setAnimationLoop(false);\r
        lever2->timeresistant = true;\r
index 62c04f8a8ba3d9eb11319feadfd0b94bd11ca1eb..fb4275fd64ce488af3b806fab2bf29a769927de4 100644 (file)
Binary files a/models/boar.blend and b/models/boar.blend differ
index 32cffb7df125c1b6b2dc7edf1d637cd3af9cc368..62c04f8a8ba3d9eb11319feadfd0b94bd11ca1eb 100644 (file)
Binary files a/models/boar.blend1 and b/models/boar.blend1 differ