 Sean Paul Taylor
|
8ddd3d596f
Merge pull request #504 from blackberry-gaming/next-setaylor
|
13 years ago |
|
Sean Paul Taylor
|
150b366a28
Merge pull request #503 from blackberry-gaming/next-setaylor
|
13 years ago |
|
seanpaultaylor
|
3a278c6a50
Updated template new project file for .vert and .frag shader extensions.
|
13 years ago |
|
Sean Paul Taylor
|
9280042fe1
Merge pull request #502 from blackberry-gaming/next-setaylor
|
13 years ago |
|
seanpaultaylor
|
d1cea45c13
Additional changes to cleanup shader library moving back to u_diffuseTexture and u_diffuseColor.
|
13 years ago |
|
Sean Paul Taylor
|
a9c25067ef
Updated xcode projects for Gamepad.h/.cpp
|
13 years ago |
 Steve Grenier
|
5ee05d6b5e
Merge pull request #501 from blackberry-gaming/next-sgrenier
|
13 years ago |
|
Steve Grenier
|
0139827fe6
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
|
13 years ago |
|
Steve Grenier
|
c2a2ed3875
Merge pull request #500 from blackberry-gaming/next-kcunney
|
13 years ago |
 Kieran Cunney
|
5fe4622324
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
|
13 years ago |
|
Kieran Cunney
|
f57508da1d
Adds gamepad.form and gamepad.theme to sample03-character/res/common/ to fix runtime error when launching sample03-character.
|
13 years ago |
|
Steve Grenier
|
8c3e5ca808
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
|
13 years ago |
|
Steve Grenier
|
4a73e88c95
Fixed an issue with loading certain complex nodes from a Bundle (GPB file), where previously loaded nodes would not be skipped over correctly, causing an incorrect file pointer and therefore a failure to read the rest of the Node correctly.
|
13 years ago |
|
Sean Paul Taylor
|
5494d4d329
Merge pull request #499 from blackberry-gaming/next-setaylor
|
13 years ago |
|
seanpaultaylor
|
123454a012
Fixes memory leak in Effect.cpp
|
13 years ago |
|
seanpaultaylor
|
b8e6f6508a
Changed from .vsh to .vert and .fsh to .frag to be more commonly used and work better in syntax highlighting in GLSL editors.
|
13 years ago |
|
Sean Paul Taylor
|
e49bacc4f3
Merge pull request #498 from blackberry-gaming/next-dgough
|
13 years ago |
 Darryl Gough
|
aa00bd27ae
Changed the encoder to prompt the user for the font size if it wasn't specified.
|
13 years ago |
|
Sean Paul Taylor
|
2554f61722
Merge pull request #497 from blackberry-gaming/next-kcunney
|
13 years ago |
|
Kieran Cunney
|
9625a837d6
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
|
13 years ago |
|
Kieran Cunney
|
e137e948bb
Adds Gamepad class to gameplay.
|
13 years ago |
|
Steve Grenier
|
337c7db0c1
Fixed bug in RenderState where it was assuming the default blend function was ONE,ONE, instead of ONE,ZERO.
|
13 years ago |
|
Darryl Gough
|
e5354ef96f
Changed gameplay encoder:
|
13 years ago |
|
Sean Paul Taylor
|
73b664ad07
Merge pull request #496 from blackberry-gaming/next-setaylor
|
13 years ago |
|
seanpaultaylor
|
eb9ff34ad4
Fixed shader library for bumped shaders.
|
13 years ago |
|
Sean Paul Taylor
|
a3440198d3
Merge pull request #495 from blackberry-gaming/next-setaylor
|
13 years ago |
|
seanpaultaylor
|
3d96732743
Moved lighting uniforms into lib/lighting.fsh.
|
13 years ago |
|
Sean Paul Taylor
|
a59c2a835d
Merge pull request #494 from blackberry-gaming/next-dgough
|
13 years ago |
|
Darryl Gough
|
6b45df574a
Fixed bug where MOUSE_PRESS_RIGHT_BUTTON was never sent in windows.
|
13 years ago |
|
Sean Paul Taylor
|
c260a7e38e
Update next
|
13 years ago |
