links / lamps

diff --cc include/world.h
Simple merge

diff --cc src/world.cpp
Simple merge

diff --cc test.frag
index c6ff3c9c6c381b793be61ef9a2bba7655363c38e,80c741b8284633cb70f400631a1645f3be3ca578..5c9054ea227b3bce951a7f48bdc5ae05698aae9f
--- 1/test.frag
--- 2/test.frag
+++ b/test.frag
@@@ -25,3 -26,12 +26,12 @@@ void main()
        color += vec4(amb,amb,amb,1.0f+amb);\r
        gl_FragColor = tex * vec4(color)*tex.a;\r
  }\r
 -/*b values\r
+ \r
 -      .008            50\r
 -      .0005           200\r
 -      .00008          500\r
 -      .00002          1000\r
++/*    b values\r
+       .002            10\r
 -*/
++      .008            50\r
++      .0005           200\r
++      .00008          500\r
++      .00002          1000\r
+       .00005          2000\r
++*/\r

diff --cc xml/playerSpawnHill1.xml
Simple merge