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

11397 Commits

Author SHA1 Message Date
zhangbin bab0589a98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-13 15:13:01 +08:00
zhangbin 505f156972 Update the SDK of plugin qh360 2013-08-13 15:12:38 +08:00
minggo a9a9c29e4a Merge pull request #3417 from folecr/cleanup 
Minor code cleanup
 2013-08-12 18:40:42 -07:00
folecr 934ea7510f Use explicit boolean compare instead of implicit float -> boolean conversion 2013-08-12 14:21:58 -07:00
James Chen db00378ead Merge pull request #3415 from godyZ/develop 
modify the Win32 vcxproj file , resolve complier error
 2013-08-12 00:57:20 -07:00
godyZ 963eb5c191 modify the Win32 vcxproj file , resolve complier error 2013-08-12 15:54:05 +08:00
James Chen 2ff3655fff Merge pull request #3408 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-10 07:23:13 -07:00
Lee, Jae-Hong 66593ae4bf [Tizen] Update project files 
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
 2013-08-10 23:11:31 +09:00
minggo d2b96be1e6 Merge pull request #3401 from folecr/accel 
Take orientation into account when reporting accelerometer sensor readout
 2013-08-10 05:46:42 -07:00
James Chen 22cdfee84e Merge pull request #3407 from dumganhar/iss2521-js-ccb-owner 
closed 2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set.
 2013-08-09 23:45:34 -07:00
James Chen fb6f97de95 closed #2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set. 2013-08-10 14:43:55 +08:00
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
minggo 8f30c81ac7 Merge pull request #3397 from godyZ/develop 
S3tc compressed texture support
 2013-08-09 01:09:40 -07:00
godyZ 9dde196140 update s3tc#8,resolve CCConfiguration conflict 2013-08-09 15:47:20 +08:00
minggo fd7d892847 Merge pull request #3403 from dumganhar/iss1690-bind-cccontrol 
closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS.
 2013-08-09 00:31:52 -07:00
James Chen 28789d674d issue #1690: [C++ Best Practice] Adding space in for loop. 2013-08-09 15:31:20 +08:00
James Chen 299562e3be issue #1690: Initializing member variables for JSB_ControlButtonTarget. 2013-08-09 15:08:12 +08:00
godyZ e507bb0deb update s3tc #7 2013-08-09 15:00:26 +08:00
James Chen 10948fcef0 issue #1690: [C++ Best Practice] '{' in new line. 2013-08-09 15:00:06 +08:00
James Chen fd3843c4e0 issue #1690: [C++ Best Practice]Adding a space after 'if'. 2013-08-09 14:49:39 +08:00
godyZ 9bdb8a43d7 update s3tc #6 2013-08-09 14:37:47 +08:00
minggo c69921509f Merge pull request #3399 from minggo/iss2462-_best_cpp_practice 
use cocos2d-x c++ style
 2013-08-08 21:56:52 -07:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
James Chen f527387b1e closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS. 2013-08-09 10:58:25 +08:00
James Chen fc437c5ef4 (Array*) --> static_cast<Array*>() for CCControl.cpp. 2013-08-09 10:56:39 +08:00
folecr 063c730726 Take orientation into account when reporting accelerometer sensor readout 2013-08-08 14:40:26 -07:00
godyZ f648a3f907 modify linux makefile 2013-08-08 17:06:42 +08:00
minggo bf79a0560b issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
godyZ 1048d30863 Removing the conflict generated files. 2013-08-08 16:22:44 +08:00
godyZ a172a87564 Reverting the changed submodules. 2013-08-08 16:20:24 +08:00
godyZ 727ae1bbc2 update s3tc #4 , code standardization 2013-08-08 14:59:46 +08:00
James Chen 9ce4388214 Merge branch 'iss1690-cccontorl-js' into iss1690-bind-cccontrol 2013-08-08 14:27:24 +08:00
James Chen a8ac892c0b Merge pull request #3394 from CocosRobot/updategeneratedsubmodule_1375930944 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-07 23:23:34 -07:00
godyZ f1d66913b9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-08 14:12:23 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
CocosRobot 6f84509261 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 03:02:27 +00:00
James Chen 0594bbb1ff closed #2501: Update AUTHORS [ci skip] 2013-08-08 10:57:40 +08:00
James Chen 8024e95fa4 Merge pull request #3363 from tiantian20007/localDev 
closed 2501: make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
 2013-08-07 19:55:31 -07:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
James Chen 1e8f1ab491 Merge pull request #3392 from CocosRobot/updategeneratedsubmodule_1375926296 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-07 18:47:20 -07:00
minggo 552c63d0cf Merge pull request #3269 from metalbass/patch-4 
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
 2013-08-07 18:45:27 -07:00
CocosRobot 89b3e7e193 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 01:44:58 +00:00
James Chen 7910581654 Merge pull request #3388 from dumganhar/iss2483-sp-v23 
closed 2483: Upgrading spidermonkey library to v23.
 2013-08-07 18:39:40 -07:00
minggo b3b0a94440 Merge pull request #3390 from folecr/comments 
Update nojava.txt with readme.
 2013-08-07 18:39:14 -07:00
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
James Chen 87736683c0 Merge pull request #3387 from pyrasis/tizen_2.2 
[Tizen] Enable LocalStorage
 2013-08-07 03:08:38 -07:00
James Chen 59f5353f89 issue #2483: Updating cocos2d-console. 2013-08-07 18:06:31 +08:00
Lee, Jae-Hong 5a8ec8ca5e [Tizen] Enable LocalStorage 
- add sqlite3 headers and libraries.
- use sqlite3 library.
 2013-08-07 19:01:41 +09:00
zhangbin 2077bc6d2f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 17:57:45 +08:00
Lee, Jae-Hong b42868fd69 [Tizen] Remove Tizen 2.1 headers and libraries. 2013-08-07 18:52:15 +09:00