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

769 Commits

Author SHA1 Message Date
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray 
Compiles both with std::vector or ccCArray
 2013-08-19 17:09:28 -07:00
minggo 3ca26e1aa6 Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto 
closed #2517: Update all test cases use auto for local variables
 2013-08-17 01:12:48 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array 
add iterator for Array and make Array can be used in range-based loop
 2013-08-17 00:42:42 -07:00
folecr aff86b1b52 Keep TravisCI happy : build Android TestCpp for ARM architecture only. 2013-08-16 16:19:34 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
boyu0 6779f494f3 issue #2517: Restore TestCpp proj.android that edited by mistake. 2013-08-16 16:09:46 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support 
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
 2013-08-16 11:02:44 +08:00
James Chen 4b0d0225b7 issue #2488: Updating makefile for linux and emscripten. 2013-08-15 21:44:51 +08:00
James Chen 409e345522 issue #2488: Updating VS project configuration. 2013-08-15 21:40:11 +08:00
James Chen 56cd039b32 issue #2488: Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'"; 2013-08-15 21:39:47 +08:00
James Chen 21134cc48f Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean 2013-08-15 17:02:51 +08:00
folecr b4edb14d33 Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging. 2013-08-13 15:50:58 -07:00
folecr 4d34cfc28f Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore 2013-08-13 11:29:53 -07:00
folecr 84054a237c Android platform version used matches all other sample projects 2013-08-13 11:28:56 -07:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-08-13 11:28:54 -07:00
carlo morgantini 15ec303278 more clean ups on tests for label 2013-08-13 10:12:02 -07:00
folecr b61ce3c79d ndkgdb.sh for TestCpp 2013-08-13 08:47:48 -07:00
folecr 17c7b7cbcf APP_OPTIM is debug 2013-08-13 08:47:48 -07:00
folecr 652920eaac set android:debuggable property to true 2013-08-13 08:47:48 -07:00
folecr 75f7af00a6 TestCpp builds both ARM and x86 versions 2013-08-13 08:47:48 -07:00
folecr cd0f1beaf4 fix evaluation of properties array read from local.properties 2013-08-13 08:47:48 -07:00
folecr ef7c3b2b09 Remove unused option in build script 2013-08-13 08:47:48 -07:00
carlo morgantini 35b5e30190 alignment added to new label creation 2013-08-12 15:41:29 -07:00
carlo morgantini d15d84c05f samples cleaned up 2013-08-12 15:09:28 -07:00
carlo morgantini 097a5c488a New Label tests plus bug fixing 2013-08-12 13:29:54 -07:00
Lee, Jae-Hong 66593ae4bf [Tizen] Update project files 
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
 2013-08-10 23:11:31 +09:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
James Chen 87736683c0 Merge pull request #3387 from pyrasis/tizen_2.2 
[Tizen] Enable LocalStorage
 2013-08-07 03:08:38 -07:00
Lee, Jae-Hong 5a8ec8ca5e [Tizen] Enable LocalStorage 
- add sqlite3 headers and libraries.
- use sqlite3 library.
 2013-08-07 19:01:41 +09:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 09:32:42 +08:00
godyZ 02419ccb00 update s3tc #3 ,android test 2013-08-06 15:33:38 +08:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
Lee, Jae-Hong 1acfca45b2 [Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1 2013-08-06 14:42:53 +09:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
godyZ 195536097f update s3tc #2 2013-08-06 11:52:48 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
godyZ fd7b00681f update s3tc#1 2013-08-06 11:19:45 +08:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
folecr bf6b57fe19 Changes to match reverting of namespace simplegame for this sample 2013-08-05 02:05:48 -07:00
folecr fe01166e92 Revert "namespace simplegame for game code" 
This reverts commit f35ebf6c494b68e6b3938a8ad1781d0d0684bb45.
 2013-08-05 02:05:47 -07:00
folecr 23061fb312 AssetsManagerTest 2013-08-05 02:05:47 -07:00
folecr ff079791e5 TestCpp 2013-08-05 02:05:47 -07:00
folecr d3476bec17 HelloCpp 2013-08-05 02:05:46 -07:00
folecr 81318d72ed Update target sdk version to 13 so that the game can handle all configuration changes 2013-08-05 02:05:46 -07:00
Rohan Kuruvilla 388edc144b Adding additional android:configChanges parameters to AndroidManifest 2013-08-05 02:05:46 -07:00
folecr 325892eb82 Remove dependency on cocos extensions 2013-08-05 02:05:43 -07:00
folecr 9da4b9798f Use android.appNativeActivity directly 2013-08-05 02:05:40 -07:00
folecr 1deb291026 Helper script to run the app 2013-08-05 02:05:40 -07:00
folecr d271d02004 namespace simplegame for game code 2013-08-05 02:05:39 -07:00
folecr ebd68c8feb Force enable debug 
* APP_OPTIM in Application.mk
 * android:debuggable="true" in AndroidManifest.xml
 * NDK_DEBUG=1 in build_native.sh
 2013-08-05 02:05:39 -07:00
folecr b87c29d50b simplegame : logging of entry points into app 2013-08-05 02:05:39 -07:00
folecr 21165cd285 simplegame : provide cocos_android_app_init() to initialize the Application. 2013-08-05 02:05:39 -07:00
folecr a5f9b19c30 simplegame : add option to build script to build in debug mode 2013-08-05 02:05:38 -07:00
folecr 2e81871497 simplegame : Fix build script to process input elements as an array 2013-08-05 02:05:38 -07:00
folecr c91d004fdc simplegame : NDK GDB debugging script 2013-08-05 02:05:38 -07:00
folecr e5377e2ddc simplegame : Use Cocos2dxActivity (which is also a NativeActivity.) 2013-08-05 02:05:38 -07:00
folecr fc3cd0c68c simplegame : Use cocos2dxandroid static library 2013-08-05 02:05:37 -07:00
folecr ccfdbe42bc simplegame : Use nativeactivity 2013-08-05 02:05:37 -07:00
folecr 816b77e7c0 simplegame : enable building native library for x86 2013-08-05 02:05:37 -07:00
folecr 26c5e1e180 simplegame : no java, Create empty src/ directory with a nojava.txt file 2013-08-05 02:05:37 -07:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
minggo 456b5af872 closed #2434:fixed path 2013-08-03 23:12:10 +08:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
carlo morgantini 4904e0f31f Clean up (as requested by code review) 2013-08-01 17:08:57 -07:00
carlo morgantini 2fb2916bae some more cleanup 2013-08-01 14:36:34 -07:00
boyu0 93aa3c7ada issue #2345: refract CCImage and CCTexture2D. 2013-08-01 15:53:52 +08:00
Huabing.Xu 9a9d0b9def closed #2423: add ActionTargetedReverse test case 2013-08-01 10:28:18 +08:00
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 2013-07-31 13:58:25 -07:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
minggo d887008bb8 Merge pull request #3336 from minggo/simplify-sample-code 
Simplify sample code
 2013-07-31 00:41:20 -07:00
minggo e412fe5a31 use Point::+ to simplify HelloWorld sample 2013-07-31 14:38:50 +08:00
minggo 0241470ff9 Merge pull request #3330 from dabingnn/Iss2447-ClippingNodeTestCrash-bug 
closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug
 2013-07-30 18:42:46 -07:00
carlo morgantini ff56ad5435 fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
carlo morgantini 9de1ef3f97 New label TTF. New text alignment sample. 2013-07-30 10:27:22 -07:00
Huabing.Xu 6a1938056c closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug 2013-07-30 16:27:13 +08:00
Éloi Rivard 14e200e61a Added debugging information in emscripten DEBUG mode 2013-07-30 10:11:30 +02:00
boyu0 afde1e57b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
carlo morgantini 023b46154f Fix problems with missing glyphs in .ttf file 2013-07-29 13:43:23 -07:00
boyu0 894584e5a0 Add texture2D convert test and fix the convert bugs 2013-07-29 17:34:33 +08:00
minggo 0b0c223d33 Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug 
Iss2437 render texture stencil test bug
 2013-07-29 01:25:14 -07:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
Huabing.Xu 0dcf9e88c3 close #2437: replace stencil mechanism with a new approach by removing glColorMask call 2013-07-29 14:13:36 +08:00
Huabing.Xu 4ebfc1c6e4 issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil 2013-07-29 14:11:21 +08:00
minggo 9780b75da8 Merge pull request #3273 from thp/develop-qt5 
Port Cocos2D-X to Qt 5 (develop branch)
 2013-07-28 16:51:55 -07:00
minggo 92f9ed743a use correct type to initialize an array 2013-07-28 23:23:35 +08:00
samuele3hu cc95fcaa69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 14:35:38 +08:00
samuele3hu 3aeefb51b3 Modify deprecated CCPhysicsDebugNode typedef and some test bug 2013-07-28 14:33:02 +08:00
minggo e97b2504ea fix a logical error 2013-07-28 10:22:12 +08:00
James Chen e66e429bb2 issue #2430: Moving enum type to class for CCBReader. 2013-07-27 21:44:49 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00
carlo morgantini 6e4aafdacf fix a problem with the new Label and colors 2013-07-26 16:30:36 -07:00
carlo morgantini 23575f0a68 New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
carlo morgantini 8416e7cf6d Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	scripting/javascript/bindings/generated
	tools/bindings-generator
 2013-07-26 15:54:50 -07:00