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

11432 Commits

Author SHA1 Message Date
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
carlo morgantini 83b2377a76 some more clean up and removed CCStringTTF 2013-08-07 16:36:04 -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
Lee, Jae-Hong b42868fd69 [Tizen] Remove Tizen 2.1 headers and libraries. 2013-08-07 18:52:15 +09:00
godyZ 674fe025b0 update s3tc #3 ,standard of code 2013-08-07 16:39:05 +08:00
James Chen 166f7d1c66 Merge pull request #3386 from CocosRobot/updategeneratedsubmodule_1375857220 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-07 01:30:10 -07:00
CocosRobot 98aae97de3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-07 06:33:44 +00:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
James Chen c2c1bb45d8 Updating Bindings-generator. 2013-08-07 14:19:36 +08:00
boyu0 684e005ce7 issue #2345: edit for linux compile error 2013-08-07 14:10:42 +08:00
boyu0 ffd821ee13 issue #2345: update generated index 2013-08-07 13:48:12 +08:00
James Chen 39084750db [Android] Updating launch activity name. ".TestJavascipt" --> "android.app.NativeActitiy" for TestJavascript project. 2013-08-07 13:46:09 +08:00
minggo a6a8db0fd4 Merge pull request #3384 from minggo/improved_readme 
Improved readme
 2013-08-06 22:43:25 -07:00
boyu0 d61d3d1a24 issue #2345: fix mac crash due to libjpeg 2013-08-07 11:59:52 +08:00
minggo 397c8ccdd2 fix some format in ReadMe.md 2013-08-07 11:20:56 +08:00
boyu0 a9d26d3fdc issue #2345: edit getPixelFormatInfoMap method to return reference. 2013-08-07 11:20:41 +08:00
minggo 9b2398dfd5 add missing in ReadMe.md 2013-08-07 11:18:19 +08:00
godyZ 0f007d2bd9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 10:58:13 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
James Chen 6fdd95e3aa issue #2483: The callback type of 'delete' property has been changed from 'JS_PropertyStub' to 'JS_DeletePropertyStub' in v23. 2013-08-07 10:29:12 +08:00
James Chen aa97e223d8 issue #2483: Upgrading spidermonkey library to v23 for all supported platforms. 2013-08-07 10:29:12 +08:00
minggo 9f65961a96 Merge pull request #3348 from azmeuk/makefile 
Toplevel Makefile refactoring
 2013-08-06 19:13:23 -07:00
minggo f447398211 Merge pull request #3376 from folecr/android_redesign_update_template 
Update templates to match newer, mostly-NDK Android port
 2013-08-06 19:11:00 -07:00
James Chen 4f740809dd The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet. 2013-08-07 10:08:00 +08:00
James Chen 5d5712178a Merge pull request #3383 from dumganhar/develop 
[ci skip]Updating bindings-generator to the latest version.
 2013-08-06 19:03:14 -07:00
James Chen 710b895aaa Updating bindings-generator to the latest version. 2013-08-07 10:02:20 +08:00
minggo 04ed8557d5 Merge pull request #3382 from ricardoquesada/improved_readme 
Improved README.md
 2013-08-06 19:00:56 -07:00
godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 09:32:42 +08:00