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

4106 Commits

Author SHA1 Message Date
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
folecr ee5f319a77 Fix include path 2013-06-24 17:29:24 -07:00
folecr 295f9e0fec Do nothing in the case of forAsync 2013-06-24 16:42:56 -07:00
folecr 2e0804ae29 Remove references to zip file 2013-06-24 15:15:25 -07:00
folecr 21405531aa getFileData() 
* The async case is NYI
 * include stdlib for abort() when forAsync is true
 2013-06-24 15:14:15 -07:00
folecr 7090d8daad isFileExist() 2013-06-24 15:14:15 -07:00
folecr 0422953bbe Native Asset Manager 2013-06-24 15:14:14 -07:00
folecr e916cef32b #define LOGD 2013-06-24 15:14:14 -07:00
folecr be6633b560 Add -landroid to LOCAL_LDLIBS and LOCAL_EXPORT_LDLIBS 2013-06-24 15:14:14 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 62902ad212 Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 1b3d0c39ad issue #2322: Action now is inherited from Object and Clonable now. 2013-06-23 17:22:23 +08:00
James Chen 195605c85d issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
James Chen aaeb4e13b0 issue #2322: Adding Property Sheet cocos2dx.props for sharing project configuration. Now it's only for linking libraries. 2013-06-23 17:20:12 +08:00
Ricardo Quesada 64d7cd404e Removes copy from Point. 
Adds clone instead
 2013-06-21 15:13:52 -07:00
Ricardo Quesada 6c0c48a3a9 Removes CallFuncO and CallFuncND 
...which can be simualted with CallFunc and CallFuncN.

Adds std::function() support to CallFuncN.
Adds more samples
 2013-06-21 14:58:52 -07:00
James Chen 4a8eabd97f Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 17:01:22 +08:00
minggo b434190a70 issue #2305: tab -> 4 spaces 2013-06-21 15:49:45 +08:00
minggo ef7fd16f76 issue #2305: tab -> 4 spaces 2013-06-21 15:43:17 +08:00
minggo 68559dfa00 issue #2305: use c++11 thread instead of pthread in CCTextureCache 2013-06-21 15:29:21 +08:00
James Chen 56f8ab2675 Typo fixes in CCNode.h. 2013-06-21 13:47:29 +08:00
James Chen e7ee2f2151 [Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox. 2013-06-21 11:57:14 +08:00
James Chen b74db627af Don't make Action be inherited from Clonable. Why?? Please refer to https://groups.google.com/forum/?hl=en#!topic/cocos2d-js-devel/dGJYz9wIb4Q , but we need to find out the real reason why VS compiler generate linking errors. 2013-06-21 11:19:17 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
James Chen 2a715ec3cf Merge pull request #2956 from ricardoquesada/cc_namespace_obj 
issue #2129: Re-adds 'CC' prefix to objective-c classes.
 2013-06-20 19:10:01 -07:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
Sam Clegg 04d7d5a061 [NaCl] Add support for building using glibc toolchain. 
BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
 2013-06-20 12:56:14 -07:00
Sam Clegg b5a509e65e [NaCl] Don't cache font size 
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.

Review URL: https://codereview.chromium.org/14308007
 2013-06-20 12:56:13 -07:00
Sam Clegg 5c4545de3c [NaCl] Remove use of -lnosys 2013-06-20 12:56:13 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
James Chen 2ceec2f65d Merge pull request #2947 from pyrasis/tizen_2.1 
[Tizen] Fix compile error
 2013-06-20 04:58:21 -07:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 8b2b95ab4d [WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object 2013-06-20 18:02:37 +08:00
James Chen 6ce5064f32 [WIN32] NULL --> nullptr for CCLayer.cpp. 2013-06-20 18:01:53 +08:00
James Chen a90f51d03a Merge branch 'develop' of z:/Project/cocos2d-x into develop 2013-06-20 17:38:23 +08:00
James Chen d79ecd038c Merge pull request #2942 from dumganhar/iss2129-format-codes3 
closed #2129: Removing CC prefix to make cocos2d-x more CPP friendly.
 2013-06-20 01:19:49 -07:00
minggo 9caa40590a Merge pull request #2941 from minggo/iss2304-refator-cclayer 
fix a crash on android
 2013-06-20 00:06:55 -07:00
minggo e39df16d49 use correct pointer to be closed 2013-06-20 15:03:51 +08:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
James Chen 136a9743d4 issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones. 2013-06-20 12:56:51 +08:00
minggo 227e95d429 Merge pull request #2936 from minggo/iss2304-refator-cclayer 
issue #2304:accelerometer fix of mac
 2013-06-19 19:58:15 -07:00
minggo 924ba1bdca issue #2304:accelerometer fix of mac 2013-06-20 10:56:13 +08:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
James Chen 663673b683 Adding missing include in ZipUtils.h. 2013-06-19 16:11:16 +08:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen 016d34d889 Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 2013-06-19 15:08:09 +08:00
James Chen 86f7fd4988 Merge pull request #2925 from dumganhar/musikov-develop 
fixed #2303: Missing precision when getting strokeColor and fontFillColor
 2013-06-18 23:27:57 -07:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
James Chen b7a33afc71 fixed #2303: float assignment fix. 2013-06-19 14:09:23 +08:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen b91e432258 Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate 
fixed #2301: Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
 2013-06-18 22:56:02 -07:00
minggo ef254fe6b0 Merge pull request #2918 from superrad/patch-1 
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as P...
 2013-06-18 22:53:29 -07:00
James Chen 8f33bf7e05 issue #2301: _pTextures --> _textures. 2013-06-19 13:40:21 +08:00
James Chen fa6a0d4051 issue #2301: m_pTextures --> _pTextures. 2013-06-19 13:15:03 +08:00
James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate 
Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
 2013-06-19 13:03:51 +08:00
James Chen c4386b9b15 Merge branch 'clone_reverse_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-clone_reverse_fixes 2013-06-19 10:50:27 +08:00
Lee, Jae-Hong b546fc3214 Implement Accelerometer. 2013-06-19 09:31:34 +09:00
Ricardo Quesada 159ef1ec68 clone() doesn't use copy constructor 
... and other bug fixes
 2013-06-18 15:06:53 -07:00
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 2013-06-18 09:59:34 -07:00
Andrew Glass 9df6d1271b CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2 
When loading a PVRv3 the _format variable would not be set, always being the default value.
 2013-06-18 16:16:17 +02:00
minggo e9d8595617 fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe 2013-06-18 17:10:54 +08:00
James Gregory ad90fe88a8 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-06-17 20:30:36 -07:00
waiter ecebf31287 solve android crash with CCLabelTTF setString function 
solve android crash with CCLabelTTF setString function
 2013-06-18 10:08:34 +08:00
James Gregory 5095b03f9c Get async image loading building with -O2 and asm.js 2013-06-17 17:10:41 -07:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
James Chen 8fb40eaee2 android target 17 --> 8. 2013-06-17 15:55:09 +08:00
James Chen 12d83f543b Merge pull request #2900 from dumganhar/flaming0-develop 
merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
 2013-06-15 20:22:28 -07:00
James Chen 4c6043c9d2 Merge pull request #2898 from pyrasis/tizen_2.1 
[Tizen] Add armv7l webp library.
 2013-06-15 20:03:37 -07:00
Ricardo Quesada a0cbef1005 Adds missing methods: clone() and reverse() 2013-06-15 19:44:39 -07:00
Lee, Jae-Hong 8c1953eed9 Add armv7l webp library. 2013-06-16 11:07:55 +09:00
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet. 
Many methods not implemented yet.
 2013-06-15 18:54:34 -07:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Ricardo Quesada e40adb7ae7 EaseActions and more 
Added more reverse() const
 2013-06-15 12:38:32 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 1cfca9bc60 Updating property in CCDictionary. 2013-06-15 13:42:05 +08:00
James Chen 7295551f0f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-15 11:15:28 +08:00
minggo 5e83f36433 issue #2284: not treat using deprecated functions as error 2013-06-14 17:32:07 +08:00
minggo 47f4aee3cc issue #2284: use GLuint to fix compiling error 2013-06-14 16:48:18 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo ab8448e96b issue #2284: enable c++11 for emscripten port 2013-06-14 15:27:11 +08:00
minggo 400642baa8 issue #2284: initialize parameter as declared 2013-06-14 15:18:35 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
James Chen e56c63b03d Merge pull request #2884 from ricardoquesada/actions_clone_pattern 
issue #2289: Actions with clone() pattern 1/3
 2013-06-13 23:19:04 -07:00
Ricardo Quesada 8a6d33a212 Adds CC prefix to CALLBACK() 
Now it is called: CC_CALLBACK()
 2013-06-13 20:36:43 -07:00
Ricardo Quesada e2e68aa36d Removes "calling explicit constructor" 2013-06-13 20:08:56 -07:00
Ricardo Quesada 98190a21c0 Actions with clone() pattern 1/3 
This is the 1st patch of 3.

1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
 2013-06-13 17:25:14 -07:00
Mykyta Usikov 28e8899089 fixed strokeColor and fontFillColor of CCLabelTTF 2013-06-13 14:16:33 +03:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
minggo 5996e99b74 Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks 
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
 2013-06-12 22:51:21 -07:00
Ricardo Quesada c1d519aac2 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-13 10:46:28 +08:00
minggo 92ce25371a Merge pull request #2874 from ricardoquesada/labelttf_mac_fix 
LabelTTF vertical alignment fixed on OS X
 2013-06-12 19:45:31 -07:00