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

24387 Commits

Author SHA1 Message Date
martell 07c31bb4e1 Linux: fix glfw3 searching 2014-10-09 05:22:21 +01:00
Dhilan007 462e38cbc6 fixed opacity of label 2014-10-09 10:54:35 +08:00
minggo 9b2a965485 Merge pull request #8585 from CocosRobot/update_cocosfiles_1412820372 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-09 10:31:31 +08:00
XiaoYang 7ecd8c519a Merge pull request #135 from lvlonggame/v3 
Remove string err that is no used
 2014-10-09 10:14:06 +08:00
yangxiao c087f31e94 modify return type of getDirection and getDirectionInWorld 2014-10-09 10:12:52 +08:00
CocosRobot 79e641b3ff [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 02:06:14 +00:00
Ricardo Quesada f6a831e54f Merge pull request #8584 from ricardoquesada/removes_3d_export 
removes the `3d_export.h` file
 2014-10-08 19:04:28 -07:00
Ricardo Quesada 27cb6afb5e fixes warnings on Android 2014-10-08 18:55:33 -07:00
Ricardo Quesada d326db427f removes the `3d_export.h` file 2014-10-08 18:30:23 -07:00
Dhilan007 6f50143e0a Fixed LabelAtlas opacity do not change when setting parent node's opacity 2014-10-08 18:28:24 +08:00
Dhilan007 8ea473de7b fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
minggo 442f767c89 Merge pull request #8579 from CocosRobot/update_lua_bindings_1412761871 
[AUTO]: updating luabinding automatically
 2014-10-08 17:53:58 +08:00
CocosRobot 70a2195ccf [AUTO]: updating luabinding automatically 2014-10-08 09:53:11 +00:00
minggo 33fa2fab84 Merge pull request #8576 from cocoscodeide/v3 
delete tip when reload file is empty(it's normal)
 2014-10-08 17:46:56 +08:00
honghui de9a52892c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-08 17:11:19 +08:00
honghui 91901c16cb delete tip when reload file is empty(it's normal) 2014-10-08 17:06:58 +08:00
minggo 6648884d5e Merge pull request #8574 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-10-08 16:26:59 +08:00
zhangbin bce62aef82 Update the reference of submodule cocos2d-console. 2014-10-08 15:53:01 +08:00
lvlong cba155b5bc Remove string err no used 2014-10-08 15:23:31 +08:00
minggo 640ad4a422 [ci skip] Update CHANGELOG 2014-10-08 13:50:22 +08:00
minggo 8aa03e107f Merge pull request #8209 from boyu0/fix_physics_crash 
fix bug: physics crashes when remove/add children too quick.
 2014-10-08 13:48:03 +08:00
minggo de352dcbec Merge pull request #8570 from CocosRobot/update_cocosfiles_1412732478 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-08 11:37:12 +08:00
CocosRobot 75f21f9c10 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-08 01:41:20 +00:00
minggo 3873bbc5f7 Merge pull request #8060 from giuslape/v3 
Update Reference plugin-x
 2014-10-08 09:39:45 +08:00
minggo d1a0934e61 Merge pull request #8564 from CocosRobot/update_cocosfiles_1412601098 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-06 21:26:46 +08:00
CocosRobot d090576b94 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-06 13:11:39 +00:00
minggo 81a1de7ab4 Merge pull request #7876 from martell/cmakewin 
CMake support for Windows, Mac, Linux, and initial support for IOS and Android
 2014-10-06 21:09:16 +08:00
Ricardo Quesada 222bff3228 Merge pull request #8558 from ricardoquesada/more_samples_using_node_lambda 
more samples using node::schedule(labmda)
 2014-10-03 17:12:30 -07:00
Ricardo Quesada 84da993677 more samples using node::schedule(labmda) 2014-10-03 17:11:39 -07:00
martell 65795ea022 IOS: Added initial cmake toolchain 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-04 00:55:04 +01:00
martell 9c61477739 linux: fixed include dirs 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:43 +01:00
martell 8a4b8afc6c Android: added support for building libcocos2d 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:35 +01:00
martell d420ae39e2 Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:27 +01:00
martell 1a7ecbe427 Finalise Mac Support for cmake 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:19 +01:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
martell ecd8a02ee6 Fixed up some more cmake errors 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:01 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell f258a81263 Enable Static and Shared support in CMakeLists 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:37 +01:00
martell 510b8d525b added flags for shared windows build 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:29 +01:00
martell b911c240c9 added support for static and shared builds with extensions 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:19 +01:00
martell fe32bcb952 added support for static and shared builds with audio and studio 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:52 +01:00
martell c7f3594a1b added support for static and shared builds with ui 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:38 +01:00
martell d9228d31c0 added support for static and shared builds on windows 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:18 +01:00
martell 028d15921e fix warning because of extra comma's 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:19:57 +01:00
martell 1ef0f41e0e Changed WIN32 to _WIN32 to support gnu c++11 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:17:55 +01:00
Ricardo Quesada 3731343260 Merge pull request #8556 from ricardoquesada/more_node_scheduler_fixes 
scheduler and macro fixes
 2014-10-03 09:40:30 -07:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada b58c0497ab Merge pull request #8551 from ricardoquesada/adds_lambda_support_in_node 
Adds lambda support in node
 2014-10-02 21:26:59 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
Ricardo Quesada 0c2fcaa0ca Merge pull request #8549 from ricardoquesada/win32_fixes 
works on win32
 2014-10-02 17:16:19 -07:00