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

354 Commits

Author SHA1 Message Date
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
James Chen 989f350e39 Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357. 2013-08-06 16:27:40 +08:00
folecr 7510a55c6a Update TestJavaScript 2013-08-05 02:05:47 -07:00
folecr 5531272979 Update a bunch of JS projects for android 2013-08-05 02:05:47 -07:00
folecr 816b77e7c0 simplegame : enable building native library for x86 2013-08-05 02:05:37 -07:00
James Chen 4c32303b2e Merge pull request #3317 from dumganhar/member-var-init 
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
 2013-07-29 00:29:08 -07:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
James Chen 1c298cf5a1 Updating JS-Test, fixing CrystalCraze crash on android and windows. 2013-07-29 14:10:42 +08:00
James Chen f5d9bf9465 Updating JS-Test. 2013-07-29 10:17:31 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00
James Chen 9a56cd80bf Updating JS-Tests. Fixed a bug of PerformanceSpriteTest that mgr is undefined when it runs on the JSB. 2013-07-27 14:02:23 +08:00
James Chen 83afffe5b1 Updating JS-Test to the latest version. 2013-07-27 11:37:07 +08:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
James Chen d345ac7f3f [Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache(); 2013-07-26 14:00:10 +08:00
Ricardo Quesada 16d0b43181 Constant fixes 
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE

Also adds more constant for BlendFunc
 2013-07-25 13:36:19 -07:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +08:00
minggo 4d7ac6c800 issue #2430:fix conflict 2013-07-25 21:37:12 +08:00
James Chen 653c1f7f8f Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing 2013-07-25 16:00:45 +08:00
James Chen aaf5bcef52 issue #2404: Invocation of some deprecated methods fixes. 2013-07-25 15:25:11 +08:00
minggo 8dab462f6f issue #2430:move Director enum into class 2013-07-25 14:39:32 +08:00
minggo 439ed140cd assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION 2013-07-24 18:35:26 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07:00
James Chen 1db847ad7c issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
Ricardo Quesada ba6ab126c6 More best practices fixes 
- class order fixes
  - static methods (creators) at the beginning
  - then constructors / destructors
  - then init
- more `const` fixes
  - adds some const getters
  - some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
 2013-07-18 16:30:19 -07:00
James Chen 56419b9e90 issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 
Reset the order of reloading shaders and textures in main.cpp.
 2013-07-17 12:53:30 +08:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
James Chen f09cf35dba Updating JS-test to the latest version. 2013-07-16 15:31:23 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 1f8e852020 issue #2397: Shader::sharedShaderCache() --> Shader::getInstance(). 2013-07-12 13:40:01 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
James Chen a996b878cd issue #2368: Updating JS-test. 2013-07-05 15:30:33 +08:00
James Chen fcc02d476c Updating AppDelegate.cpp 2013-07-05 15:24:29 +08:00
James Chen dca0874ee3 issue #2371: Removed unused projects. 2013-07-04 17:24:34 +08:00
Ricardo Quesada d88a4244b9 Obfuscated Test JS added on iOS and Mac 
new version of game.js. I guess it was autogenerated
 2013-07-03 15:29:57 -07:00
James Chen 54736814fa issue #2285: New JS-test MotionStreak. 2013-07-02 17:57:48 +08:00
James Chen 53884d8238 issue #2285: Adding MotionStreak test for TestJavascript. 2013-07-02 17:47:33 +08:00
James Chen ec5edeb8f6 issue #2325: Updating title for Mac projects. 2013-07-02 10:42:50 +08:00
Ricardo Quesada 92469a635c CrystalCraze and CocosDragon added 2013-07-01 16:24:41 -07:00
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
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
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Ricardo Quesada 9b1684b666 Merge remote-tracking branch 'cocos2d/develop' into js_mac 2013-06-27 22:15:03 -07:00
Ricardo Quesada b0de6d0e8c Project fixes 
In debug: optimization is NONE, and other small fixes for Mac
 2013-06-27 18:14:24 -07:00
James Chen 89ccd9240e issue #2340: Using 800x450 as design resolution for TestJavascript. 2013-06-27 16:10:42 +08:00
Ricardo Quesada ccd9cb486c JS Tests compiles and links in Mac 
...but it doesn't work yet due to a bug with the touch events :-(
 2013-06-27 00:58:46 -07:00
Ricardo Quesada 398c6593f0 JS Tests: Almost working on Mac 2013-06-26 23:45:08 -07:00
James Chen 0fdf4b97d6 Fixing iOS workspace project, using c99 instead of gnu99. 2013-06-26 17:52:54 +08:00
James Chen afc7e39d0f issue #2313: Opens stencil for TestJavascript. 2013-06-26 16:28:14 +08:00
James Chen 4196f2036e Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix 
issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
 2013-06-25 08:41:28 -07:00
James Chen 3e052d5525 issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library. 2013-06-25 23:21:06 +08:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 88a0dbec5e Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 21:29:25 +08:00
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00