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
minggo
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
folecr
bab8eff915
enableDebugger() will be called inside ScriptingCore when JSB_ENABLE_DEBUGGER is #defined
2013-06-11 08:18:22 -07:00
James Chen
d51c03da7e
Updating JS-Test.
2013-06-10 12:12:31 +08:00
James Chen
a14df8d28d
issue #2271 : Fixing some memory leaks.
2013-06-10 11:43:43 +08:00
James Chen
6b0c2667fd
[iOS] Adding i386 arch for MoonWarriors.
2013-06-09 15:57:06 +08:00
James Chen
50de9b7af5
[iOS] Adding i386 arch for MoonWarriors.
2013-06-09 15:29:51 +08:00
James Chen
d5bbcce165
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:09:44 +08:00
James Chen
6f52d72b82
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:07:11 +08:00
James Chen
03549e6a59
Updating JS-Test.
2013-06-06 15:47:07 +08:00
minggo
4f484cbcbf
enable c++11 for android projects
2013-06-03 11:02:41 +08:00
minggo
2cdb48bc22
enable c++11 for iOS projects
2013-06-03 10:57:06 +08:00
James Chen
2fdeab46b1
fixed #1647 : [WebSocket] Fixing compilation errors on win32.
2013-06-03 10:12:55 +08:00
James Chen
d0680258c6
fixed #1647 : [WebSocket] Fixing compilation errors on win32.
2013-06-03 10:03:38 +08:00
James Chen
c29e434ead
Updating JS-Test.
2013-06-02 18:57:01 +08:00
James Chen
68d0ebfec5
fixed #1647 : Updating JS-test.
2013-06-02 18:56:30 +08:00
James Chen
cedb427a6e
fixed #1647 : Adding WebSocket support for Cpp and JSB.
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
James Chen
62f4e40e4a
Updating JS-Test.
2013-06-01 19:51:59 +08:00
James Chen
ad05363265
fixed #1647 : Updating JS-test.
2013-05-31 23:27:59 +08:00
James Chen
05a88c89dc
fixed #1647 : Adding WebSocket support for Cpp and JSB.
2013-05-31 23:13:03 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
James Chen
974546557d
fixed #2214 : Upgrading Spidermonkey to Firefox v21
2013-05-22 17:31:07 +08:00
folecr
ebf235642d
Call enableDebugger
2013-05-20 14:30:40 -07:00
James Chen
d402b349e2
issue #2092 : Updating win32 project configuration.
2013-05-20 21:12:25 +08:00
James Chen
0e0744faed
fixed #2092 : Updating iOS project configuration.
2013-05-20 17:48:52 +08:00
James Chen
c305581bcf
Updating the submodule of JS-Test.
2013-05-20 17:46:59 +08:00
Carsten Sandtner
b71a88d0fc
updated ios project for Tests.
2013-05-15 17:14:38 +02:00
Carsten Sandtner
89fc8168e5
Added a test to javascript testsuite.
2013-05-15 13:56:58 +02:00
James Chen
cb6d274fd3
Removing CocosPlayer project since it was moved to https://github.com/cocos2d/cocos2d-player
2013-05-08 10:08:32 +08:00
minggo
cd0cf6eee9
Merge https://github.com/cocos2d/cocos2d-x
2013-04-27 18:30:41 +08:00
James Chen
52efa87b69
Updating JS-Test.
2013-04-27 17:59:22 +08:00
James Chen
50255d772e
[CocoPlayer] Small fix for iOS project.
2013-04-27 17:15:57 +08:00
James Chen
8f6a271b54
Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer
2013-04-27 16:55:29 +08:00
minggo
651a42beaf
set design resolution for WatermelonWithme
2013-04-27 14:54:53 +08:00
Rohan Kuruvilla
d7020a7ab2
Adding new status messages for Android
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
8209fa56a2
Fixing bug where screen rotate would keep creating new NSD services
2013-04-26 13:47:26 -07:00
Rohan Kuruvilla
eb85a6c1fb
Handle evalScript from JNI. Also adds helpers for settings status
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
615329eee5
Add evalScript over the network code and force portrait mode on stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
374c456749
change orientation to Portrait on CCB Stop
2013-04-26 13:47:25 -07:00
Rohan Kuruvilla
ece710c4d8
Adding eval script wrapper for ScriptingCore to AppDelegate
2013-04-26 13:41:15 -07:00