Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,565 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

14565 Commits

Author SHA1 Message Date
James Chen 856a82d4b8 issue #2790: Don’t build script bindings projects for travis. 2013-12-05 11:03:22 +08:00
James Chen 944160210c issue #2790: Renames functions in Map<K, V>. 2013-12-05 10:59:43 +08:00
Ricardo Quesada 4aae44f1e9 fixes cocos2d.h include 2013-12-04 18:54:15 -08:00
James Chen 499a0404d4 issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector. 2013-12-05 10:35:10 +08:00
Ricardo Quesada 15321a58df fixes compiler errors on Linux 2013-12-04 18:28:09 -08:00
Huabing.Xu e6823875d5 change VBO_SIZE to a big number to avoid crash temporarily 2013-12-05 10:20:54 +08:00
Huabing.Xu 7a58cb5a29 use quad command instead of custom command for ParticleSystemQuad::draw() 2013-12-05 10:20:22 +08:00
Ricardo Quesada b52d535a42 fixes indentation issues 
and some compilations issues on Linux
 2013-12-04 18:19:51 -08:00
Ricardo Quesada f42aef0af8 Moves CCConsole.* to base/ 2013-12-04 18:09:23 -08:00
Nite Luo e316ac779b Sprite culling now using vertices directly to avoid calculation on transform 2013-12-04 17:41:18 -08:00
Ricardo Quesada c2a88154af Custom commands are working OK 2013-12-04 17:38:11 -08:00
Nite Luo a98714f6a5 support device without VAO 2013-12-04 17:02:02 -08:00
Ricardo Quesada e41deeee86 Adds Scene Graph command 2013-12-04 16:57:44 -08:00
Ricardo Quesada ef18d4891e More bug fixes 2013-12-04 16:26:21 -08:00
Nite Luo 792cb5a716 Merge branch 'develop' into newRenderer 2013-12-04 15:23:12 -08:00
Nite Luo 143df8af7d Fix RenderTexture after merging commandpool 2013-12-04 15:13:13 -08:00
darkdukey 4b7d0c290a Merge pull request #4 from dabingnn/newRendererCommandPool 
New renderer command pool
 2013-12-04 15:08:17 -08:00
Nite Luo f423166471 Fix bugs with RenderTexture with NewRender 2013-12-04 15:06:28 -08:00
Ricardo Quesada f69d5d1328 Merge branch 'develop' into console 2013-12-04 12:28:05 -08:00
Ricardo Quesada 245d33e4ad Fixes several bugs in the console. 
[*] Doesn't crash
[*] Closes connection
[*] Its faster
 2013-12-04 12:26:43 -08:00
Nite Luo ae551ae294 Convert RenderTexture to use RenderCommands 2013-12-04 11:54:57 -08:00
James Chen 28eed3c8e0 issue #2790: Reverts HelloWorldScene.cpp. 2013-12-04 17:51:53 +08:00
James Chen c9767b8ea0 issue #2790: fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile. 2013-12-04 17:50:57 +08:00
James Chen 54289276de issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
James Chen 736c70704b issue #2790: Some FIXME fixes. 2013-12-04 17:28:14 +08:00
James Chen 4212e33aee issue #2790: Removes unused comments in CCAnimation.h 2013-12-04 17:27:53 +08:00
James Chen bbeec97b48 issue #2790: Bug fixes in CCValue.cpp. 2013-12-04 16:38:12 +08:00
James Chen 82cc795ecf issue #2790: Adds more move functions. 2013-12-04 16:37:48 +08:00
James Chen 293ba0210b issue #2790: CCLOG —> CCLOGINFO for CCMap.h and CCVector.h 2013-12-04 16:37:08 +08:00
minggo 4214ad231e Merge pull request #4431 from CocosRobot/updategeneratedsubmodule_1386143261 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-04 00:18:39 -08:00
James Chen 60874ece64 issue #2790: Updates Makefile, Moves some codes to CCValue.cpp. 2013-12-04 16:18:22 +08:00
James Chen 3649530f97 issue #2790: Moves CCValue.h/.cpp to base folder. 2013-12-04 16:02:54 +08:00
James Chen 18d604d349 issue #2790: Bug fix in CCScale9Sprite.cpp. Sprite::Sprite::create --> Sprite::create 2013-12-04 16:02:54 +08:00
James Chen ceaa1f26bb issue #2790: Windows run ok with ValueDict for FileUtils. 2013-12-04 16:02:54 +08:00
James Chen 76896d70d0 issue #2790: Android build was ok, fixes some warnings. 2013-12-04 16:02:54 +08:00
James Chen 35b96602d3 issue #2790: includes <algorithm> for std::for_each. 2013-12-04 16:02:53 +08:00
James Chen 5c60f66c63 issue #2790: Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray. 2013-12-04 16:02:53 +08:00
James Chen f01f56113c issue #2790: Don’t make an assert if converting Value failed. 2013-12-04 16:02:53 +08:00
James Chen 5eb9446b80 issue #2790: Uses const reference instead of value for std::for_each ’s argument. 2013-12-04 16:02:53 +08:00
James Chen 3fc5fffd26 issue #2790: const char* —> const std::string& for CCNS.h/.cpp. 2013-12-04 16:02:53 +08:00
James Chen 9881ab2178 issue #2790: Uses cocos2d::Map and ValueDict for SpriteFrameCache. 2013-12-04 16:02:53 +08:00
James Chen 2e0489a49c issue #2790: Uses ValueDict instead of Dictionary* for ParticleSystem. 2013-12-04 16:02:53 +08:00
James Chen 2d6e6dbdb0 issue #2790: Assert fix for Vector<T>::insertObject. 2013-12-04 16:02:52 +08:00
James Chen 1164176bed issue #2790: NULL —> nullptr in CCParticleSystem.cpp. 2013-12-04 16:02:52 +08:00
James Chen 411136dd57 issue #2790: Updates CCValue, supports using ‘const char*’ to construct a Value. 2013-12-04 16:02:52 +08:00
James Chen 4ec6e50cc4 issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray. 2013-12-04 16:02:52 +08:00
James Chen 8a435aa274 issue #2790: ArrayValue —> ValueArray, DictValue —> ValueDict. 2013-12-04 16:02:52 +08:00
James Chen 3136ffc3dd issue #2790: Adds CCValue.h/.cpp. 2013-12-04 16:02:51 +08:00
James Chen f6676bd7ef issue #2790: [] -> getObjectAtIndex. 2013-12-04 16:02:51 +08:00
James Chen d2bddee11e issue #2790: Adds CCMap.h. 2013-12-04 16:01:56 +08:00