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

6761 Commits

Author SHA1 Message Date
James Chen b2581ff456 Merge pull request #1713 from dumganhar/gles20 
Reverted chipmunk_types.h
 2012-12-03 22:48:16 -08:00
James Chen ba3a183856 Reverted chipmunk_types.h 2012-12-04 14:46:10 +08:00
minggo e6c55f6cfb Merge pull request #1712 from minggo/gles20 
update CHANGELOG
 2012-12-03 22:45:40 -08:00
minggo b961f2a439 update CHANGELOG 2012-12-04 14:44:11 +08:00
James Chen 574b979571 Merge pull request #1711 from dumganhar/gles20 
Removed libExtensions dependence for win32 template.
 2012-12-03 22:29:51 -08:00
James Chen 77ad17bbd1 Removed libExtensions dependence for win32 template. 2012-12-04 14:29:05 +08:00
James Chen b521327572 Merge pull request #1710 from dumganhar/gles20 
Updated build-win32.bat and win32 template.
 2012-12-03 22:10:13 -08:00
James Chen dbeb85fa5d Updated build-win32.bat and win32 template. 2012-12-04 14:09:19 +08:00
minggo f8277f50c1 Merge pull request #1709 from minggo/gles20 
update cocos2d-js-tests to up-stream
 2012-12-03 22:02:32 -08:00
minggo f4656ad00f update cocos2d-js-tests to up-stream 2012-12-04 14:00:29 +08:00
minggo c62aa37413 Merge pull request #1708 from minggo/gles20 
modify js-binding related samples according the modification of cocos2d-js-tests
 2012-12-03 20:09:53 -08:00
minggo 9c04db0e41 modify js-binding related samples according the modification of cocos2d-js-tests 2012-12-04 12:08:37 +08:00
walzer a1b398fea1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-04 12:00:28 +08:00
James Chen 16eea28f06 Merge pull request #1707 from dumganhar/gles20 
Synchronizing to the latest cocos2d-js-test
 2012-12-03 19:38:19 -08:00
James Chen b5ae1f6d2a Updated MoonWarriors/Classes/AppDelegate.cpp. 
Updated the submodule reference of cocos2d-js-tests to the latest one.
Fixed duplicate define in js_bindings_ccbreader.cpp.
 2012-12-04 11:36:45 +08:00
James Chen ed86e2967f Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm 
fixed #1590: JPEG and File fixes and CocosDenshion fix for marmalade.
 2012-12-03 19:10:14 -08:00
James Chen 13210cc098 Merge pull request #1705 from CocosRobot/updategeneratedsubmodule_1354589989 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-12-03 19:07:50 -08:00
Mat Hopwood cd219162e0 CocosDenshion fix 2012-12-04 11:03:34 +08:00
Mat Hopwood 3b2eea2541 JPEG and File fixes 
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
 2012-12-04 11:03:34 +08:00
CocosRobot 545002b3a9 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-04 10:59:58 +08:00
minggo 75845b56c0 Merge pull request #1694 from dualface/update_luabinding 
Update luabinding
 2012-12-03 18:59:23 -08:00
minggo bbcbfa71ef Merge pull request #1704 from minggo/cclayer_script_support 
Cclayer script support
 2012-12-03 18:55:11 -08:00
minggo 4e7fca3185 merge dualface's pull request for fixing CCLayer script support and fix error for js-binding 2012-12-04 10:52:49 +08:00
James Chen 9f168faeb0 Merge pull request #1696 from fape/lua_marmalade 
fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
 2012-12-03 18:51:39 -08:00
James Chen b6e37c5855 Merge pull request #1703 from dumganhar/gles20 
fix MenuTest crash after merging the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
 2012-12-03 18:40:45 -08:00
James Chen 609fce7e2f fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204). 2012-12-04 10:36:13 +08:00
minggo c21ad515bd Merge pull request #1693 from dualface/add_tolua_isnull 
add tolua.isnull()
 2012-12-03 18:08:21 -08:00
minggo 7ad2484a91 Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support 2012-12-04 09:50:01 +08:00
minggo 06465e4c58 Merge pull request #1702 from folecr/releasebuilds 
Remove hardcoded android:debuggable property in all samples
 2012-12-03 17:45:53 -08:00
folecr 58e6c80078 Remove hardcoded android:debuggable property 2012-12-03 13:34:55 -08:00
James Chen c233d704fd Merge pull request #1701 from dumganhar/iss1550-jsb-memoryleak 
issue #1550: fixed a memory leak in jsbinding.
 2012-12-03 06:21:56 -08:00
James Chen 7c074d4ced issue #1550: fixed a memory leak in jsbinding. 2012-12-03 22:17:53 +08:00
fape 2eaa5188bf add missing Box2d to TestLua marmalade project 2012-12-03 13:13:16 +01:00
James Chen 55417ffe73 Merge pull request #1700 from dumganhar/gles20 
fixed #1589: Added CCBReader::setCCBRootPath.
 2012-12-03 03:19:00 -08:00
James Chen 27bc5094c2 Updated the submodule reference of cocos2d-js-tests. 2012-12-03 19:16:33 +08:00
James Chen 9224b12a9c Updated the submodule reference of cocos2d-js-tests. 2012-12-03 18:30:43 +08:00
James Chen 478791a472 Added CCBReader::setCCBRootPath. 2012-12-03 18:27:50 +08:00
James Chen a1d113f84b Merge pull request #1699 from dumganhar/gles20 
fixed #1588: Get the right js callback function in js_CCScheduler_schedule.
 2012-12-03 00:00:40 -08:00
James Chen f6185844a9 fixed #1588: Get the right js callback function in js_CCScheduler_schedule. 2012-12-03 15:59:29 +08:00
James Chen 1e0fcbb9fa Merge pull request #1698 from dumganhar/gles20 
fixed #1588: RescheduleCallback support for JSBinding.
 2012-12-02 23:37:38 -08:00
James Chen 1d07752fd3 Updated SchedulerTest for TestCpp project. 2012-12-03 15:33:37 +08:00
James Chen d97dfe162a fixed #1588: RescheduleCallback support for JSBinding. 2012-12-03 15:33:36 +08:00
James Chen c546a291a5 Merge pull request #1697 from dumganhar/gles20 
issue #1583: Updated the project configurations of TestJavascript for all supported platforms. Updated the submodule reference of cocos2d-js-tests.
 2012-12-02 19:12:35 -08:00
James Chen ab45c10d52 Merge pull request #7 from minggo/iss1583-update-js 
TestJavascript works ok on iOS
 2012-12-02 19:10:37 -08:00
minggo 180bd8b3a7 issue #1583:TestJavascript work ok on iOS 2012-12-03 11:07:22 +08:00
minggo 2cf49da2bc Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into iss1583-update-js 2012-12-03 10:31:22 +08:00
minggo b805c31dc2 add execute permission of build_native.sh 2012-12-03 10:30:48 +08:00
James Chen 987e898807 issue #1583: Updated the project configurations of TestJavascript for android and win32. Updated the submodule reference of cocos2d-js-tests. 2012-12-03 10:28:44 +08:00
minggo af530878fd Merge pull request #1690 from dualface/fix_CCCallFunc_script_support 
Fix cc call func script support
 2012-12-02 18:26:05 -08:00
fape ccf134864e update AUTHORS 2012-12-02 17:28:16 +01:00