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

10319 Commits

Author SHA1 Message Date
Ricardo Quesada 1e6a7f6bbc MoonWarriors works on Mac 2013-07-01 16:02:36 -07:00
Ricardo Quesada 631ea4ef1d restore js shared 2013-07-01 15:26:03 -07:00
Ricardo Quesada 527d209ca8 Tries to compile WaterMelonWithMe 2013-07-01 15:20:31 -07:00
Ricardo Quesada f83383b86c removes unused projects 2013-07-01 14:43:47 -07:00
Ricardo Quesada 87fc7d4d62 cocos2d mac project redesigned 2013-07-01 14:41:39 -07:00
Ricardo Quesada b434f7332a Removes #if from header class 
preventing ugly bugs
 2013-07-01 11:52:04 -07:00
Ricardo Quesada 464d60e24b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into unified_mac_project 2013-07-01 10:39:03 -07:00
James Chen 302779b28a Merge pull request #3039 from dumganhar/iss2347-keyboard-macro 
Macros like CC_KEYBOARD_SUPPORT should not be in header file.
 2013-07-01 08:09:31 -07:00
James Chen 34871d47af close #2347: Updating tools/tojs/cocos2dx.ini. 2013-07-01 22:34:57 +08:00
James Chen 8a4eab608e Merge branch 'iss2347-keyboard-macro' of https://github.com/dumganhar/cocos2d-x into iss2347-keyboard-macro 2013-07-01 22:33:30 +08:00
James Chen 4e5ee103ec Fixing errors on windows. 2013-07-01 18:22:09 +08:00
Huabing.Xu 9642930779 give Texture2D::_pixelFormat a default value in construction 2013-07-01 18:16:56 +08:00
Huabing.Xu ae47e94db9 change test case, all platform not can read pkm file 2013-07-01 18:15:59 +08:00
Huabing.Xu 4e9e893c8e 1. Add C++ code to decode ETC file 
2. Configuration and function supportsETC()
 2013-07-01 17:40:57 +08:00
James Chen c2ce65a32b issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. 2013-07-01 17:35:51 +08:00
James Chen 1ae41d07aa closed #2347: Keyboard is supported from cocos2d-x 3.0. 2013-07-01 17:15:49 +08:00
James Chen fd72f87b7f Update AUTHORS [ci skip] 2013-07-01 17:13:58 +08:00
James Chen 093cf17f05 Merge pull request #3038 from young40/develop 
close #2348: [plugin-x][Umeng] fix not sending Event when paramMap is nil
 2013-07-01 02:10:10 -07:00
James Chen 728f6cd484 Update AUTHORS [ci skip] 2013-07-01 16:56:22 +08:00
James Chen 8b1325b544 Merge pull request #3034 from Squallium/develop 
Added CocosDenshion dependency to libextension project
 2013-07-01 01:54:02 -07:00
Peter Young cedfd6bbdc [plugin-x][Umeng] fix not sending Event when paramMap is nil 2013-07-01 16:51:31 +08:00
James Chen 0d040bae76 closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
minggo ce3cea2fdb closed #2346: use shader program to set uniform 2013-07-01 16:02:46 +08:00
samuele3hu f03c96d673 Merge branch 'develop' of https://github.com/samuele3hu/cocos2d-x into execDev 2013-07-01 15:34:27 +08:00
samuele3hu 60ff2f7472 Merge pull request #3 from cocos2d/develop 
sync with upstream (cocos2d/cocos2d-x)
 2013-07-01 00:33:39 -07:00
samuele3hu 3e3548db77 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-01 15:05:04 +08:00
samuele3hu fe8e30c3e0 issue #2243:Add a uniform fund in ScriptEngineProtocol 2013-07-01 15:04:14 +08:00
James Chen e20356a32d Merge pull request #3037 from boyu0/refactor_2339 
change the useage text
 2013-06-30 23:37:12 -07:00
James Chen c872666650 Merge pull request #3025 from boyu0/refactor_2339 
closed #2339: Refactor checkParams() in create_project.py, use OptionParser to parse the params
 2013-06-30 23:19:08 -07:00
boyu0 1156ae4f60 change the useage text 2013-07-01 14:10:14 +08:00
Ricardo Quesada 40cf6a7956 unified mac project for all the cocos2d-x libraries 2013-06-30 23:07:56 -07:00
minggo 9697c5af9a [ci ignore] 2013-07-01 10:14:12 +08:00
minggo 73f3f43252 Merge pull request #3035 from Squallium/develop 
Added ccFPSImages entity as linked resource
 2013-06-30 19:12:17 -07:00
Squallium c770a4bdc8 Added ccFPSImages entity as linked resource 2013-06-30 22:00:29 +02:00
Squallium aeb9c5a45f adding ccFPSImages entity as linked resource 2013-06-30 21:43:40 +02:00
Squallium c3e043ef20 Added CocosDenshion dependency to libextension project 2013-06-30 21:38:06 +02:00
boyu0 2625847a74 closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-07-01 01:04:01 +08:00
James Chen 2c08f25c47 Merge pull request #3032 from dumganhar/iss2342-build-errors 
closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2013-06-29 00:05:31 -07:00
James Chen b76798505c closed #2342: Fixing indention. 2013-06-29 15:04:43 +08:00
James Chen bb2f19535b closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 2013-06-29 15:01:50 +08:00
Justin Hawkwood 37ca32e75c Corrected code to use textDefinition properties 2013-06-29 15:00:17 +08:00
James Chen 0f048e23bf Merge pull request #3031 from CocosRobot/updategeneratedsubmodule_1372480518 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-28 22:38:34 -07:00
CocosRobot bc6acb6411 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-29 04:35:21 +00:00
James Chen 7326d54348 Merge pull request #3030 from dumganhar/ricardoquesada-js_mac 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3026
 2013-06-28 21:29:59 -07:00
James Chen 9bac943040 issue #2325: [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp. 2013-06-29 12:25:44 +08:00
James Chen 5bc8706ece Merge branch 'develop' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-js_mac 2013-06-29 12:12:36 +08:00
James Chen 7dd6218344 issue #2325: [MAC] Setting the windows size to 800x450 which is the same as HTML5-tests. 2013-06-29 12:12:26 +08:00
James Chen d454bb06c7 Merge pull request #24 from ricardoquesada/js_mac 
Merge js_mac branch of ricardoquesada's repo.
 2013-06-28 21:10:45 -07:00
James Chen e20de6b6aa Reverting submodules. 2013-06-29 11:45:16 +08:00
James Chen e2b9863bf7 issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT. 2013-06-29 11:44:14 +08:00