32406efec2
Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
...
Conflicts:
cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08:00
c3a177e5e6
Merge pull request #2268 from Weeds/ccscheduler-fix
...
fixed #2003 : Fixed potential crash in CCScheduler::removeHashElement.
2013-04-08 02:00:22 -07:00
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07:00
202edc1597
CCEditBox test for separate font name/size setters
2013-04-03 17:20:01 +03:00
c9e36438a8
Add ActionRemoveSelf in TestCpp/ActionTest
...
Add ActionRemoveSelf in TestCpp/ActionTest
2013-04-01 10:18:26 +08:00
bcab80a0f1
Added TestCase for crash in CCScheduler
...
The code seems to look wrong (and it sure is) however in real-world
applications it might not be that eays to tell who has ownership of the object,
especially if weak references are involved.
2013-03-29 14:48:35 +01:00
2664c5e4b9
Makefile
2013-03-29 09:41:15 +01:00
b9ec3ead65
* Fixed CocosDenshionTestBug
2013-03-29 09:32:50 +01:00
c9cdb81020
Removing unused codes.
2013-03-25 14:30:25 +08:00
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
fc806d0496
added sample game xcode project for mac
2013-03-23 17:21:26 +00:00
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
e9343c2d8a
- update README files
...
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
8c70955547
[VS2012] Adding dependence for AssetsMangerTest.
2013-03-21 08:11:02 +08:00
33fc16261b
Updating blackberry project settings.
2013-03-20 18:34:28 +08:00
ee37529884
remove unsupported parameter in android
2013-03-20 16:04:42 +08:00
7e1efa7c89
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
2013-03-20 14:14:01 +08:00
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
3ed479d7f4
Updating project configuration of TestCpp for win32.
2013-03-19 17:06:12 +08:00
ef98d95e75
Updating project configuration of TestCpp for Android, Linux, Mac and nacl.
2013-03-19 16:59:39 +08:00
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
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
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
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
529a9bf394
make AssetsManager work on iOS
2013-03-18 15:57:30 +08:00
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
04c1a863a0
Remove tailing newlines from CCLog messaages.
...
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms. The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
2013-03-16 09:01:21 -07:00
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
59ca1e198a
README.md eclipse improvements
...
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
a987c87844
Merge pull request #2151 from sbc100/fix_warning
...
Fix warning in linux build.
2013-03-12 19:30:51 -07:00
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
75c68f178a
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp
2013-03-12 22:18:45 +01:00
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
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
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
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
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
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
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
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
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
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
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
7d90fc2254
Adding README files to each sample project
2013-03-04 11:50:39 -08:00
James Chen