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
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
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
Rohan Kuruvilla
7d90fc2254
Adding README files to each sample project
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
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
163ab2c0be
issue #1686:add () in defining a macro in RenderTextureTest.cpp
2013-03-01 18:37:37 +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
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
minggo
f5e334d9e3
issue #1686:synchronized Texture2DTest
2013-02-28 14:54:09 +08:00
James Chen
5abec07fb5
Updated ActionsTest.
2013-02-28 14:42:45 +08:00
James Chen
e4b6495aac
Updated ActionEaseTest.
2013-02-28 14:42:32 +08:00
James Chen
d572a53a1d
Merge pull request #2050 from dumganhar/tableview-touch-fix
...
fixed #1751 : Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
2013-02-26 06:56:08 -08:00
James Chen
87935ac436
tableview touch area fix.
2013-02-26 19:59:14 +08:00
minggo
5a1e16f105
Merge pull request #2048 from minggo/iss1489-AssetsManager
...
add namespace to AssetsManager
2013-02-26 00:45:06 -08:00
minggo
e0991fbd67
fixed #1489:add namespace to AssetsManager
2013-02-26 16:43:46 +08:00
minggo
a07f2b1e03
Merge pull request #2047 from minggo/iss1489-AssetsManager
...
assets manager works ok
2013-02-26 00:32:01 -08:00
minggo
d35af7b6fe
fixed #1489:sample works ok
2013-02-26 16:29:52 +08:00
James Chen
efdb9180e4
fixed #1750 : [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
2013-02-26 11:16:26 +08:00
James Chen
0ece3056ee
fixed #1749 : Fixed compilation errors for win32.
2013-02-25 22:50:15 +08:00
James Chen
5fafaa8b67
Merge branch 'master' of https://github.com/neokim/cocos2d-x
...
Conflicts:
scripting/javascript/bindings/generated
2013-02-25 22:18:57 +08:00
James Chen
2eab8f75d4
Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager
2013-02-25 18:09:05 +08:00
James Chen
17d9837b45
Adds AssetsManager support for win32.
2013-02-25 18:03:38 +08:00
minggo
442e8ea0cc
issue #1489:android works ok
2013-02-25 16:58:10 +08:00
Neo Kim
93195ebe17
Modified a preprocessor line which distinguishes device platform in CCEditBox test code.
2013-02-25 15:44:38 +09:00
minggo
c8baa94753
issue #1489 : update ios libcurl and add android project
2013-02-25 14:33:04 +08:00
minggo
2d225437e5
Update samples/Cpp/AssetsManagerTest/README.md
2013-02-22 17:26:21 +08:00
minggo
32fbced31f
issue #1489:modify sample code and add readme
2013-02-22 16:02:53 +08:00
minggo
ed1cbb94c2
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
2013-02-22 11:04:40 +08:00
minggo
91f5972b42
issue 1489:add AssetsManager
2013-02-22 11:04:09 +08:00
James Chen
b50515c5bc
Merge pull request #1873 from ThePickleMan/master
...
fixed #1742 : Added 'rotationIsDir' property to ParticleSystem.
2013-02-21 19:02:39 -08:00
Neo Kim
a7c87f3b38
Add 'setFont' and 'setAnchorPoint' to CCEditBox
2013-02-20 22:41:08 +09:00
James Chen
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
James Chen
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
James Chen
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
James Chen
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
James Chen
339a60a649
Adding execute permissions for list.sh.
2013-02-19 14:21:56 +08:00
mutoo
4bc06c7fcb
changed fileformat of list.sh to unix
...
list.sh doesn't work in linux/mac due to its fileformat
2013-02-19 12:20:02 +08:00
James Chen
2626005d20
issue #1712 : Updating project setting for blackberry.
2013-02-17 16:26:08 +08:00
minggo
ba8f26fed9
Merge pull request #1969 from minggo/iss1702-writablePath
...
modify writable path for iOS and Android
2013-02-06 22:16:46 -08:00
fape
96b92e2bd7
Group tests under test "folder"
2013-02-06 14:52:18 +01:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
fb9ac31d08
fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.
2013-02-06 17:20:54 +08:00
James Chen
cc690c5a86
issue #1770 : Adding webp support for mac port.
2013-02-06 13:06:48 +08:00
James Chen
1e5431bcc5
issue #1770 : Adding webp support for blackberry and marmalade.
2013-02-06 10:52:13 +08:00
James Chen
64248386a2
issue #1770 : Updating iOS project configuration and adding WEBP test demo.
2013-02-05 11:37:13 +08:00
James Chen
a22986bc82
Using new api of CCFileUtils for SimpleGame.
2013-02-03 15:38:44 +08:00
James Chen
c362f7e439
issue #1687 : Adding new test - Checking whether file exists.
2013-02-01 22:18:43 +08:00
James Chen
157e229f8c
fixed #1634 : Added the very first implementation of CCEditBox for Win32.
2013-01-31 14:04:49 +08:00
James Chen
3bdfb82e9c
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-01-30 22:31:19 +08:00
James Chen
001d3382a9
[TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget.
2013-01-29 12:59:43 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
James Chen
2e421304ca
Merge pull request #1911 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 05:43:41 -08:00
minggo
05363ee8dd
Merge pull request #1908 from minggo/master
...
fix some warnings
2013-01-28 04:36:01 -08:00
minggo
249b935be8
fix some warnins
2013-01-28 20:34:52 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
031380d4e9
issue #1683 : Updating CCFileUtils.cpp for Win32.
2013-01-28 19:49:34 +08:00
James Chen
733a334ec2
issue #1683 : Fixed compilation errors for linux.
2013-01-28 18:32:34 +08:00
James Chen
632f99b611
issue #1683 : Updating CCFileUtils for MAC.
2013-01-28 17:54:49 +08:00
James Chen
e736ed487f
issue #1683 : Adding default search path if developer didn't pass it.
2013-01-28 17:44:53 +08:00
James Chen
16ef70c069
issue #1683 : Updating FileUtilsTest.cpp.
2013-01-28 17:43:53 +08:00
James Chen
f69ef6182c
issue #1683 : Adding FileUtilsTest.
2013-01-28 15:17:20 +08:00
James Chen
c19b9885fe
Adding COCOS2D_DEBUG=1 for sample projects.
2013-01-28 10:22:32 +08:00
James Chen
d532670640
Removing some CCLOG.
2013-01-27 20:16:46 +08:00
James Chen
eec0ba3c19
Getting full path in before playing sound.
2013-01-27 19:20:49 +08:00
James Chen
2b9f79efc0
Merge pull request #1882 from dumganhar/memoryleak-action
...
Fixed memory leaks in CCActionCatmullRom class.
2013-01-22 22:41:44 -08:00
James Chen
b5efd699bf
Fixed a memory leak in ActionsTest.
2013-01-23 14:40:11 +08:00
James Chen
de8a237d73
Merge pull request #1881 from dumganhar/linux-fix
...
fixed #1676 : Refactoring Makefile and eclipse project configuration for LINUX port.
2013-01-22 03:22:41 -08:00
James Chen
3f57b01f94
Fix for 32bit.
2013-01-22 18:30:16 +08:00
James
1d7650767b
Updated Makefile and project configurations for linux port.
2013-01-22 16:45:35 +08:00
James Chen
219657ee1a
Merge pull request #1872 from moadib/android_manifest_gles20
...
fixed #1673 : Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
2013-01-21 23:52:32 -08:00
James
680fbe3517
Fixed compilation errors for linux port.
2013-01-22 15:21:37 +08:00
James Chen
0187bb6504
Merge pull request #1876 from dumganhar/iss1639-custom-property
...
fixed #1639 : Added custom property support for CCBReader.
2013-01-21 23:03:53 -08:00
PickleMan
c4d5bf8c85
Added test for rotation is dir in particle system
2013-01-21 12:35:59 -05:00
James Chen
c0d568da9b
fixed #1639 : Added custom property support for CCBReader.
2013-01-21 18:37:17 +08:00
moadib
e39829269d
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
2013-01-21 13:03:55 +04:00
James Chen
4a68e4ab89
fixed #1670 : Fixed memory leak in CCBReader.
2013-01-21 14:40:29 +08:00
minggo
a7dca5c05a
fixed #1547:set selected menu item to null when it is removed from a menu
2013-01-17 15:04:48 +08:00
johnangel
a1155f52e6
Merge remote branch 'upstream/gles20' into gles20
2013-01-11 21:48:47 +01:00
Jozef Prídavok
9889b4f9fd
Added the very first implementation of CCEditBox for Win32.
2013-01-10 23:59:21 +01:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
Jozef Prídavok
229ad55dfa
Fixed and refactored Mac Implementation.
2013-01-09 15:34:53 +01:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
8fa2eb080b
issue #1640 : Updated Box2dTest and ChipmunkTest.
2013-01-06 10:22:07 +08:00
James Chen
0c28510513
issue #1640 : Updated ChipmunkTest.cpp.
2013-01-06 10:13:59 +08:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
James Chen
7bcbcfa187
fixed #1636 : Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
2013-01-05 10:56:57 +08:00
James Chen
3263d06830
Merge pull request #1814 from fape/marmalade_simplegame
...
fixed #1631 : Making SimpleGame force landscape for Marmalade.
2013-01-03 19:07:41 -08:00
James Chen
f6b57a9b92
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-04 10:16:18 +08:00
fape
e34f190f36
add SimpleGame Marmalade config files
2013-01-03 15:20:58 +01:00
fape
f3f67f62e1
.gitignores moved
2013-01-03 15:16:11 +01:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +08:00
James Chen
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
James Chen
c68884a121
issue #1625 : Updated EffectsTest.cpp and EffectsTest.lua.
2012-12-27 11:48:46 +08:00
James Chen
0e7934a8ce
Revert TestCpp/proj.win32/main.cpp.
2012-12-27 11:40:32 +08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
James Chen
eb417274fb
fixed #1621 : fix compilation error of eclipe project.
2012-12-24 11:15:56 +08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
minggo
89fb58e791
issue #1603:change pathes of android codes
2012-12-21 17:28:14 +08:00
minggo
f71f13fc53
issue #1536:add permissions and modify module path error
2012-12-21 14:40:34 +08:00
James Chen
a36446cba2
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
2012-12-20 18:39:52 +08:00
James Chen
f47c5e1714
Added app.icf, development.icf.
2012-12-20 18:29:25 +08:00
minggo
65e01b9ade
issue #1603:build ok on mac
2012-12-20 18:02:24 +08:00
James Chen
f65717cd86
issue #1603 : updated linux project configuration.
2012-12-20 17:49:34 +08:00
James Chen
08aa5066a5
issue #1603 : updated blackberry, linux, marmalade project configurations.
2012-12-20 17:47:30 +08:00
minggo
977046cc32
issue #1603:make some samples build ok on iOS
2012-12-20 17:20:10 +08:00
James Chen
dcfd38756d
Updated android build files.
2012-12-20 14:04:49 +08:00
James Chen
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +08:00