James Chen
|
51ba0cbb17
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
|
2014-02-10 14:09:57 +08:00 |
Dhilan007
|
6a662a6330
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
|
2014-02-10 11:47:05 +08:00 |
James Chen
|
99c20c4e30
|
Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268
Conflicts:
tests/test-javascript/tests
|
2014-02-10 11:38:56 +08:00 |
Ricardo Quesada
|
907446d8d0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices
|
2014-02-09 19:32:35 -08:00 |
Ricardo Quesada
|
24f655f9b1
|
Better 'vertices drawn'
|
2014-02-09 19:31:45 -08:00 |
Dhilan007
|
e12c1f57ac
|
Label::reduce unnecessary calculation amount.
|
2014-02-10 11:21:54 +08:00 |
James Chen
|
eda4c9a420
|
Merge pull request #5302 from Pisces000221/improve-label-chinese
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
|
2014-02-10 11:03:03 +08:00 |
Dhilan007
|
a8387a12f0
|
Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop
|
2014-02-10 10:09:56 +08:00 |
Ricardo Quesada
|
9d5393631c
|
Merge branch 'develop' into fast_tmx
Conflicts:
tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
tests/test-cpp/Classes/VisibleRect.cpp
|
2014-02-08 12:49:56 -08:00 |
Ricardo Quesada
|
560abe77c8
|
better Console support
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
|
2014-02-08 12:46:44 -08:00 |
Ricardo Quesada
|
13aa3ad2b5
|
Adds new commands to Console
* resolution
* projection
|
2014-02-08 12:35:11 -08:00 |
Ricardo Quesada
|
c7a999335c
|
Console. Less error prone, easier to use, more documentation
|
2014-02-08 10:20:12 -08:00 |
Ricardo Quesada
|
ceba63db8b
|
Merge branch 'develop' into fast_tmx
|
2014-02-08 09:08:33 -08:00 |
Pisces000221
|
03be459376
|
Update LabelTestNew.lua
|
2014-02-08 17:17:35 +08:00 |
Pisces000221
|
cef84f05af
|
Add LabelTTFCJKWrappingTest
|
2014-02-08 17:16:59 +08:00 |
Pisces000221
|
49163bb774
|
Add LabelTTFCJKWrappingTest
|
2014-02-08 17:15:57 +08:00 |
Pisces000221
|
1170943cf8
|
Add LabelTTFCJKWrappingTest
|
2014-02-08 17:14:38 +08:00 |
Ricardo Quesada
|
82700339c0
|
Adds a way to print the renderer vertices
|
2014-02-07 19:37:44 -08:00 |
Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
James Chen
|
c25787e575
|
issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG .
|
2014-02-07 16:01:57 +08:00 |
James Chen
|
5714552458
|
issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows.
|
2014-02-07 15:29:44 +08:00 |
James Chen
|
4c2da5d286
|
issue #3900: mozjs-25 -> mozjs-27 for windows.
|
2014-02-07 15:16:14 +08:00 |
Ricardo Quesada
|
e33baac396
|
iso almost working
|
2014-02-06 22:20:28 -08:00 |
Ricardo Quesada
|
ad7b54eb0e
|
iso almost working 100% ok
|
2014-02-06 18:47:45 -08:00 |
Ricardo Quesada
|
cf08d0b3f9
|
isometric kind of working
|
2014-02-06 16:19:46 -08:00 |
Ricardo Quesada
|
3560227d09
|
sort of working
|
2014-02-05 19:51:24 -08:00 |
Ricardo Quesada
|
9a53f5a9f5
|
Testing a new TMX renderer
faster
|
2014-02-04 17:59:21 -08:00 |
Ricardo Quesada
|
6ce6806544
|
new modules
|
2014-01-31 16:07:09 -08:00 |
Ricardo Quesada
|
e77d22a58f
|
samples -> tests
|
2014-01-31 14:09:28 -08:00 |
minggo
|
f9c40f7372
|
issue #1399: work ok on iOS after adjusting directory structure
|
2012-07-19 17:22:36 +08:00 |
James Chen
|
20eec32ff0
|
Updated proj.android/project.properties. target=android-10 --> 8
|
2012-06-28 18:26:28 +08:00 |
James Chen
|
26a02804d9
|
Added some resources. Updated Texture2dTest.cpp.
|
2012-06-28 17:34:50 +08:00 |
James Chen
|
aba33b5bda
|
Reverted build_native.sh.
|
2012-06-28 16:58:32 +08:00 |
minggo
|
5b08a5996c
|
add product name for iOS
|
2012-06-28 13:52:10 +08:00 |
minggo
|
e3771a8ad4
|
modify code sign
|
2012-06-28 13:41:05 +08:00 |
minggo
|
3c43dfb6fe
|
disable retina
|
2012-06-28 11:50:11 +08:00 |
minggo
|
7348fa12c3
|
update CHANGELOG and delete some unneeded files
|
2012-06-28 11:47:54 +08:00 |
James Chen
|
86942aedb4
|
fixed #1368: Implement EffectsAdvancedTest (Effect4). Added some comments.
|
2012-06-27 20:50:47 +08:00 |
James Chen
|
33e32e987c
|
Implement EffectsAdvancedTest (Effect4).
|
2012-06-27 18:44:25 +08:00 |
James Chen
|
13793a9d75
|
fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp.
|
2012-06-27 17:08:50 +08:00 |
James Chen
|
a901b0bb12
|
fixed #1367: Refactor "createWith***" to "create".
|
2012-06-27 14:21:29 +08:00 |
James Chen
|
f6026d2ba3
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-06-26 12:09:48 +08:00 |
James Chen
|
95a2696b6b
|
fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
|
2012-06-26 12:09:23 +08:00 |
minggo
|
765da0c80a
|
enable depth test when running test case:Bug-1159
|
2012-06-26 11:09:37 +08:00 |
minggo
|
5cc1f7d230
|
fixed #1338:stop animation when entering background and start animation when comming to foreground
|
2012-06-21 11:42:49 +08:00 |
James Chen
|
2af75ecd65
|
fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp
|
2012-06-20 12:08:34 +08:00 |
James Chen
|
b818c0afa6
|
fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
|
2012-06-20 11:48:31 +08:00 |
James Chen
|
07b9db8e91
|
Merge branch 'gles20' into gles20-ccbi
|
2012-06-19 17:28:31 +08:00 |
James Chen
|
c4056b1bb0
|
fixed #1269: Updated include search paths for win32 and android.
|
2012-06-19 17:22:55 +08:00 |
James Chen
|
591566b43a
|
fixed #1335: Memory leaks in cocos2dx and CCBReader.
|
2012-06-19 16:31:26 +08:00 |