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

277 Commits

Author SHA1 Message Date
samuele3hu 9b08cee01f issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
James Chen 1b3d0c39ad issue #2322: Action now is inherited from Object and Clonable now. 2013-06-23 17:22:23 +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 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 8b2b95ab4d [WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object 2013-06-20 18:02:37 +08:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08: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
Ricardo Quesada a0cbef1005 Adds missing methods: clone() and reverse() 2013-06-15 19:44:39 -07: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
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 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
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
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
flaming0 68ac1684a8 Fix windows build (nullptr instead of NULL when assigning to std::function) 2013-06-07 00:08:59 +04:00
samuele3hu 8e97c69b2f issue #2103 add cocosbuilder lua test sample 2013-06-05 16:25:23 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
minggo 1c700157b3 declare _functions as it is initialized 2013-06-04 11:57:32 +08:00
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc 
And fixes some minor issues on the iOS and OS X projects
 2013-06-03 12:13:24 -07:00
samuele3hu afa6b81ba7 issue #2103 add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
Sergey Shambir 44a6be80d2 More verbose logging in removeChildByTag and getActionByTag 
Tags are often hardcoded, so tag value will be useful to detect problem.
 2013-04-27 23:15:00 +04:00
James Chen 0d5d2e54fd cxx-generator ~> bindings-generator. 2013-04-09 13:47:12 +08:00
waiter af9e3442c6 Add CCRemoveSelf Action 2013-03-25 18:18:38 +08:00
waiter f6742c3bcd Add RemoveSelf Action 2013-03-25 11:14:19 +08:00
waiter 80c9e2f714 Add RemoveSelf Action 
Add RemoveSelf Action, so we can simple call CCRemoveSelf to remove the
node from parent.
 2013-03-25 11:10:51 +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 df56a2e3ec issue #1686: invoke sceneOrder() in CCTransitionScene::initWithDuration() 2013-03-01 15:30:40 +08:00
minggo 3e7e9ead5d issue #1686:add getInnerAction to CCEaseAction 2013-03-01 14:08:23 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
billy1380 a1753113b5 CCLens3d can be concave 
added boolean operator to enable the lens to be concave as well as
convex
 2013-02-16 03:12:12 +00:00
James Chen 317ac3dd95 Fixed memory leaks in CCActionCatmullRom class. 2013-01-23 14:38:46 +08:00
minggo 984b304ec5 issue #1468:change CCPoint CCSize CCRect from class to struct 2013-01-14 14:45:16 +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 bb486af6a7 Added stackable action support. Exchanged the order of action. 2012-12-26 18:59:31 +08:00
Lu Guanqun b2c13cba9d fix the reorder warning of class CCCallFunc 
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
 2012-12-10 16:07:19 +08:00
James Chen 839288671e fixed #1606: Override update function for ExtraAction. 2012-12-10 14:11:42 +08:00
James Chen f8c96483a0 fixed #1606: Return CCSequence pointer for CCSequence::create. 2012-12-10 12:02:24 +08:00
James Chen 73dd652604 fixed #1605: Crash occurs when adding just one action to CCSequence. 2012-12-10 11:10:11 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
dualface 030f5e7079 [luabinding] cleanup script handler when release CCCallFunc 2012-12-02 15:01:12 +08:00
dualface 393ce26330 rollback commit 2012-12-02 14:56:44 +08:00
dualface d929fe2893 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-01 22:20:08 +08:00
dualface 058b6e9f65 fix CCCallFunc for script 2012-12-01 22:19:54 +08:00
minggo a69ff7957c issue #1564:fix a logical erroe in CCRotationTo 2012-11-21 16:53:23 +08:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
Lu Guanqun 8270ee3e48 fix -Wreorder warning 
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
 2012-11-16 15:10:25 +08:00
minggo e19b418c62 issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
James Chen 2f5f7a601b issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3 
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
 2012-09-24 21:22:20 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
Donald Alan Morrison 6816fb94fc A few more minor documentation changes. OK, enough for today! :-) 2012-09-15 15:12:28 -07:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen a2b5916301 Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'. 
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
 2012-08-29 14:49:03 -07:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
Rolando Abarca f210b666ee removes a few warnings 2012-08-27 08:43:39 -07:00
Rolando Abarca 033ae81871 adds COCOS2D_JAVASCRIPT for some specifics parts 2012-08-27 08:43:39 -07:00
folecr cd87364277 Includes for typeinfo and spidermonkey_specifics.h 2012-08-27 08:43:39 -07:00
Rolando Abarca a97d0f5a95 fixes default values for functions 2012-08-27 08:43:39 -07:00
Rolando Abarca 2598fc97d1 adds TypeInfo to some classes 2012-08-27 08:43:38 -07:00
minggo 56ce6869d6 Merge pull request #1227 from donaldalanmorrison/gles20 
Gles20
 2012-08-23 18:32:39 -07:00
minggo 83606d7691 Merge pull request #1212 from mustime/testlua 
Testlua
 2012-08-23 03:08:25 -07:00
mustime b815504d69 issue #1425: change the design of CCCallFunc::create(int nHandler) 2012-08-23 16:27:22 +08:00
yichao.zhang 988a8d8a60 fixed #1298: do not update last action when it is done in IntervalAction 2012-08-22 19:48:32 +08:00
mustime 1ffdbc1639 issue #1425: add standard comment on CCCallFunc::create(int nHandler) and 
CCCallFuncN::create(int nHandler)
 2012-08-22 14:21:48 +08:00
mustime 57659d1584 issue #1425: modifing pkg files for Lua 2012-08-21 18:42:35 +08:00
Donald Alan Morrison 4f80c54884 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:26:35 -07:00
Donald Alan Morrison 9a8d1ca8b8 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:18:12 -07:00
James Chen 3c33c43fd4 fixed a bug in CCActionInterval.cpp. 
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
 2012-08-16 14:29:27 +08:00
Walzer a77a4eac03 add more details in doxygen comments. 2012-08-10 13:58:34 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
Walzer d7162fcfc5 Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1 2012-06-20 18:07:27 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 740e28dbc1 issue #1324: Uncommented old interfaces. 2012-06-14 17:29:23 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
James Chen be362bef9b issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp. 2012-06-11 21:58:04 +08:00
James Chen 62f87c18a2 issue #1310: Exported CCCatmullRomTo class and ccCardinalSplineAt function. 2012-06-11 20:02:40 +08:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
James Chen bd535c3c1c issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode. 2012-06-11 11:53:17 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
James Chen 93d1879a56 fixed #1277: CCToggleVisibility should implement copyWithZone. 2012-05-30 16:34:42 +08:00
minggo 14b923409a fixed #1217: implement reverse() for all subclass of CCEaseAction that missing it 2012-05-04 16:22:50 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00