Walzer
d098c5900a
Merge pull request #1333 from jzgenius/modify_template_by_viewController
...
[template] modify AppController, add viewController & window variant. al...
2012-09-17 19:36:18 -07:00
minggo
6e890c96a8
Merge pull request #1328 from donaldalanmorrison/gles20
...
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 18:57:02 -07:00
jzgenius
19b22be52e
[template] modify AppController, add viewController & window variant. all Xcode template modified.
2012-09-18 09:55:28 +08:00
minggo
4b969e35c8
issue #1470:implement animation
2012-09-17 18:49:05 +08:00
dualface
cf5f3dedc7
[Win32] disable CCTextureAtlas use VAO, some windows display adapter driver cannot support VAO
2012-09-17 17:58:21 +08:00
dualface
ded6e3edcf
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-17 17:55:41 +08:00
minggo
0c4b5dd3e9
issue #1470:fix some crashes
2012-09-17 15:31:07 +08:00
dualface
44e5bdf7a8
restore CCDirector
2012-09-17 15:12:13 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
dualface
eba97a9b1e
[Lua] fix luabinding overloaded functions
2012-09-17 14:40:42 +08:00
minggo
0845e08fd3
issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0
2012-09-17 14:27:17 +08:00
Andre Rudlaff
394b64d61f
[linux] fixed font rendering artifacts
...
This patch fixes the black pixels
around fonts when rendered using
CCLabelTTF.
see http://www.cocos2d-x.org/issues/706
This fix is for linux only, but may
be applied to other platforms as well
2012-09-17 02:33:23 +02:00
Andre Rudlaff
44ccc40269
[linux] use fontconfig to select system fonts
...
This patch removes the hardcoded font paths
from the linux project and uses fontconfig
to find the best match for a given font-family
The implementation also adds the possibility
to load a font file from the applications
resource directory
2012-09-18 00:57:29 +02:00
Walzer
4673977c31
Merge pull request #1325 from walzer/gles20
...
bug fix: CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
2012-09-16 01:27:20 -07:00
Walzer
f475bcf102
CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
2012-09-16 16:21:42 +08:00
Walzer
4374695210
Merge pull request #1324 from walzer/gles20
...
fixed "ant release" to "ant debug" in jenkins_scripts/mac/android/build-4.x-debug.sh
2012-09-16 01:16:09 -07:00
Walzer
86d34f05c4
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-16 16:14:52 +08:00
Walzer
c1ab4eab48
fixed #1404 , modify "ant release" to "ant debug" in mac-android-4.x-debug.sh
2012-09-16 16:13:54 +08:00
Walzer
b8fad67ef4
Fix English syntax in CCDrawingPrimitives.cpp
2012-09-16 10:18:06 +08:00
minggo
7e123f3aec
Merge pull request #1322 from NatWeiss/fixtmxparser2
...
Fixes a bug in the TMX parser which caused tileset images not to load.
2012-09-15 18:50:44 -07:00
minggo
eab52552be
Merge pull request #1320 from NatWeiss/fixccthread
...
Fixes CCThread.cpp so it is not included for Mac builds.
2012-09-15 18:47:42 -07:00
Walzer
a795e3c442
Merge pull request #1321 from donaldalanmorrison/gles20
...
Minor English Spelling Corrections, etc.
2012-09-15 18:40:48 -07:00
Nat Weiss
53e4da5d5c
Fixes a bug in the TMX parser which caused tileset images not to load on Android.
2012-09-15 15:59:15 -07:00
Donald Alan Morrison
6816fb94fc
A few more minor documentation changes. OK, enough for today! :-)
2012-09-15 15:12:28 -07:00
Donald Alan Morrison
216ebab0e1
Minor English Spelling Corrections, etc.
2012-09-15 14:19:14 -07:00
Walzer
877fe86675
Merge pull request #1319 from walzer/gles20
...
fix a potential memory leak in CCTextureCache::addImage.
2012-09-15 06:13:13 -07:00
Walzer
9a042b8056
fix a potential memory leak in CCTextureCache::addImage. Thanks to Alexander Markevich.
2012-09-15 21:11:50 +08:00
minggo
69ba265707
Merge pull request #1316 from donaldalanmorrison/gles20
...
[Gles20] Minor changes to comments (English Spellings, etc.)
2012-09-15 05:42:30 -07:00
James Chen
3be86f8b85
Merge pull request #1318 from dumganhar/gles20
...
Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder.
2012-09-15 00:39:51 -07:00
Nat Weiss
febafa6e82
Fixes CCThread.cpp so it is not included for Mac builds.
...
The Mac platform already has it's own CCThread.mm.
2012-09-15 00:37:12 -07:00
James Chen
f4ddabb942
Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder.
2012-09-15 15:36:31 +08:00
Donald Alan Morrison
b29f9a7f3b
Missed one spelling error.
2012-09-14 15:41:42 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
dualface
2866fa8f56
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-14 18:00:30 +08:00
dualface
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
dualface
62709d7c71
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-14 17:57:56 +08:00
dualface
2869aba7b4
avoid unused memory alloc
2012-09-14 17:54:53 +08:00
Walzer
64d6d6ed81
Merge pull request #1314 from walzer/gles20
...
config scripts for jenkins-ci, compiling android on mac osx
2012-09-14 01:44:53 -07:00
Walzer
7c744e785a
fixed #1404 , tweak back to lower case :)
2012-09-14 16:42:44 +08:00
Walzer
bbb37a4d7c
issue #1404 , case insensitive, oops
2012-09-14 16:41:41 +08:00
Walzer
6fbeacf750
issue #1404 , add scripts for ci
2012-09-14 16:33:54 +08:00
Nicolas Gramlich
c2a62875cf
Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory.
2012-09-13 11:13:02 -07:00
Nicolas Gramlich
f03c0caaf9
Added proper JNIEXPORT/JNICALL markers to android platform jni bindings.
2012-09-13 09:34:30 -07:00
ebartley
3794542ca0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-13 08:47:07 -04:00
Walzer
150ef1f320
Update cocos2dx/platform/win32/CCEGLView.cpp
2012-09-13 15:53:57 +08:00
Walzer
5718dc1397
fixed #1474 , check OpenGL version of win32
...
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
2012-09-13 15:52:46 +08:00
Walzer
47f51bf7af
Update tools/jenkins_scripts/mac/ios/build-ios-all.sh
2012-09-13 14:11:09 +08:00
Walzer
4fd8650b06
Merge pull request #1311 from walzer/gles20
...
update jenkins_scripts for build android-ant on windows cygwin
2012-09-12 20:29:12 -07:00
Walzer
de7969afdf
update jenkins_scripts for build android-ant on windows cygwin
2012-09-13 11:28:12 +08:00