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

952 Commits

Author SHA1 Message Date
Ed Bartley 3ff7e5871c Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call. 
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
 2013-05-07 10:14:38 -04:00
James Chen 912905054e fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods. 
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii

Conflicts:
	extensions/network/HttpClient.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
 2013-05-07 15:37:25 +08:00
James Chen 140927494a Updating http test url, removing www prefix. 2013-05-07 15:13:55 +08:00
minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate 
fix conflict of #2050
 2013-05-06 23:51:38 -07:00
James Chen a9aafdafac Merge pull request #2490 from coolengineer/pull-request-httpclient 
fixed #2119: Introduce HttpResponse callback selector type to resolve #2365, fixed version ;-)
 2013-05-06 23:44:20 -07:00
James Chen 2418e72a0e Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff 
Implement CCDictionary::writeToFile();
 2013-05-06 23:17:11 -07:00
James Gregory 130ab4b584 Disable libcurl tests for Emscripten. 2013-05-06 20:59:47 -07:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format 
Added __attribute__(__format__()) for CCLog and CCString
 2013-05-06 20:06:52 -07:00
Ed Bartley 040e6fc5b9 Promote global functions and variables for PVR decryption to ZipUtils class. 
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
 2013-05-06 10:04:45 -04: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
Hojin Choi 8b9644150d Changes samples' function prototypes to apply newly introduced callback type. 2013-04-28 23:42:31 +09:00
tiantian 2ba5035e5a Make sure XMLDocument is deleted; Code clean up; Add test; 2013-04-28 00:36:37 +08:00
minggo fa0370bba5 disable depth test for clipping test 2013-04-27 11:33:23 +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
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +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
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
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
James Chen e2e9bc8ce0 Fixing memoryleaks. 2013-03-21 09:00:55 +08:00
James Chen aa5f7ffb6a Updating project setting of testcpp for Marmalade. 2013-03-19 17:46:49 +08: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
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
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
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
minggo dd8681b18b Merge pull request #2113 from minggo/refactor-ccuserdefault 
Refactor ccuserdefault
 2013-03-06 23:05:50 -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
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
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
Neo Kim 93195ebe17 Modified a preprocessor line which distinguishes device platform in CCEditBox test code. 2013-02-25 15:44:38 +09: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
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 64248386a2 issue #1770: Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +08:00
James Chen c362f7e439 issue #1687: Adding new test - Checking whether file exists. 2013-02-01 22:18:43 +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
minggo 249b935be8 fix some warnins 2013-01-28 20:34:52 +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 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
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
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
Jozef Prídavok 9889b4f9fd Added the very first implementation of CCEditBox for Win32. 2013-01-10 23:59:21 +01:00
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +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 b120874a87 fix compilation errors. 2012-12-29 11:23:31 +08:00
James Chen c68884a121 issue #1625: Updated EffectsTest.cpp and EffectsTest.lua. 2012-12-27 11:48:46 +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 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00