Ricardo Quesada
|
956425f894
|
Merge pull request #4134 from ricardoquesada/toc_for_coding_style
Adds TOC to coding style
|
2013-11-07 19:01:05 -08:00 |
Ricardo Quesada
|
d936622070
|
Adds TOC to coding style
|
2013-11-07 19:00:31 -08:00 |
minggo
|
109adaf337
|
Merge pull request #4103 from luisparravicini/issue-2882
[ci skip]added | operator for Control::EventType
|
2013-11-07 18:59:33 -08:00 |
minggo
|
61970934a2
|
[ci skip]
|
2013-11-08 10:55:49 +08:00 |
minggo
|
d2bb1c72cc
|
Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite
[ci skip]add Sprite::setScale(float, float)
|
2013-11-07 18:54:04 -08:00 |
minggo
|
d1f94e0d9d
|
Merge pull request #4111 from boyu0/iss2771_physical
[ci skip]issue #2771: physical
|
2013-11-07 18:51:15 -08:00 |
minggo
|
21f8050a4d
|
[ci skip]
|
2013-11-08 10:50:28 +08:00 |
minggo
|
04bb4033fd
|
Merge pull request #4128 from Dhilan007/m_c_jsb
[ci skip]rename jsb boot file.
|
2013-11-07 18:48:30 -08:00 |
minggo
|
6d0be761eb
|
[ci skip]
|
2013-11-08 10:47:12 +08:00 |
minggo
|
167242e540
|
Merge pull request #4127 from Dhilan007/ANCHOR_XXX
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
|
2013-11-07 18:45:50 -08:00 |
Nite Luo
|
be71eb8626
|
Merge branch 'develop' into newRenderer
Conflicts:
.gitignore
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/2d/CCDirector.cpp
|
2013-11-07 17:24:57 -08:00 |
Nite Luo
|
72828acaec
|
Add some todo
|
2013-11-07 16:53:20 -08:00 |
Nite Luo
|
935d2bdebb
|
Implement sprite batching
|
2013-11-07 16:50:53 -08:00 |
Nite Luo
|
d7cb4ed219
|
First attempt for batching
|
2013-11-07 15:48:37 -08:00 |
Ricardo Quesada
|
7a0fbf540e
|
Merge pull request #4132 from ricardoquesada/doc_fixes
More fixes to the C++ guide
|
2013-11-07 15:38:12 -08:00 |
Ricardo Quesada
|
3300e46d0f
|
More fixes to the C++ guide
|
2013-11-07 15:37:41 -08:00 |
Ricardo Quesada
|
2ce08f9113
|
Merge pull request #4131 from ricardoquesada/udpates_coding_style
updates coding style.
|
2013-11-07 15:09:36 -08:00 |
Ricardo Quesada
|
0fb85f88fb
|
updates coding style.
Everything is in MarkDown format.
Much easier to read than in redmine
|
2013-11-07 15:08:49 -08:00 |
Ricardo Quesada
|
ffd4342548
|
Adds more strings
and more `override`
and fixes some indetentation issues
|
2013-11-07 12:42:16 -08:00 |
Ricardo Quesada
|
e4662b371a
|
TextField uses std::string& in the public API
and uses std::string instead of std::string* internally
|
2013-11-07 11:58:48 -08:00 |
Nite Luo
|
3421eb8e5d
|
Cleanup the code a bit before implement sprite batching
|
2013-11-07 10:09:53 -08:00 |
Dhilan007
|
006d32f883
|
rename jsb boot file.
|
2013-11-07 23:51:01 +08:00 |
Dhilan007
|
916361af3f
|
Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
|
2013-11-07 23:40:33 +08:00 |
Huabing.Xu
|
bd7d62aee0
|
issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder
|
2013-11-07 21:48:39 +08:00 |
CaiWenzhi
|
c69163559b
|
Move some method from helper to reader
|
2013-11-07 21:26:56 +08:00 |
CaiWenzhi
|
9b4aa95b31
|
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
|
2013-11-07 21:18:21 +08:00 |
CaiWenzhi
|
cbb9c655d9
|
fixed bugs
|
2013-11-07 21:10:48 +08:00 |
boyu0
|
cee966e284
|
issue #2771: fix build error
|
2013-11-07 19:24:15 +08:00 |
Huabing.Xu
|
99bcca0532
|
issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
|
2013-11-07 19:11:09 +08:00 |
Huabing.Xu
|
c8fe6077aa
|
issue #3025: Deprecate TextureCache::getInstance() destroyInstance()
|
2013-11-07 19:10:14 +08:00 |
Huabing.Xu
|
99546cef46
|
issue #3025: add getTextureCache() in CCdirector()
|
2013-11-07 18:52:36 +08:00 |
minggo
|
237f7a7839
|
Merge pull request #4125 from minggo/fix-compiling-error
[ci skip]fix compiling erros on Android
|
2013-11-07 02:04:27 -08:00 |
boyu0
|
b6c98ab1eb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-07 17:59:01 +08:00 |
boyu0
|
3e8871f2c9
|
issue #2771: delete some unfinished PhysicsTest and change subtitle
|
2013-11-07 17:53:30 +08:00 |
boyu0
|
e278ad66c8
|
issue #2771: change PhysicsJoint::create() to PhysicsJoint::construct()
|
2013-11-07 17:46:05 +08:00 |
CaiWenzhi
|
b0a422eb09
|
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
|
2013-11-07 17:40:13 +08:00 |
boyu0
|
7363be0697
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-07 17:37:33 +08:00 |
minggo
|
14fec5ed62
|
Merge pull request #4124 from CocosRobot/updategeneratedsubmodule_1383815479
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-07 01:17:49 -08:00 |
minggo
|
b9b14571ac
|
fix compiling erros on Android
|
2013-11-07 17:16:31 +08:00 |
CaiWenzhi
|
e2249c8c3f
|
Fixed crash
|
2013-11-07 17:15:52 +08:00 |
CocosRobot
|
a116e7ec79
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-07 09:11:22 +00:00 |
Jason Xu
|
b5f83c30b6
|
fix indention
|
2013-11-07 17:08:16 +08:00 |
minggo
|
258fcbc144
|
Merge pull request #4122 from samuele3hu/developCheck
[ci skip]Reslove the linux compiled error
|
2013-11-07 01:02:43 -08:00 |
CaiWenzhi
|
9f2297a5a6
|
add "retain" to listeners
|
2013-11-07 16:46:41 +08:00 |
samuele3
|
9f5095b9c3
|
Reslove the compiled error
|
2013-11-07 16:43:04 +08:00 |
Jason Xu
|
c9f814c016
|
fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true);
|
2013-11-07 16:39:41 +08:00 |
boyu0
|
ef5440f738
|
issue #2771: change rayCast and rectQuery callback class to std::function
|
2013-11-07 16:23:50 +08:00 |
samuele3
|
e6fd1fece1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
|
2013-11-07 15:28:48 +08:00 |
samuele3
|
8c025a2cee
|
Reslove the linux compiled error
|
2013-11-07 15:12:19 +08:00 |
boyu0
|
eb508e4728
|
issue #2771: fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay
|
2013-11-07 15:12:13 +08:00 |