 Steve Grenier
|
d1e6f3cc96
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
|
13 years ago |
|
Steve Grenier
|
70cf3098b1
Added dynamic property to nodes (and support for it in scene file).
|
13 years ago |
 Sean Paul Taylor
|
a7ca30c061
Merge pull request #308 from blackberry-gaming/next-dgough
|
13 years ago |
 Darryl Gough
|
1df25e6acd
Updated gameplay.sln because of GUID conflict.
|
13 years ago |
|
Steve Grenier
|
cbc7b7b4f4
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
|
13 years ago |
|
Steve Grenier
|
f621773448
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
|
13 years ago |
|
Sean Paul Taylor
|
59e2fc64ad
Merge pull request #306 from blackberry-gaming/next-setaylor
|
13 years ago |
|
setaylor
|
b222c459e7
Added missing easel.png
|
13 years ago |
|
setaylor
|
78376691d2
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-setaylor
|
13 years ago |
|
Sean Paul Taylor
|
2d497df4f7
Merge pull request #305 from blackberry-gaming/next-setaylor
|
13 years ago |
|
setaylor
|
03cd360aae
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-setaylor
|
13 years ago |
|
setaylor
|
2db333d523
Removed FlowLayout.h/.cpp again since they are still not ready.
|
13 years ago |
|
Steve Grenier
|
96f6eb4d7f
Removed animation from PhysicsCharacter.
|
13 years ago |
|
Sean Paul Taylor
|
13e76857e0
Merge pull request #304 from blackberry-gaming/next-cculy
|
13 years ago |
 Chris Culy
|
d2b0bdead2
Updating textures for character sample and node names in scene.
|
13 years ago |
|
Sean Paul Taylor
|
315fd7fa90
Merge pull request #303 from blackberry-gaming/next-ablake
|
13 years ago |
 Adam Blake
|
bbf8adbe03
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-ablake
|
13 years ago |
|
Adam Blake
|
3bfa5a109b
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-ablake
|
13 years ago |
|
Sean Paul Taylor
|
d025ed2db2
Merge pull request #302 from blackberry-gaming/next-setaylor
|
13 years ago |
|
setaylor
|
c59ab4a15c
Updated variables names for Bundle rename.
|
13 years ago |
|
Adam Blake
|
56a86250ac
Added ability to override themed properties on a control within a .form file.
|
13 years ago |
|
Sean Paul Taylor
|
0be58ef57f
Merge pull request #301 from blackberry-gaming/next-setaylor
|
13 years ago |
|
setaylor
|
79913cea30
Added missing class api documentation.
|
13 years ago |
|
setaylor
|
b007329a71
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-setaylor
|
13 years ago |
|
setaylor
|
93c11b6a33
Fixes android build for changes to Bundle.cpp
|
13 years ago |
|
Sean Paul Taylor
|
11954f65ed
Merge pull request #300 from blackberry-gaming/next-setaylor
|
13 years ago |
|
Sean Paul Taylor
|
c6ffcfed19
Merge pull request #299 from blackberry-gaming/next-setaylor
|
13 years ago |
|
setaylor
|
34326cc1b5
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-setaylor
|
13 years ago |
|
Sean Paul Taylor
|
ac7faa23eb
Merge pull request #298 from blackberry/next
|
13 years ago |
|
Sean Paul Taylor
|
397c36dc63
Merge pull request #75 from bslack/next
|
13 years ago |
