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

14293 Commits

Author SHA1 Message Date
zhangbin a00fef9851 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-12 11:59:19 +08:00
minggo 3b544db5cd Merge pull request #3926 from minggo/iss2905-adjust_folder 
adjust folder structure
 2013-10-11 20:41:07 -07:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
zhangbin 37b6b5bfd3 Make the plugin be compatible with both cocos2d-x-2.2 & cocos2d-x-3.0. 2013-10-12 10:35:12 +08:00
Nite Luo 292d0d74ad Add some comments for mouse scorlling function 2013-10-11 16:39:54 -07:00
Nite Luo ddf21e8bd1 Implement mouse callback for windows 2013-10-11 16:33:49 -07:00
Nite Luo 09c0e23b5d Mouse working on mac 2013-10-11 14:35:38 -07:00
James Chen 0385f9bd31 Merge pull request #3922 from dumganhar/develop 
[Win32] Fixing compilation errors after renaming 'CocosDenshion' to 'audio'.
 2013-10-11 06:55:00 -07:00
James Chen c914017c16 Small fix in ScriptingCore.cpp. 2013-10-11 21:52:55 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
James Chen f1a212f356 Update AUTHORS [ci skip] 2013-10-11 18:26:25 +08:00
James Chen 7890efb24f Update CHANGELOG [ci skip] 2013-10-11 18:23:16 +08:00
James Chen f93c696004 Merge pull request #3549 from jimmystar/patch-1 
Fix wrong assignment for repeatforever argument.
 2013-10-11 03:19:20 -07:00
James Chen 477480bf8e Merge pull request #3920 from CocosRobot/updategeneratedsubmodule_1381475703 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-11 00:18:15 -07:00
James Chen eb9f009c73 Update CHANGELOG [ci skip] 2013-10-11 15:16:30 +08:00
James Chen 5c67fd2c05 Update AUTHORS [ci skip] 2013-10-11 15:15:44 +08:00
CocosRobot b6f439a4f9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-10-11 07:15:06 +00:00
James Chen 0c1e2be30c Update AUTHORS [ci skip] 2013-10-11 15:12:57 +08:00
James Chen f05225ae4c Merge pull request #3888 from ktaobo/avoid-copy 
Avoid unnecessary object duplication using passing arguments by reference
 2013-10-11 00:09:28 -07:00
boyu0 2e01b532f4 issue #2771: add updatePhysicsTransform to Node. 2013-10-11 13:47:15 +08:00
minggo 0130aae044 Merge pull request #3916 from boyu0/iss2771_physical 
[ci skip]issue 2771: physical
 2013-10-10 19:50:19 -07:00
boyu0 acf1d72213 issue #2771: delete #define RAND_MAX in PhysicsTest.cpp(already defined in stdlib.h) 2013-10-11 10:24:55 +08:00
boyu0 3dcd1bc8b1 issue #2771: add #ifdef CC_USE_PHYSICS to CC_SAFE_DELETE(_physicsWorld) 2013-10-11 10:08:51 +08:00
boyu0 c99e4e95a5 issue #2771: fix some compile error. 2013-10-11 10:03:54 +08:00
James Chen 36d4a2d539 Merge pull request #3918 from dumganhar/develop 
Best C++ practice for ScriptingCore class. '_' should be prefix rather than suffix.
 2013-10-10 18:50:43 -07:00
James Chen 4451816c82 Best C++ practice for ScriptingCore class. '_' should be prefix rather than suffix. 2013-10-11 09:52:35 +08:00
minggo e90e975e3d Merge pull request #3911 from minggo/iss2905-adjust_folder 
[ci skip]SimpleAudioEngine -> audio
 2013-10-10 18:27:25 -07:00
Keita Obo 43c2001d71 Avoid unnecessary object duplication using passing arguments by reference 2013-10-10 22:06:10 +09:00
James Chen 6fbca287a2 Update Debugger README.md [ci skip] 2013-10-10 18:35:54 +08:00
boyu0 775a81ae19 issue #2771: Let the sprites added to SpriteBatchNode support physics. 2013-10-10 18:31:43 +08:00
James Chen 95cd356911 Update Debugger REAME.md[ci skip] 2013-10-10 18:31:36 +08:00
minggo c9d28276d3 Merge pull request #3915 from Dhilan007/0002 
[ci skip]fix compile fail on vs2012.
 2013-10-10 03:25:38 -07:00
minggo 16d0fe313b issue #2905: modify makefile to refer to correct path 2013-10-10 18:22:51 +08:00
James Chen 590d8d50e0 Merge pull request #3914 from Dhilan007/00001 
fix copy resource error.
 2013-10-10 03:09:20 -07:00
LinWenhai 83ab7128e7 fix incomplete copy 2013-10-10 18:07:36 +08:00
LinWenhai 8c6a481588 fix incomplete copy 2013-10-10 18:06:59 +08:00
LinWenhai f861d6d2fc fix incomplete copy 2013-10-10 18:03:15 +08:00
minggo 3f010e78f8 issue #2905: modify makefile to refer to correct path 2013-10-10 18:03:03 +08:00
LinWenhai 312d761390 Update build_native.cmd 2013-10-10 18:01:45 +08:00
minggo 6e62be5443 issue #2905: modify makefile to include correct header files 2013-10-10 17:39:53 +08:00
James Chen 643e8fa23e Merge pull request #3912 from dumganhar/iss2823-jsb-remote-debugger-sp23 
issue #2823: [JSB] Support remote debugging JSB project by FireFox.
 2013-10-10 02:17:31 -07:00
James Chen 0d60432d95 issue #2823: Removing unused codes of debugger. 2013-10-10 17:17:48 +08:00
Dhilan007 5ea5c394e7 fix compile fail on vs2012. 2013-10-10 17:17:10 +08:00
Dhilan007 e181f7a4d2 fix copy resource error. 2013-10-10 17:10:37 +08:00
James Chen 5b3cbf9a29 issue #2823: Updating build_native.sh for AssetsMangerTest. 2013-10-10 17:07:13 +08:00
minggo 9cf7d48d62 include correct path in cocos2dx.ini to generate audio lua binding 2013-10-10 17:04:36 +08:00
minggo 7b7aabf2de include correct path in cocos2dx.ini to generate audio binding 2013-10-10 16:54:05 +08:00
James Chen 732233336b issue #2823: Updating build_native.sh for JSB projects. Copy all resources in scripting/javascript/bindings/js/* 2013-10-10 16:47:19 +08:00
James Chen 02f724cd23 issue #2823: Enabling JSB debugger in debug mode. Removing the definition of JSB_ENABLE_DEBUGGER. 2013-10-10 16:18:12 +08:00