Dander7BD
|
8bf13dab39
|
Merge remote-tracking branch 'origin/Graphics' into Camera-Merge-buffer
Conflicts:
Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl
|
2014-02-14 15:39:01 +01:00 |
lanariel
|
9096e548a1
|
Text Culling Fix
|
2014-02-14 15:31:38 +01:00 |
|
lanariel
|
655f48017c
|
Anim Fix
|
2014-02-14 15:11:12 +01:00 |
|
lanariel
|
adcac0ec12
|
Random Updates
|
2014-02-14 14:27:38 +01:00 |
lindaandersson
|
68dfd2e324
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-14 13:55:03 +01:00 |
|
lindaandersson
|
53f4848ea1
|
GL - merge with graphics. no SSAO. no TextRendering
|
2014-02-14 11:27:52 +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 |
Pontus Fransson
|
d4b7fbf1b4
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 09:52:46 +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 |
|
Pontus Fransson
|
291e60d7b4
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 09:11:11 +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 |
|
lindaandersson
|
5ebac80ec1
|
GL - animated character and some textrendering
|
2014-02-11 15:00:52 +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
|
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 |
|
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 |
Robin Engman
|
98644e3fa0
|
Minimised to potential skinning problem
|
2014-02-04 17:59:04 +01:00 |
Dennis Andersen
|
de8c76f051
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:07:10 +01:00 |
|
Dennis Andersen
|
61178e2803
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:06:59 +01:00 |
|
lanariel
|
e13410dced
|
Fixed debug data, points in right direction
Matrix::m 0 index based, not math def
|
2014-02-04 15:06:50 +01:00 |
|
lanariel
|
97a3792bff
|
Anim Test Not working Joints
|
2014-02-04 14:59:51 +01:00 |
|
lanariel
|
34f58d4140
|
Anim Testing
|
2014-02-03 12:09:11 +01:00 |
|
Dennis Andersen
|
a673e64694
|
GameServer - Pre-merge with graphic
|
2014-01-31 22:52:52 +01:00 |
|
lanariel
|
069acee8cc
|
Anim Error
|
2014-01-31 16:29:50 +01:00 |
Erik Persson
|
31feccf284
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/GameLogic/Game.cpp
|
2014-01-31 09:17:54 +01:00 |
|
Erik Persson
|
ae6a570a12
|
GL - trying to make walking nice
|
2014-01-30 15:12:53 +01:00 |
|
Dennis Andersen
|
36f057d2cc
|
Broekn branch not broekn more
|
2014-01-29 10:18:01 +01:00 |