Commit Graph

845 Commits

Author SHA1 Message Date
lanariel adcac0ec12 Random Updates 2014-02-14 14:27:38 +01:00
lanariel 8e78308820 New Vertex format NOT STABLE UNTIL NEW MODELS 2014-02-14 10:08:39 +01:00
lanariel e71264b806 New text render 2014-02-13 16:27:53 +01:00
lanariel 491dc88bd1 Fixed Glow Mapping 2014-02-13 15:24:19 +01:00
lanariel 5fbb901c69 Model Tint added 2014-02-12 16:21:46 +01:00
lanariel 11b6f6eddc Fixed Spec coefficient 2014-02-12 13:53:52 +01:00
lanariel da5b9c7306 Nomal Mapping For TA 2014-02-12 12:05:27 +01:00
lanariel e6316f3239 removed some old stuff, respect animation looping state 2014-02-12 09:32:15 +01:00
lanariel f92bed35f5 Colored Text and Tinted Gui elements 2014-02-12 09:24:37 +01:00
lanariel ebf313ccd6 2D transparancy 2014-02-12 08:35:21 +01:00
lanariel 474744c72a Fixed wierd ambience, 2DText Render and Lighting 2014-02-12 08:24:24 +01:00
lanariel f0df377bcd Basic 2d Render + Anim Updates 2014-02-11 13:29:19 +01:00
lanariel cc55a3471f Fixed Const View Proj 2014-02-10 16:22:23 +01:00
lanariel e0f3031187 Pointlight no pointer Model render pointer 2014-02-10 16:08:03 +01:00
lanariel b80f594440 Changed Animated model 2014-02-10 15:11:33 +01:00
lanariel 8ff81fb06a Fixed compatability with Gamelogic 2014-02-10 14:54:54 +01:00
lanariel 7167d042ac Merge remote-tracking branch 'origin/GameLogic' into Graphics
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
	Code/OysterGraphics/Shader/Passes/Light/LightPass.hlsl
2014-02-10 14:41:04 +01:00
lanariel 77c3ba06aa Framerate fix in release 2014-02-10 14:39:26 +01:00
lanariel a3ba67e3c2 Fixed release compile and basic anim 2014-02-10 13:59:45 +01:00
lanariel d0f36302cf Fixed 2d render comment
Started on Anim API
2014-02-10 11:53:44 +01:00
lanariel adb273bd5b Fixed las bug in 2d rendering 2014-02-10 09:35:03 +01:00
lanariel e6e56ba21b Done with 2D 2014-02-10 01:03:10 +01:00
lanariel 1121bbdebf TODO::
Fix Pixel Data to Post Pass
2014-02-07 16:51:35 +01:00
lanariel 1de325c5a6 Fixed cleaning up Deffered.cpp 2014-02-07 15:52:07 +01:00
Pontus Fransson 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. 2014-02-07 15:20:34 +01:00
Pontus Fransson fef40f58f9 GL - Fixed memory leaks in LevelLoader. 2014-02-07 14:44:25 +01:00
Pontus Fransson 9bdf258c5d GL - Updated LevelLoader 2.0. Bounding volume 1.0
The ObjectSpecialType enum is not correct. It has to be updated.
2014-02-07 14:12:54 +01:00
lanariel 898fc883e9 Merge branch 'Graphics2D' into Graphics 2014-02-07 13:48:46 +01:00
lanariel d9133f459a 2d Almost working 2014-02-07 13:47:09 +01:00
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +01:00
lanariel 9a0f363146 framerate double 2014-02-07 13:15:38 +01:00
lanariel 5119b287d6 Small progress 2014-02-07 11:52:51 +01:00
lanariel bab3ab0a78 Shader Restructure 2014-02-07 11:09:59 +01:00
lanariel a7480ebf70 Proper Animation 2014-02-07 08:34:01 +01:00
lanariel bfa54b9ccd Fixed Anim 2014-02-05 17:13:23 +01:00
lanariel aafbfa01f3 Calculate Graphics Memory Usage 2014-02-05 16:54:57 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +01:00
lindaandersson 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:54:56 +01:00
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Pontus Fransson a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:47:00 +01:00
Pontus Fransson b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. 2014-02-05 15:46:45 +01:00
lindaandersson 70a2cf27e3 GL - almost ok, at least on the top of the world 2014-02-05 11:53:38 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 30c89ed330 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 09:06:44 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Robin Engman 98644e3fa0 Minimised to potential skinning problem 2014-02-04 17:59:04 +01:00
Dander7BD fb4025eb1a bug fix 2014-02-04 16:56:31 +01:00
lindaandersson ac278555ea Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:21 +01:00
lindaandersson b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:11 +01:00
lindaandersson ec4d34b131 GL - added error checking 2014-02-04 16:39:01 +01:00