Commit Graph

61 Commits

Author SHA1 Message Date
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +08:00
laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
Conflicts:
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +08:00
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
2011-08-25 19:04:29 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now.
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
minggo 09dc164fff issue : update to v1.0.1 2011-08-02 15:45:27 +08:00
Eli Yukelzon 9c5fa51e6b usuful macros for defining scene() and node() methods with params 2011-07-30 11:55:38 +03:00
minggo ff50997eb0 issue 2011-07-06 14:56:05 +08:00
natural-law 4d5dab4a40 fixed , Upgrade folder layers_scenes_transitions_nodes to rc3. 2011-07-01 11:26:26 +08:00
minggo d72d8a52f4 Merge https://github.com/cocos2d/cocos2d-x 2011-06-21 13:53:04 +08:00
Walzer 4d161e7948 fix , add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer 2011-06-21 10:53:20 +08:00
minggo 022e2b9998 issue : refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
natural-law d4dbedca4d fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
2011-04-11 11:24:10 +08:00
minggo 22b55eaf78 issue : add copyright of original author to each file 2011-03-19 10:59:01 +08:00
minggo 7c52a521fa fixed : change UIEvent to CCEvent 2011-03-18 09:39:34 +08:00
minggo f1d13ca2e1 issue : android compiled ok 2011-03-08 13:49:58 +08:00
minggo 7a331e1e14 issue : wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00
natural-law 949c1000a8 update tests to 0.99.5. 2011-02-23 16:47:25 +08:00
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	.gitignore
2011-02-12 16:42:47 +08:00
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +08:00
yangws 67c0ad6332 add platform support project on win32.
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
natural-law 01cd90f2cc update layers_scenes_transition_nodes to 0.99.5. 2010-12-27 09:40:45 +08:00
natural-law 2706e3a003 fixed CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
Walzer 0ad77b779a issue don't checkout 2010-11-18 15:55:00 +00:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
natural-law 2b23e0f6d5 debug 2010-11-18 10:27:05 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed 2010-11-13 03:34:49 +00:00
natural-law 000bdeeb42 issue
add support of Accelerometer sensor
2010-11-10 08:29:52 +00:00
Walzer 77564d0017 add LAYER_NODE_FUNC & SCENE_NODE_FUNC 2010-10-09 06:23:47 +00:00
Walzer dad659641b issue , add @brief in class annotate 2010-09-29 01:44:57 +00:00
Walzer 01eb8da314 issue , modify object-c code in annotate. 2010-09-28 04:14:12 +00:00
Walzer 5fd1bf85b6 issue , return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming 9a12e848f5 fixed 2010-09-03 01:32:13 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Ming 60adec78e8 issue : avoid virtual inheriting from NSObject, and remove the using of dynamic_cast() 2010-08-27 06:13:32 +00:00
Ming 710e29b086 issue 2010-08-25 02:19:20 +00:00
natural-law 90c8b7898f issue
add effects test code
2010-08-23 02:17:29 +00:00
natural-law 2aa5312c77 issue
fix little bugs
2010-08-06 03:08:55 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Walzer 03df28e28a issue , debug 2010-08-03 06:50:41 +00:00
Ming 52ace69f09 issue : dll export support 2010-08-02 03:13:36 +00:00
Walzer 458ca18148 issue , implement 2010-07-30 09:18:20 +00:00