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

1155 Commits

Author SHA1 Message Date
James Chen 4edd35e2b1 Merge pull request #2829 from dumganhar/nacl-fix 
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
 2013-06-08 03:00:04 -07:00
James Chen aee8e829ca [Android] Updating Application.mk for HelloLua and TestLua. 2013-06-08 17:28:03 +08:00
James Chen bf781feba1 [NaCL] Updating project. 2013-06-08 16:08:55 +08:00
James Chen bb8a0d2859 Updating iOS Project after adding Armature support. 2013-06-08 16:08:05 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
James Chen 51aa2433fc Updating makefile for native client. 2013-06-08 15:35:45 +08:00
samuele3hu 836bfe1d3f issue #2103 modify audioEngine table name to AudioEngine 2013-06-08 14:06:19 +08:00
yinkaile 8ff088da53 Standardize code 2013-06-08 12:14:43 +08:00
yinkaile cba46082ce Standardize code 2013-06-08 11:48:45 +08:00
samuele3hu 34b4cb48ab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine 2013-06-08 11:25:51 +08:00
samuele3hu 4be415cc04 issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua 2013-06-08 11:23:21 +08:00
carlo morgantini b7ffb5b810 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-07 16:33:01 -07:00
yinkaile 7c924c714f Standardize code 2013-06-07 22:56:54 +08:00
James Chen 5c8d4378a6 Fixing compilation errors in TestLua for Win32. 2013-06-07 21:23:15 +08:00
James Chen 43e8573d8b Merge pull request #2807 from dumganhar/master 
[BB] Updating project configuration.
 2013-06-07 03:49:10 -07:00
James Chen 7c650d7f28 [BB] Updating project configuration. 2013-06-07 18:45:58 +08:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
James Chen e3e90db71c [BB] Adding extra lua script resource folder for TestLua. 2013-06-07 18:16:10 +08:00
samuele3hu dda3c34be8 issue #2103 add webSocket lua test sample 2013-06-07 17:48:07 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
samuele3hu 16a34b0da3 issue #2103 add webSocket lua test sample 2013-06-07 16:51:50 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
James Chen 942c797749 Removing unused codes. 2013-06-07 15:39:18 +08:00
samuele3hu a2cf4933c4 issue #2103 add webSocket lua test sample 2013-06-07 14:57:36 +08:00
samuele3hu cdbf8b7250 issue #2103 add webSocket lua test sample 2013-06-07 13:55:36 +08:00
samuele3hu c021f700d3 issue #2103 add webSocket lua test sample 2013-06-07 12:54:39 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
samuele3hu 5986d3904d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 10:14:12 +08:00
samuele3hu 66d4acc31a issue #2103 add webSocket lua test sample 2013-06-07 10:12:01 +08:00
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration 
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
 2013-06-06 12:23:44 -07:00
minggo 1e9397d490 Merge pull request #2793 from minggo/master 
copy CCBReaderLoad.lua to TestLua Resources
 2013-06-06 08:07:41 -07:00
minggo 4fa069df58 issue #2103:copy CCBReaderLoad.lua to TestLua Resources 2013-06-06 23:04:26 +08:00
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +08:00
James Chen 6f52d72b82 [iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp. 2013-06-06 18:07:11 +08:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
James Chen 03549e6a59 Updating JS-Test. 2013-06-06 15:47:07 +08:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
James Chen f22d320797 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 2013-06-06 14:24:58 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
 2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
minggo cdf09c04ea issue #2103:make HelloLua & TestLua work on vs2010 2013-06-05 17:43:49 +08:00
minggo 3713ff5b71 Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder 
add cocosbuilder lua test sample
 2013-06-05 01:38:57 -07:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const". 
2.  dolete license.
 2013-06-05 15:05:49 +08:00
minggo d71e07db4e fixed conflict 2013-06-05 13:48:31 +08:00
James Chen 26219d4a14 Minor fix in CCConfiguration. 2013-06-05 09:41:03 +08:00
James Chen 2a16a6b17f Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value 2013-06-05 09:36:53 +08:00