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

305 Commits

Author SHA1 Message Date
James Chen f12d118cb9 Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis 2013-05-06 10:24:28 +08:00
savdalion bade1f086d Added example for russian language in TestCpp / LabelTest / BMFontUnicode. 2013-05-04 15:28:24 +03:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
Hojin Choi 8b9644150d Changes samples' function prototypes to apply newly introduced callback type. 2013-04-28 23:42:31 +09:00
minggo 55e4de40f6 make AssetsManagerTest and TestLua run on iOS device 2013-04-28 11:19:03 +08:00
tiantian 2ba5035e5a Make sure XMLDocument is deleted; Code clean up; Add test; 2013-04-28 00:36:37 +08:00
minggo cd0cf6eee9 Merge https://github.com/cocos2d/cocos2d-x 2013-04-27 18:30:41 +08:00
minggo afb91e752d include cocos2d.h to make android template work 2013-04-27 17:16:27 +08:00
James Chen 7f70a4c6e8 Merge pull request #2474 from dumganhar/bb-fixes 
Some fixes for Blackberry port.
 2013-04-26 23:48:12 -07:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +08:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
Ed Bartley f89d39953e Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection 
Add sample to TestCPP.
 2013-04-25 13:40:49 -04:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support 
fixed #2075: Adding spine editor support.
 2013-04-24 01:12:23 -07:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +08:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 0c3cb27113 issue #2075: Updating TestCpp for mac. 2013-04-24 14:34:41 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
minggo d4efbcfcef don't include unneeded header file 2013-04-23 10:10:14 +08:00
Sergey Shambir 8507f7a386 network: Added PUT and DELETE request types 2013-04-21 20:54:52 +04:00
Sergey Shambir e5b2f300f9 Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors 
Uses printf format. Enabled for GCC and clang.
 2013-04-19 11:54:08 +04:00
minggo f9aa710c36 fix a compiling error 2013-04-19 10:34:40 +08:00
Dawid Drozd a153fa1f94 Fixing linking errors for TestCPP with libcurl 2013-04-18 12:14:18 +02:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
Sam Clegg ffb7360e46 Enable easy swithing between Box2D and chipmunk in linux and nacl 
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
 2013-04-15 07:35:50 -07:00
James Chen 0c8e3e9129 Merge pull request #2349 from rogerzanoni/master 
fixed #2052: [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
 2013-04-14 19:45:35 -07:00
James Chen a5d78830db fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile. 2013-04-15 10:39:44 +08:00
Roger Zanoni 05873ad7a0 Check array boundaries to avoid the "array-bounds" error on linux 
Compiling on linux causes the error "array subscript is above array
bounds [-Werror=array-bounds]". This commit adds boundary checking
using the constant defining the maximum number of items in the "nuke" array.

Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>
 2013-04-10 10:53:52 -04:00
James Chen 6e9fcf8c05 fixed #2048: Adding test case for variable cell sizes in CCTableView. 2013-04-10 16:38:00 +08:00
James Chen 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
James Chen 935b7af11c Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal 
Conflicts:
	AUTHORS
 2013-04-08 17:53:14 +08:00
James Chen 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
minggo 2436d87cb3 Merge pull request #2256 from waiter/master 
Add CCRemoveSelf Action
 2013-04-06 19:09:17 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
waiter c9e36438a8 Add ActionRemoveSelf in TestCpp/ActionTest 
Add ActionRemoveSelf in TestCpp/ActionTest
 2013-04-01 10:18:26 +08:00
Andre Rudlaff 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
Éloi Rivard 2664c5e4b9 Makefile 2013-03-29 09:41:15 +01:00
Éloi Rivard b9ec3ead65 * Fixed CocosDenshionTestBug 2013-03-29 09:32:50 +01:00
James Chen c9cdb81020 Removing unused codes. 2013-03-25 14:30:25 +08:00
James Chen f7b2ca2125 Fixing compilation errors when enable CC_ENABLE_PROFILERS. 2013-03-25 11:47:27 +08:00
billy1380 fc806d0496 added sample game xcode project for mac 2013-03-23 17:21:26 +00:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
fape e9343c2d8a - update README files 
- format javascript sample README files like cpp samples
 2013-03-21 16:04:53 +01:00
minggo 949700ca1a issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format 2013-03-21 15:50:41 +08:00
James Chen e2e9bc8ce0 Fixing memoryleaks. 2013-03-21 09:00:55 +08:00
James Chen 8c70955547 [VS2012] Adding dependence for AssetsMangerTest. 2013-03-21 08:11:02 +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
James Chen 7e1efa7c89 fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters. 2013-03-20 14:14:01 +08:00
James Chen aa5f7ffb6a Updating project setting of testcpp for Marmalade. 2013-03-19 17:46:49 +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
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 0a8b4f923f delete parameter(-o igncr) when running build_native.sh in eclipse project 2013-03-19 13:48:32 +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 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
Sam Clegg 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
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 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
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 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