sfroitzheim
|
c899c4e67e
|
Fixed some display bugs with the column.
|
2014-12-05 14:49:23 +01:00 |
|
Steffen Fündgens
|
41584ef993
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 14:45:57 +01:00 |
|
Steffen Fündgens
|
24edf1aca9
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +01:00 |
|
sfroitzheim
|
73d5e5fd52
|
Added a movable Block that will be used to be pushed on switches.
|
2014-12-05 14:39:51 +01:00 |
|
sfroitzheim
|
d4168fb002
|
Changed Columntexture to something better.
|
2014-12-05 14:39:08 +01:00 |
|
Steffen Fündgens
|
5e44f9680e
|
integrating tinyxml into level, adding lights to compositions
|
2014-12-05 12:47:02 +01:00 |
|
Steffen Fündgens
|
0e06ae9fd3
|
changed filePath to levelNum
|
2014-12-04 15:07:31 +01:00 |
|
Steffen Fündgens
|
4adc1198b8
|
Merged master and converter
|
2014-12-02 13:17:33 +01:00 |
|
Steffen Fündgens
|
b6c694b350
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Faerbit
|
ed889ebd76
|
Reexporting Block.obj, because normals were missing.
|
2014-12-01 13:55:47 +01:00 |
|
Faerbit
|
8317188314
|
Removing big textures as they are not needed.
|
2014-11-29 02:06:46 +01:00 |
|
Faerbit
|
f3f870c2d1
|
Removing useless files.
|
2014-11-29 01:36:59 +01:00 |
|
Steffen Fündgens
|
9f1a931b0b
|
added example Compositions.xml, implemented most of newComposition() method
|
2014-11-28 17:05:49 +01:00 |
|
Faerbit
|
869e1ed415
|
Moved Blenderfiles out of Levels because of packaging.
|
2014-11-28 16:47:35 +01:00 |
|
sfroitzheim
|
414da9ba7e
|
Added switch models and textures in 2 seperate parts (switchInner is the movable object - size may needs to be changed in the future)
|
2014-11-28 16:38:55 +01:00 |
|
sfroitzheim
|
150a556c22
|
Added all blender files (except marble, as I don't have the newest and smoothed version)
|
2014-11-28 16:31:50 +01:00 |
|
sfroitzheim
|
00cdbe4c5e
|
Fixed origin of block.
|
2014-11-28 15:28:03 +01:00 |
|
Steffen Fündgens
|
6b904894c6
|
skeleton runs now, only xml read/write missing
|
2014-11-25 13:51:25 +01:00 |
|
Steffen Fündgens
|
7bf1d8eed4
|
converter now takes the Level to convert as input
|
2014-11-24 13:21:52 +01:00 |
|
Faerbit
|
3a9a04d4d6
|
Changed skybox to skydome.
|
2014-11-22 00:39:58 +01:00 |
|
Faerbit
|
c47ed4646d
|
Added skybox and refined fog a bit. Fog still needs a lot of work.
|
2014-11-21 02:38:03 +01:00 |
|
Faerbit
|
eadc819f80
|
Removing useless files.
|
2014-11-20 20:42:40 +01:00 |
|
Faerbit
|
2638b43b44
|
Resized large textures to one third of their size.
|
2014-11-18 19:39:44 +01:00 |
|
Steffen Fündgens
|
5a92765518
|
changed terrain normals to consider 8 vertices, looks the same
|
2014-11-18 13:09:55 +01:00 |
|
Faerbit
|
6a8182ab8d
|
Reexported objects and enabled smooth shading.
|
2014-11-17 22:03:28 +01:00 |
|
sfroitzheim
|
c403814cd6
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:31:48 +01:00 |
|
sfroitzheim
|
c58e4d01b1
|
Changing marble model.
|
2014-11-17 18:31:22 +01:00 |
|
Fabian Klemp
|
9611c9ef08
|
Changing sand texture to a seamless sand texture.
|
2014-11-17 18:18:57 +01:00 |
|
Fabian Klemp
|
29f24d6f05
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
6f7486b3f8
|
Fixed normals.
|
2014-11-17 15:19:19 +01:00 |
|
Fabian Klemp
|
4dc7897f8c
|
Removed middle Ring.
|
2014-11-17 15:04:59 +01:00 |
|
Fabian Klemp
|
48691338ba
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
0b7f8e95d3
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Steffen Fündgens
|
29f4cf6279
|
Reorganizing file structure.
|
2014-11-17 13:36:05 +01:00 |
|
Steffen Fündgens
|
8eec5fa49e
|
debuged the load function in terrain.cc loading and rendering kind of works (no texture)
|
2014-11-11 12:22:47 +01:00 |
|
Steffen Fündgens
|
c030799799
|
added 'Levels' folder to point filePaths at
|
2014-11-07 16:48:29 +01:00 |
|