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

27488 Commits

Author SHA1 Message Date
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -08:00
Huabing.Xu e836e98dc4 Merge pull request #10694 from andyque/fix-windows-jenkins-compile-issue 
fix new windows jenkins slave compile error
 2015-03-02 21:00:14 +08:00
andyque 992cc52a02 fix new windows jenkins slave compile error 2015-03-02 19:43:27 +08:00
minggo 4c2dd74502 Merge pull request #10654 from CocosRobot/update_lua_bindings_1425093659 
[AUTO]: updating luabinding automatically
 2015-02-28 11:24:04 +08:00
CocosRobot 84fb4094fc [AUTO]: updating luabinding automatically 2015-02-28 03:23:08 +00:00
minggo 16803fb919 [ci skip]update AUTHORS 2015-02-28 11:20:19 +08:00
minggo d092d829be [ci skip]update CHANGELOG 2015-02-28 11:19:07 +08:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
minggo 1608e26a43 Merge pull request #10642 from CocosRobot/update_cocosfiles_1425031927 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-28 09:36:32 +08:00
minggo 0365b5dd4c Merge pull request #10645 from yinjimmy/orig-v3 
update runtime to 2.0
 2015-02-27 18:31:07 +08:00
CocosRobot a5a1bd3994 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-27 10:12:08 +00:00
Huabing.Xu 6f7455c440 Merge pull request #10641 from Dhilan007/v3-physics-fix 
Fixed the position of physics body is wrong when the position of parent node has been change.
 2015-02-27 18:09:31 +08:00
Wenhai Lin 5af895b24d Fixed the position of physics body is wrong when the position of parent node has been change. 2015-02-27 17:55:25 +08:00
minggo 503c46a9e8 Merge pull request #10286 from flamefox/v3_fix_dos2unix 
fix dos2unix not in run path, on new lua project
 2015-02-27 16:35:02 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix 
HttpResponse reference counting bug fixed
 2015-02-27 14:32:41 +08:00
minggo 2735e0ce4c Merge pull request #10627 from CocosRobot/update_lua_bindings_1425009120 
[AUTO]: updating luabinding automatically
 2015-02-27 11:56:04 +08:00
minggo 1a54c302c9 Merge pull request #10626 from super626/v3 
add changelog
 2015-02-27 11:55:35 +08:00
CocosRobot 8a310c09c0 [AUTO]: updating luabinding automatically 2015-02-27 03:54:42 +00:00
yangxiao 32b0bfeabe add changelog 2015-02-27 11:53:08 +08:00
minggo b973d08b6e Merge pull request #10608 from super626/v3 
Add project function to camera and fix cocos ui bug
 2015-02-27 11:47:55 +08:00
yangxiao dd070e177e modify unproject 2015-02-27 10:20:32 +08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
minggo 95a9e7de04 Merge pull request #10539 from krishnanm86/knarasimhan_sourcerefactor_branch 
Source refactor. Abstracted common functionalities from 4 onTouches meth...
 2015-02-26 20:35:15 +08:00
minggo fdecd20610 [ci skip]update CHANGELOG 2015-02-26 18:12:02 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix 
apply custom request header for every request type (ios)
 2015-02-26 16:40:12 +08:00
minggo 080369f6e5 Merge pull request #10607 from super626/particle_merge 
clear the particle pool when start
 2015-02-26 16:01:52 +08:00
minggo cf36d1fadd [ci skip]update AUTHORS 2015-02-26 15:52:34 +08:00
minggo 1828f7eb33 [ci skip]update CHANGELOG 2015-02-26 15:45:20 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks 
Fix major memory leaks in iOS http request
 2015-02-26 15:41:10 +08:00
yangxiao a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Krishna 2018943d6d Removed template argument from ontouchescommon 2015-02-26 07:05:44 +01:00
minggo 179a601513 Merge pull request #10606 from CocosRobot/update_cocosfiles_1424924776 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-26 14:05:42 +08:00
yangxiao c216984b6f clear the particle pool when start 2015-02-26 13:57:18 +08:00
CocosRobot 9cecd68064 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-26 04:26:17 +00:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
minggo 366a938a86 Merge pull request #10603 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-26 11:01:28 +08:00
minggo de2f39be4e [ci skip]update AUTHORS 2015-02-26 10:54:07 +08:00
minggo 614cb73c1a [ci skip]update CHANGELOG 2015-02-26 10:53:17 +08:00
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3 
added Romanian language
 2015-02-26 10:51:46 +08:00
Ray bfb5c1ca23 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-02-26 10:44:20 +08:00
minggo 01d404c9d4 [ci skip] update version 2015-02-26 10:41:10 +08:00
minggo 39d2f0629c [ci skip] update version 2015-02-26 10:40:30 +08:00
minggo e6ce627632 [ci skip]update version 2015-02-26 10:39:37 +08:00
minggo 31ac484b07 [ci skip]update CHANGELOG 2015-02-26 10:38:10 +08:00
minggo 21fd9113fd [ci skip]update CHANGELOG 2015-02-26 10:36:23 +08:00
minggo b37cb2b277 [ci skip]update AUTHORS 2015-02-26 10:34:00 +08:00