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

422 Commits

Author SHA1 Message Date
minggo fb5b7ed7bb fixed #1560:fix a logical error in CCNode::schedule() 2012-11-19 11:24:03 +08:00
fape 355d8df79e fix compile: rename kOrientation to kCCTransitionOrientation 2012-11-17 19:02:04 +01:00
fape 30b026421e The S3E data dir ONLY used by the emulator/simulator. 2012-11-17 13:49:01 +01:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
James Chen df6a50a23a issue #1555: Fixed some compilation error for marmalade and blackberry ports. 2012-11-16 18:13:55 +08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
 2012-11-16 16:21:16 +08:00
James Chen 892cb6b352 issue #1530: Using GCC4.2 compiler to build debug version of JSBinding projects since there is an unknown 'vm_protect' crash by using llvm. 2012-11-16 15:58:22 +08:00
James Chen ee1a5a461d issue #1530: Updated cocos2d-js-test to the latest version. 2012-11-16 15:58:21 +08:00
James Chen def0cc8c39 issue #1530: Updated TestJavascript. 2012-11-16 15:58:20 +08:00
James Chen c2d8d118bf issue #1530: Updated MoonWarriors. 2012-11-16 15:58:19 +08:00
Rohan Kuruvilla 7305442803 Updating MoonWarriors project with new chipmunk bindings 2012-11-16 15:56:30 +08:00
Rohan Kuruvilla 28f2f94f13 Updating TestJavascript project to include object oriented chipmunk 2012-11-16 15:56:30 +08:00
Rohan Kuruvilla 5fb2c0892e Updating jsb JS bootstrap files 2012-11-16 15:56:28 +08:00
Lu Guanqun 17e23f61a7 remove unused private field in KeypadTest 2012-11-16 15:19:43 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo cb2bc37513 issue #1555: make tests work 2012-11-15 18:34:23 +08:00
James Chen c79cac3af6 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
Mat Hopwood 148a558405 Tiff support and resource location 
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
 2012-11-14 17:46:09 +00:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
James Chen b5b0e289eb fixed #1557: set the window size of TestCpp for marmalade port. 2012-11-12 10:46:26 +08:00
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 2012-11-12 10:20:04 +08:00
James Chen 81aff37457 Redirected cocos2d-html5-tests to cocos2d-js-tests 2012-11-08 16:06:32 +08:00
James Chen 6f377855e4 Updated the submodule reference of "cocos2d-html5-tests" to the latest version. 2012-11-06 17:06:04 +08:00
James Chen 5226fbac27 Updated the submodule reference of "samples/TestJavascript/cocos2d-html5-tests". 2012-11-06 10:10:25 +08:00
James Chen ceb4371f12 issue #1549: Using new JS API for MoonWarriors. 
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
 2012-11-05 23:22:59 +08:00
James Chen 1596603377 issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version. 2012-11-05 18:59:42 +08:00
James Chen 57f4e82f75 issue #1549: Made the window size same as cocos2d-html5 (800x450) on win32. 2012-11-05 18:46:23 +08:00
James Chen b72f922287 issue #1549: Sync jsb_constants_cocos2d.js and jsb_constants_cocosbuilder.js to -iphone version. 2012-11-05 18:43:12 +08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
James Chen d14d536953 Sorted the sources of MoonWarriors and TestJavascript by type to make iOS project more beautiful. 2012-11-02 15:52:28 +08:00
James Chen e2ee4f560c Updated TestJavascript/bindings/jsb_constants_cocos2d.js. 2012-11-02 15:22:58 +08:00
James Chen d8580f77a2 Updated project configuration for TestJavascript, added UnitTest.js. 2012-11-02 15:20:42 +08:00
James Chen b401730c1a Updated the submodule reference of cocos2d-html5-test. 2012-11-02 15:14:29 +08:00
James Chen 24385b04a6 fixed #1526: Updated MoonWorriors project configuration for iOS port. 2012-11-02 11:25:24 +08:00
James Chen 84b642d186 Merge pull request #1531 from dumganhar/iss1530-js-improvements 
issue #1530: Picked some JSBinding improvements in PR #1499
 2012-11-01 01:09:39 -07:00
James Chen 45005c6cd9 issue #1530: Set COCOS2D_DEBUG macro to 1 in Application.mk for MoonWarriors project, otherwise there are many outputs in logcat window. 2012-11-01 15:56:05 +08:00
minggo d5afc69393 Merge pull request #1530 from minggo/gles20 
fix compiling error on linux 64 bit
 2012-11-01 00:43:24 -07:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00
James Chen d9fd274f16 Updated the project configuration of TestJavascript for win32 and android port. 2012-11-01 15:19:14 +08:00
minggo 2a796567e0 Merge pull request #1523 from minggo/gles20 
invoke base class's onExit() to avoid memory leak
 2012-10-30 20:35:02 -07:00
minggo ad64beb769 invoke base class's onExit() to avoid memory leak 2012-10-31 11:33:53 +08:00
James Chen 8edf9826b1 issue #1537: Made samples/MoonWarriors/proj.android/build_native.sh executable. 2012-10-31 10:40:42 +08:00
minggo fe8c1573f2 set MoonWarriors to be portrait on iOS 5.1 2012-10-30 11:38:24 +08:00
minggo 811a56d0a2 Merge pull request #1512 from minggo/moonwarrior 
Moonwarrior
 2012-10-29 02:57:03 -07:00
minggo 7073481077 fixed #1527: modify some project setting 2012-10-29 17:54:31 +08:00
minggo 9a2a535fef fixed #1527:add correct icon for xcode project 2012-10-29 16:59:23 +08:00
minggo 2a118a4172 fixed #1527:re-create MoonWarriors xcode project to fix the bug that it will not run on simulator sometimes 2012-10-29 16:47:09 +08:00
James Chen 9113702903 Merge pull request #1510 from dumganhar/gles20 
fixed #1312: Upgraded libcurl to 7.26.0 for linux port
 2012-10-29 01:24:29 -07:00
James Chen d4b7c55ce6 issue #1530: Added resources of cocos2d-html5-tests for TestJavascript project of IOS port. 2012-10-29 16:06:06 +08:00
James Chen d97ce3e7e9 issue #1530: Removed the dependence of Chipmunk for MoonWarriors project setting. 2012-10-29 15:41:39 +08:00
Rohan Kuruvilla 5760ea305c Fixing CallFuncN bindings to properly pass optional third parameter 2012-10-29 15:14:11 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
Mat Hopwood 2b265929e2 Marmalade Sample data removed and merged changes 
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
 2012-10-25 21:40:37 +01:00
James Chen f1da845bf9 Updated the submodule of cocos2d-html5-test. 2012-10-25 16:33:34 +08:00
James Chen e07ca43c3d fixes a compilation error in TestCpp. 2012-10-24 16:28:54 +08:00
James Chen ffe52a157f Removed some unused codes about "enableRetinaDisplay". 2012-10-24 16:12:40 +08:00
James Chen 7d9b3d3969 Merge pull request #1488 from dumganhar/iss1520-comments 
fixed #1520: Added comments for using multiresolution in HelloCpp.
 2012-10-24 01:00:39 -07:00
minggo 38cd1ecd46 fixed #1512: add VisableRect.cpp/h into iOS and mac project 2012-10-24 10:09:25 +08:00
Mat Hopwood 6074dea6cc Marmalade fixes and optimisation of TestCpp assets 
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
 2012-10-24 01:03:06 +01:00
James Chen 62f7b25df2 issue #1521: Using relative coordinates in TestCpp. 2012-10-23 17:48:50 +08:00
James Chen b383704ebc fixed #1520: Updated one comment in HelloCpp. 2012-10-23 14:04:35 +08:00
James Chen b3db7e91f8 fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
James Chen f4f63fd824 fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
minggo 9cf3f4c5f6 Merge pull request #1474 from wenbin1989/gles20 
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
 2012-10-21 18:49:42 -07:00
James Chen aea21bc271 fixed #1517: Updated Project configuration for vs2008. 2012-10-20 09:29:20 +08:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
James Chen a6151cd3bf Merge pull request #1480 from dumganhar/gles20 
Updated the comment of setFrameZoomFactor.
 2012-10-19 03:01:27 -07:00
James Chen bd0ad94bf2 Updated the comment of setFrameZoomFactor. 2012-10-19 18:00:26 +08:00
James Chen aa818f3b54 Merge pull request #1479 from dumganhar/gles20 
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor
 2012-10-19 02:50:08 -07:00
James Chen 5751d82e6b Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'. 2012-10-19 17:39:55 +08:00
James Chen 6b69112fda fixed #1516: TestLua compilation error when the path of cocos2d-x contains spaces 2012-10-19 16:52:38 +08:00
James Chen 533cb8dc48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517-ff16 2012-10-19 13:57:34 +08:00
minggo f40b6ac4eb fixed #1515: implement zoom function on mac os 2012-10-19 11:33:06 +08:00
James Chen 08bb6718cd issue #1517: Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj. 2012-10-19 11:21:27 +08:00
James Chen de3376b43f issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1 2012-10-19 11:15:23 +08:00
wenbin1989 4a50d6903c add Korean Language Type in CurrentLanguageTest 
I have tested the Korean Language Type of CurrentLanguageTest in ios,
android, mac. Works fine.
 2012-10-19 09:41:46 +08:00
minggo 986a0a34c0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale 2012-10-18 17:01:27 +08:00
James Chen 41c784ec61 issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 11:51:02 +08:00
minggo d68f7c76f6 Merge pull request #1471 from minggo/iss1466-shader-test 
reloading shader when coming to foreground
 2012-10-17 20:03:22 -07:00
minggo 501ceb21eb fixed #1466:restore shader when comming to background 2012-10-18 11:00:44 +08:00
James Chen 0b101bedd0 issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 10:54:19 +08:00
minggo b6426f01ff fixed #1466:restore shader when comming to background 2012-10-18 10:39:56 +08:00
minggo bfa7991a94 fixed #1466:restore shader when comming to background 2012-10-18 10:15:46 +08:00
James Chen 2779b4f1ab Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel 2012-10-17 15:08:25 +08:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
James Chen deed3ddc33 Updated AppDelegate of SampleGame for iOS port. 2012-10-15 18:50:46 +08:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
James Chen 39a4af57cc issue #1486: Using relative position for ActionsTest and Box2dView. 2012-10-14 22:21:57 +08:00
minggo 8b650794e6 Merge pull request #1445 from minggo/gles20 
make TestJavascript work on iOS
 2012-10-12 02:47:55 -07:00
James Chen 32a9d51618 issue #1486: Commented some unused codes. 2012-10-12 17:37:49 +08:00
James Chen 36600d95b1 issue #1486: Calculate content scale factor by screen height. 2012-10-12 17:37:26 +08:00
James Chen 04a4ebc571 issue #1486: Using relative coordinate for HelloLua. 2012-10-12 16:18:28 +08:00
James Chen f5abe422ea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res 2012-10-12 15:50:11 +08:00
James Chen 6fd24c469b Updated *.user for vs2010 & vs2008. 2012-10-12 15:45:57 +08:00
James Chen e876b997e7 Updated TestJavascript.vcproj 2012-10-12 15:42:00 +08:00
James Chen 3b0a989200 Updated TestJavascript project configuration for VS2008 & VS2010. 2012-10-12 15:14:47 +08:00
minggo 572460e60a make TestJavascript work on iOS 2012-10-12 12:00:36 +08:00
James Chen 98aa5dd489 issue #1486: Updated AppDelegate.cpp and proj.win32/main.cpp. 2012-10-12 10:02:49 +08:00