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

13818 Commits

Author SHA1 Message Date
Ricardo Quesada ef18d4891e More bug fixes 2013-12-04 16:26:21 -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
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
James Chen 9928e8bef1 issue #2790: Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes. 2013-12-04 16:01:55 +08:00
James Chen cb215bc931 issue #2790: Vector<T> replaces Array* finished. 2013-12-04 16:01:55 +08:00
James Chen 0d581a15d8 issue #2790: MenuItemToggle::setSubItems() uses Vector<MenuItem*> now. 2013-12-04 16:01:55 +08:00
James Chen 8aef092005 issue #2790: TestCpp with new Vector<>. 2013-12-04 16:01:54 +08:00
James Chen 1d5984b29a issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach 2013-12-04 16:01:02 +08:00
James Chen d4d864216b issue #2790: Deletes Vector::init, adds Vector::setCapacity. 2013-12-04 16:00:18 +08:00
James Chen 90062b656d issue #2790: Node::_children is Vector<Node*> now. 2013-12-04 16:00:17 +08:00
James Chen c152652c5b issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr). 2013-12-04 15:56:08 +08:00
James Chen 80004548c8 issue #2790: Adds CCVector.h to Xcode project. int —> long 2013-12-04 15:56:08 +08:00
James Chen 52af153a81 issue #2790: Commit CCVector.h from Riq’s repo(https://github.com/ricardoquesada/cocos2d-x/blob/template_vector/cocos2dx/cocoa/CCVector.h). 2013-12-04 15:56:08 +08:00
CocosRobot a354031526 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-04 07:47:50 +00:00
minggo fcc3b5ca3c Merge pull request #4430 from samuele3hu/developDeprecated 
[ci skip]issue #3309:Add some deprecated functions and classes to support maser cocostudio lua bindings
 2013-12-03 23:40:57 -08:00
samuele3 629ffcbbfd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated 2013-12-04 15:20:09 +08:00
samuele3 c1a226686f issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
minggo 608e3bfa1b Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN 
[ci skip]Corrected "disallow copy and assign"
 2013-12-03 19:21:45 -08:00
minggo 92b180080c Merge pull request #4409 from mlepage/develop 
[ci skip]Fix typos
 2013-12-03 19:13:23 -08:00
Ricardo Quesada a34352cef7 Console is working! 2013-12-03 18:46:54 -08:00