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

13078 Commits

Author SHA1 Message Date
James Chen 0eb9caa3d6 Merge commit 'refs/pull/4123/head' of git://github.com/cocos2d/cocos2d-x into fix-acc 2013-11-11 10:08:28 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop 
[ci skip]fix tolua_fix, cleanup peertable after object deleted
 2013-11-10 17:44:24 -08:00
James Chen 1f742b6675 Update AUTHORS [ci skip] 2013-11-10 20:56:40 +08:00
James Chen f6aa50f6b2 Merge pull request #4155 from luisparravicini/issue-3136 
typos in create_project.py
 2013-11-10 04:52:42 -08:00
Luis Parravicini 90df6fc763 fixed typos 2013-11-10 08:25:01 -03:00
James Chen deeaa4d1bc Merge pull request #4148 from dumganhar/touch-onebyone-available 
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
 2013-11-10 00:39:30 -08:00
James Chen f2afa30a9a Merge pull request #4153 from CocosRobot/updategeneratedsubmodule_1384054141 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-09 21:56:53 -08:00
dualface c75c20de04 fix Lua 5.2 compatibility 2013-11-10 11:49:52 +08:00
CocosRobot 6e6c63e111 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-10 03:29:03 +00:00
James Chen 9ed0bd0689 Merge pull request #4152 from samuele3hu/developCheck 
Add conversion functions to support bindings-generator
 2013-11-09 19:24:03 -08:00
samuele3 fa1a5c3735 Add conversion config for long type 2013-11-10 11:03:27 +08:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
dualface 2a2fc81f86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-10 00:00:19 +08:00
James Chen f3a5245bfa Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable. 2013-11-09 18:11:57 +08:00
Ricardo Quesada 9f16bfadd1 updated TOC 2013-11-08 20:59:27 -08:00
Ricardo Quesada 94ad801f3d Update CODING_STYLE.md 2013-11-08 20:53:34 -08:00
Ricardo Quesada 173b5f6349 fixes markdown 2013-11-08 19:13:50 -08:00
Ricardo Quesada 5c2b22955e Merge pull request #4146 from ricardoquesada/coding_style_274 
Coding style 274
 2013-11-08 19:11:05 -08:00
Ricardo Quesada 614c6469ff Adds TOC 2013-11-08 19:10:38 -08:00
Ricardo Quesada f7bae6e6cb coding style migrated to version 3.274 2013-11-08 19:09:21 -08:00
Ricardo Quesada 79b80ef9df Merge pull request #4145 from ricardoquesada/removed_more_exe_bit 
removes exe bit from text files
 2013-11-08 11:31:52 -08:00
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -08:00
Ricardo Quesada 9fc8dc0104 Merge pull request #4144 from ricardoquesada/non_exe_bit 
removes exe bit from resource files
 2013-11-08 10:44:58 -08:00
Ricardo Quesada 987b866589 removes exe bit from resource files 2013-11-08 10:43:54 -08:00
James Chen 5f85db9f4d Merge pull request #4143 from dumganhar/linux-template 
[LINUX] Adding template CMake files for linux.
 2013-11-08 02:39:59 -08:00
James Chen 74497e18ec [CMake template] Fix compilation errors. 2013-11-08 18:25:58 +08:00
James Chen eeedab78b2 [LINUX] Adding template CMake files for linux. 2013-11-08 18:13:24 +08:00
minggo 4553db492a Merge pull request #4141 from Dhilan007/m_c_jsb 
[ci skip]use float instead for create point object
 2013-11-07 23:57:14 -08:00
minggo 1ef377c7b7 Merge pull request #4142 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch 
[ci skip]add "setUserObject" method
 2013-11-07 23:55:47 -08:00
CaiWenzhi da27169d45 add "setUserObject" method 2013-11-08 14:58:20 +08:00
Dhilan007 314f2ac62e use float instead for create point object 2013-11-08 14:13:39 +08:00
minggo 089ea0a79e Merge pull request #4140 from CocosRobot/updategeneratedsubmodule_1383884232 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-07 21:43:06 -08:00
CocosRobot fd37d3e973 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 04:17:15 +00:00
minggo 91ac461fab Merge pull request #4138 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch 
[ci skip]Merge some modified file to develop
 2013-11-07 20:11:51 -08:00
CaiWenzhi 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
minggo 05db4f7301 Merge pull request #4119 from ol-loginov/ignorable_build 
[ci skip]ignore output files from script make-all-linux-project.sh
 2013-11-07 19:23:06 -08:00
minggo 56d7da8933 Merge pull request #4130 from ricardoquesada/love_in_textfield 
[ci skip]More std::string& usage
 2013-11-07 19:14:35 -08:00
minggo 128b1b4d9b Merge pull request #4135 from CocosRobot/updategeneratedsubmodule_1383880234 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-07 19:12:09 -08:00
CocosRobot 240fc2ade1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 03:10:36 +00:00
minggo d4f890a6ee [ci skip] 2013-11-08 11:01:16 +08:00
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