James Chen
8c70955547
[VS2012] Adding dependence for AssetsMangerTest.
2013-03-21 08:11:02 +08:00
James Chen
668d3ce638
Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.
2013-03-20 22:07:30 +08:00
James Chen
33fc16261b
Updating blackberry project settings.
2013-03-20 18:34:28 +08:00
minggo
ee37529884
remove unsupported parameter in android
2013-03-20 16:04:42 +08:00
minggo
f33a8fe6f1
remove unsupported parameter in android
2013-03-20 15:37:16 +08:00
James Chen
d68db7e873
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-03-20 15:19:30 +08:00
James Chen
cf9c01cecf
Updating JSTest, adding new resources.
2013-03-20 15:19:16 +08:00
James Chen
89c4f3a5ba
Updating JSTest.
2013-03-20 14:58:36 +08:00
James Chen
46335a06b8
Updating JSTest
2013-03-20 14:50:20 +08:00
James Chen
49083415d9
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
2013-03-20 14:46:13 +08:00
James Chen
e728d5d6d0
Updating JS Test.
2013-03-20 14:45:39 +08:00
Rohan Kuruvilla
38f86acd23
Updating CocosPlayer AppDelegate files
2013-03-19 23:42:59 -07:00
James Chen
7e1efa7c89
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
2013-03-20 14:14:01 +08:00
walzer
582e35014f
issue #1841 , improve tools/closure-compiler/obfuscate.py to general usage, with input params
2013-03-19 23:53:01 +08:00
James Chen
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
walzer
0d73934f5c
issue #1841 , TestJavascript-ios is obfuscated successfully
2013-03-19 17:21:01 +08:00
James Chen
3ed479d7f4
Updating project configuration of TestCpp for win32.
2013-03-19 17:06:12 +08:00
James Chen
ef98d95e75
Updating project configuration of TestCpp for Android, Linux, Mac and nacl.
2013-03-19 16:59:39 +08:00
minggo
aa845b10c7
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
2013-03-19 16:49:45 +08:00
minggo
07eaf286fb
add c project setting for lua samples
2013-03-19 16:49:16 +08:00
James Chen
6110d5df74
Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader
...
fixed #1838 : Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 01:35:26 -07:00
James Chen
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
minggo
42b74758f5
change Android.Manifest.xml to unix style
2013-03-19 16:30:11 +08:00
minggo
6577279ff7
Merge pull request #2200 from minggo/test-before-release
...
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-18 23:26:45 -07:00
minggo
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
James Chen
b4c52f9c5a
Regenerating all resources with the latest CocosBuilder.
2013-03-19 13:05:17 +08:00
James Chen
3380c7cdca
fixed #1838 : Updating iOS project setting for CocosDragonJS.
2013-03-19 13:05:06 +08:00
James Chen
6a98553633
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
2013-03-18 18:24:37 +08:00
minggo
15733e0089
Merge pull request #2187 from minggo/merge-fape-android-eclipse
...
merge pull request and fix some conflicts
2013-03-18 01:16:10 -07:00
minggo
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
minggo
529a9bf394
make AssetsManager work on iOS
2013-03-18 15:57:30 +08:00
minggo
1560bb2af8
don't require un-exist file in ActionsTest.lua
2013-03-18 11:26:38 +08:00
minggo
19cf6665c4
Merge pull request #2176 from folecr/easierandroidbuild
...
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
minggo
1382f7efc0
Merge pull request #2175 from ricardoquesada/eclipse_readme_fixes
...
README.md eclipse improvements
2013-03-17 18:52:39 -07:00
James Chen
d9c19ab26b
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
2013-03-17 10:43:56 +08:00
folecr
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
Ricardo Quesada
59ca1e198a
README.md eclipse improvements
...
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
minggo
7c8de5aebe
issue #1803:add SpriteOffsetAnchorFlip
2013-03-14 18:14:01 +08:00
minggo
5936f4db2c
issue #1803:add SpriteBatchNodeOffsetAnchorRotationalSkewScale
2013-03-14 17:45:21 +08:00
minggo
e47baa7984
issue #1803:add SpriteBatchNodeOffsetAnchorSkewScale
2013-03-14 15:49:20 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
minggo
0fe38f073c
issue #1803:add SpriteOffsetAnchorSkewScale
2013-03-14 14:35:33 +08:00
minggo
d18a664e08
issue #1803:handle onExit event to release resources
2013-03-14 11:53:34 +08:00
minggo
e82074eb4f
issue #1803:refactor lua codes
2013-03-13 17:45:09 +08:00
minggo
a987c87844
Merge pull request #2151 from sbc100/fix_warning
...
Fix warning in linux build.
2013-03-12 19:30:51 -07:00
Sam Clegg
863286b0b9
Fix warning in linux build.
...
Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
2013-03-12 16:59:22 -07:00
fape
75c68f178a
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp
2013-03-12 22:18:45 +01:00
minggo
6b78e2f341
Merge pull request #2145 from minggo/iss1803-spritetest-lua
...
issue #1803:add SpriteBatchNodeOffsetAnchorScale
2013-03-12 03:42:54 -07:00
minggo
e9df9918f7
issue #1803:add SpriteBatchNodeOffsetAnchorScale
2013-03-12 18:21:34 +08:00
James Chen
ae1c64573e
Merge pull request #2046 from rohankuruvilla/eclipse
...
fixed #1827 : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
James Chen
c780f2ff78
Merge pull request #2137 from dumganhar/iss1748-jsb-chipmunk-sqlite
...
fixed #1748 : Separating js extension from cocos2dx.hpp/cpp.
1) Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original cocos2dx.hpp/cpp. Developer could remove redundant jsbinding native codes now.
2) cocos2dx.hpp/cpp ~> jsb_cocos2dx_auto.hpp/cpp
3) Adding jsb_cocos2dx_extension_manual.hpp/cpp
2013-03-11 02:31:40 -07:00
James Chen
32f0cf5993
Updating the submodule reference of JS tests.
2013-03-11 17:21:01 +08:00
James Chen
a250d83513
Updating the submodule of cocos2d-js-tests.
2013-03-11 17:13:35 +08:00
James Chen
69b2b13325
fixed #1748 : Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
...
Developer could remove redundant jsbinding codes now.
2013-03-11 16:39:28 +08:00
minggo
5c107f289e
Merge pull request #2136 from yuezang/feature_1803
...
issue #1803:add spritetest lua test case
2013-03-10 23:05:54 -07:00
wangshuai
78d5c480b7
add spritetest lua test case
2013-03-11 13:49:09 +08:00
James Chen
3f709c3edb
Merge pull request #2134 from AsadR/remove-all-notifications-for-target
...
fixed #1822 : Added CCNotificationCenter::removeAllObservers(CCObject *target).
2013-03-10 22:41:59 -07:00
Asad ur Rehman
c1a8059998
Added CCNotificationCenter::removeAllObservers
...
This is a helper method that removes all observers with a particular
target. It can be used in destuctors to ensure no observers trigger
callbacks on objects that no longer exist.
2013-03-10 19:34:01 +05:00
Sam Clegg
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
Rohan Kuruvilla
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
Rohan Kuruvilla
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
minggo
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
wangshuai
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
minggo
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
Sam Clegg
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
minggo
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
minggo
3ce5a99c8d
Merge pull request #2092 from sbc100/fix_all_warnings
...
Fix all compiler warnings produced by gcc.
2013-03-05 17:59:35 -08:00
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Rohan Kuruvilla
7d90fc2254
Adding README files to each sample project
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
bb31ea232b
Updating project files for Javascript based sample projects
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4d14afa686
Modifying C++ project files to remove dependency on scripting
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
4eed15c977
Adding eclipse project files for Javascript projects
2013-03-04 11:50:39 -08:00
Rohan Kuruvilla
1ba2b5d169
Adding eclipse project files for TestCpp and HelloCpp
2013-03-04 11:50:39 -08:00
minggo
a330309628
issue #1686:add background color layer in CCTexture2DTest
2013-03-04 11:53:06 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
minggo
473538f6a8
Merge pull request #2074 from minggo/iss1686-synchronize
...
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 02:38:27 -08:00
minggo
163ab2c0be
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 18:37:37 +08:00
minggo
de808f6b58
Merge pull request #2073 from minggo/iss1686-synchronize
...
Fix some errors in TestCpp
2013-03-01 02:17:17 -08:00
minggo
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
minggo
8c80210007
issue #1686:not invoke CCLayer::init() in LayerTest to enable receiving touch messages
2013-03-01 17:11:02 +08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
minggo
fb7642a332
issue #1686:change font size and fix a small bug in ActionTest
2013-03-01 11:25:40 +08:00
minggo
27b62952a4
issue #1686:draw polygon in CCFollowAction test case
2013-03-01 11:12:23 +08:00
minggo
70a70d38fc
Merge pull request #9 from dumganhar/iss1686-synchronize
...
issue #1686 : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
James Chen
3b3adc3eea
issue #1686 : Synchronizing LayerTest.
2013-02-28 16:45:59 +08:00
minggo
b952634d8e
issue #1686:synchronized NodeTest
2013-02-28 16:41:39 +08:00
minggo
dbd5a4069e
issue #1686:synchronized ParticleTest
2013-02-28 16:40:32 +08:00
minggo
738b96e478
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
2013-02-28 16:37:00 +08:00
minggo
c75e440e22
issue #1686:synchronized RenderTexture
2013-02-28 16:35:42 +08:00
James Chen
9d4c128391
tab ~> 4 spaces
2013-02-28 16:06:07 +08:00
James Chen
16422d7194
issue #1686 : Updated LayerTest.
2013-02-28 16:03:55 +08:00
James Chen
69a746fc8b
issue #1686 : Synchronizing LabelTest
2013-02-28 15:57:15 +08:00
James Chen
dbe1e2e427
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
2013-02-28 15:37:15 +08:00
James Chen
88fe33e927
Sync ActionsTest.
2013-02-28 15:32:27 +08:00
minggo
545882cb81
issue #1686:synchronized ShaderTest
2013-02-28 15:01:41 +08:00