 Sean Paul Taylor
|
8eb40ff823
Merge pull request #894 from ablake/next
|
13 years ago |
 Adam Blake
|
d64fd37e0b
Adding a couple setters and changing some method names in ImageControl.
|
13 years ago |
|
Adam Blake
|
8d2633316e
Keeping my lua bindings up-to-date.
|
13 years ago |
|
Adam Blake
|
d7f1f1fc06
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
|
13 years ago |
|
Adam Blake
|
b9ac8d136f
More improvements and comments for ImageControl.
|
13 years ago |
|
Sean Paul Taylor
|
12ce008df6
Merge pull request #895 from dgough/next
|
13 years ago |
 Darryl Gough
|
e3b9b48b04
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
|
13 years ago |
|
Darryl Gough
|
79e27fbdc2
Added @script{ignore} to Game::getArguments.
|
13 years ago |
|
Adam Blake
|
d52baf9ca9
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
|
13 years ago |
|
Adam Blake
|
51b796c31d
Adding source and destination regions to ImageControl as well as some comments.
|
13 years ago |
|
Sean Paul Taylor
|
62398817b5
Merge pull request #893 from Joilnen/next
|
13 years ago |
 Joilnen Leite
|
1926e96906
Fixing no reference to ImageControl.o in linkedition step
|
13 years ago |
|
Joilnen Leite
|
cb5e5b09b6
Merge remote-tracking branch 'upstream/next' into next
|
13 years ago |
|
Sean Paul Taylor
|
fd17661690
Merge pull request #892 from seanpaultaylor/next
|
13 years ago |
|
seanpaultaylor
|
2798ea8637
Fixes break in gamepad and forms.
|
13 years ago |
|
seanpaultaylor
|
da2fb445c1
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
|
13 years ago |
|
seanpaultaylor
|
432203f78c
Fixed the shader files included in the gameplay.vcxproj and gameplay.vcxproj.filters.
|
13 years ago |
|
Sean Paul Taylor
|
94bd7dbb20
Merge pull request #891 from blackberry/master
|
13 years ago |
|
Sean Paul Taylor
|
5b11abff9e
Merge pull request #890 from ChrisWiki/master
|
13 years ago |
 ChrisWiki
|
0d9b3a1354
Adds missing uniform u_spotLightDirection to colored shader
|
13 years ago |
|
Joilnen Leite
|
eb58653c7b
Merge remote-tracking branch 'upstream/next' into next
|
13 years ago |
|
Sean Paul Taylor
|
6566aa07ee
Merge pull request #887 from ablake/next
|
13 years ago |
|
Adam Blake
|
e14338c27d
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
|
13 years ago |
|
Adam Blake
|
f7fa17a979
Basic test of ImageControl.
|
13 years ago |
|
Adam Blake
|
3c32fa2a6e
Issue #841
|
13 years ago |
 Steve Grenier
|
e32df666a5
Merge pull request #886 from sgrenier/next
|
13 years ago |
|
sgrenier
|
9a0d34dde2
Renamed Game::resized to Game::resizeEvent to be more consistent with other game events.
|
13 years ago |
|
Adam Blake
|
b341d853d3
Missed some changes to Form.cpp in previous commit.
|
13 years ago |
|
Adam Blake
|
01401b8322
Removes the need for games to call update() on forms and gamepads each frame,
|
13 years ago |
|
Sean Paul Taylor
|
300fbfe7cd
Merge pull request #885 from ablake/next
|
13 years ago |
