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

322 Commits

Author SHA1 Message Date
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Ricardo Quesada 3cbeabc777 Icons for test projects 2013-10-16 11:55:14 -07:00
James Chen 00ee416006 issue #2905: [iOS Mac] All js games work now. 2013-10-16 16:21:55 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
minggo e90e975e3d Merge pull request #3911 from minggo/iss2905-adjust_folder 
[ci skip]SimpleAudioEngine -> audio
 2013-10-10 18:27:25 -07:00
James Chen 590d8d50e0 Merge pull request #3914 from Dhilan007/00001 
fix copy resource error.
 2013-10-10 03:09:20 -07:00
LinWenhai 83ab7128e7 fix incomplete copy 2013-10-10 18:07:36 +08:00
LinWenhai 8c6a481588 fix incomplete copy 2013-10-10 18:06:59 +08:00
LinWenhai f861d6d2fc fix incomplete copy 2013-10-10 18:03:15 +08:00
LinWenhai 312d761390 Update build_native.cmd 2013-10-10 18:01:45 +08:00
Dhilan007 e181f7a4d2 fix copy resource error. 2013-10-10 17:10:37 +08:00
James Chen 732233336b issue #2823: Updating build_native.sh for JSB projects. Copy all resources in scripting/javascript/bindings/js/* 2013-10-10 16:47:19 +08:00
James Chen 02f724cd23 issue #2823: Enabling JSB debugger in debug mode. Removing the definition of JSB_ENABLE_DEBUGGER. 2013-10-10 16:18:12 +08:00
James Chen 5f4b0d9a0e issue #2823: Removing unused debugger codes in MoonWarriors/Classes/AppDelegate.cpp. 2013-10-10 16:18:11 +08:00
James Chen 0ad7a9fd4b issue #2823: minor fix and logs. 2013-10-10 16:18:10 +08:00
James Chen b5d02d8cca issue #2823: firefox debugger step ok. 2013-10-10 16:18:09 +08:00
minggo 866906fd58 issue #2905:modify project settings to include correct audio path 2013-10-10 15:40:06 +08:00
Dhilan007 9727436a5d issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin 2013-09-27 21:54:48 +08:00
James Chen 26ecb2ea9e [Win32] Updating the window size of JS-Games to 480x720. 2013-09-22 12:03:55 +08:00
James Chen a8f71fff73 Updating JS-test. 2013-09-22 11:27:09 +08:00
James Chen 75a562f9b4 [Mac] Updating the window size for JS games. 2013-09-22 11:26:44 +08:00
James Chen 47f9055e24 Updating js test. 2013-09-22 10:06:13 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
Huabing.Xu 19e37d284e rename test case to correct name 2013-09-18 18:26:03 +08:00
Huabing.Xu a2dee37b0e glfw EGLView set alloc on the stack to prevent memory leak 2013-09-18 17:00:21 +08:00
minggo 6f196e1470 upstream to js tests 2013-09-18 14:24:21 +08:00
minggo ba820790ec Merge https://github.com/cocos2d/cocos2d-x into merge-physics 2013-09-17 20:06:33 +08:00
James Chen 81df48b264 Updating submodule of JS-Test. 2013-09-17 19:32:15 +08:00
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00
minggo 819fbf2866 upstream synchronize 2013-09-16 19:46:14 +08:00
Dhilan007 18f2f831b4 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 16:07:02 +08:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 
Conflicts:
	scripting/auto-generated
 2013-08-27 16:59:59 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
minggo e567b6c54b fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
James Chen 2a147ec34a Adding a new search path 'res' to TestJavascript since some resources are defined as hard code in ControlColourPicker::init(). 
bool ControlColourPicker::init()
{
    if (Control::init())
    {
        setTouchEnabled(true);
        // Cache the sprites
        SpriteFrameCache::getInstance()->addSpriteFramesWithFile("extensions/CCControlColourPickerSpriteSheet.plist");  // Hard code here

        // Create the sprite batch node
        SpriteBatchNode *spriteSheet  = SpriteBatchNode::create("extensions/CCControlColourPickerSpriteSheet.png"); // Hard code here
        addChild(spriteSheet);
 2013-08-23 15:55:25 +08:00
James Chen 6ed43811fe issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib). 2013-08-23 11:26:16 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
James Chen 9cf3bf64d5 issue #2521: Updating JS-Test. 2013-08-12 11:31:54 +08:00
James Chen 12ffdfc4fd issue #2521: TestJavascript needs ccbreader support. 2013-08-12 11:21:31 +08: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
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
James Chen 39084750db [Android] Updating launch activity name. ".TestJavascipt" --> "android.app.NativeActitiy" for TestJavascript project. 2013-08-07 13:46:09 +08:00