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

3461 Commits

Author SHA1 Message Date
dumganhar ef753afb6b modify eclipse project setting for linux port 2012-01-12 19:15:23 +08:00
minggo df668c9785 Merge pull request #675 from minggo/test 
fixed #930: linux supports jpg format file
 2012-01-12 01:51:16 -08:00
minggo 0e03c8ca21 fixed #930: linux supports jpg format file 2012-01-12 17:46:53 +08:00
minggo cfe02e39ef Broken include guard in CCActionEase.h 2012-01-12 17:06:46 +08:00
dumganhar b87dbaea6e Merge pull request #672 from dumganhar/iss943_bada1.2.1 
fixed #943: Box2d can't be compiled successfully on bada sdk 1.2.1
 2012-01-11 19:55:49 -08:00
dumganhar 93d0878a36 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss943_bada1.2.1 2012-01-12 11:53:29 +08:00
dumganhar ad50b3f87e fixed #943: Box2d can't be compiled successfully on bada sdk 1.2.1 2012-01-12 11:52:57 +08:00
minggo e9231e6722 Merge pull request #671 from minggo/test 
modify picture and set android icon for HelloLua
 2012-01-11 18:41:22 -08:00
minggo 9890a4f655 modify picture and set android icon for HelloLua 2012-01-12 10:39:39 +08:00
minggo 3905e5a47b Merge pull request #670 from minggo/test 
fixed #941: limit background music volume in [0, 1.0]
 2012-01-11 01:57:27 -08:00
minggo 40b1798f41 fixed #941: limit background music volume in [0, 1.0] 2012-01-11 17:56:11 +08:00
minggo fd0e8a67ac Merge pull request #668 from minggo/test 
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
 2012-01-11 01:45:54 -08:00
minggo ac2a508225 fixed #940: add new icons for wohpne 2012-01-11 17:43:12 +08:00
dumganhar 360644635f Merge pull request #669 from dumganhar/releaseTest 
fix a bug in SimpleAudioEngine.cpp on bada platform
 2012-01-11 01:31:36 -08:00
dumganhar 71177c27f2 Merge branch 'test' of https://github.com/minggo/cocos2d-x into xiaoming 2012-01-11 17:27:45 +08:00
dumganhar 4848dc9c46 fix a bug in SimpleAudioEngine.cpp on bada platform 
use float value to change volume
 2012-01-11 17:24:46 +08:00
minggo 75216ac9ca make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function 2012-01-11 16:54:14 +08:00
dumganhar 81cda82498 Merge pull request #667 from dumganhar/releaseTest 
Update some files for qnx platform!
 2012-01-10 23:48:50 -08:00
minggo 13c31d086c Merge pull request #666 from minggo/test 
modify version
 2012-01-10 23:21:35 -08:00
minggo 57801eb0a0 modify version 2012-01-11 15:17:16 +08:00
dumganhar 5a411277fb modify helloworld project setting and use new icon for qnx project 2012-01-11 14:31:31 +08:00
dumganhar 0bef3e1844 rename create_***_project.sh to create-***-project.sh 2012-01-11 13:36:51 +08:00
dumganhar 27e4ee1c5f Merge pull request #665 from dumganhar/iss939_create_qnx_project 
add create qnx project script for mac or linux system.
 2012-01-10 01:25:48 -08:00
dumganhar 8a2a0744cd Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss939_create_qnx_project 2012-01-10 17:20:14 +08:00
dumganhar 7a231969fe add prompt of creating project successfully 2012-01-10 17:18:42 +08:00
dumganhar 42b13c5b0a add create qnx project script for mac or linux system. 2012-01-10 17:05:42 +08:00
minggo 370c70ff81 Merge pull request #664 from minggo/test 
fixed #940: replace icons and background pictures
 2012-01-10 01:02:57 -08:00
minggo 86997d6709 fixed #940: replace icons and background pictures 2012-01-10 16:45:49 +08:00
dumganhar f9fa7729fd Merge pull request #663 from dumganhar/useVBscript2CreateBadaQnxProj 
Use vbscript to create bada and qnx project
 2012-01-09 19:46:52 -08:00
dumganhar cff46c1064 use vbscript to create projects for qnx and bada platform 2012-01-10 11:39:58 +08:00
dumganhar 69d91dc6e1 Merge branch 'master' into iss939_create_qnx_project 2012-01-10 09:57:35 +08:00
dumganhar ffeed3827a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject 
Conflicts:
	cocos2dx/platform/CCPlatformMacros.h
 2012-01-09 23:23:45 +08:00
dumganhar d61f87ba92 modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void) 2012-01-09 23:21:31 +08:00
dumganhar cb4dc6623b Merge pull request #662 from dumganhar/iss939_create_qnx_project 
fixed #939: Add create_qnx_project.vbs and add project references
 2012-01-09 03:09:41 -08:00
dumganhar 317f23f498 fixed #939: Add create_qnx_project.vbs and add project references 2012-01-09 19:06:49 +08:00
minggo 491fbe6302 Merge pull request #661 from minggo/iss917_CCFileUtils 
fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS
 2012-01-09 01:40:26 -08:00
minggo 0ee582e887 fixed #917: add header files to resolve compiling errors 2012-01-09 17:36:57 +08:00
minggo b1aee8f9eb Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils 2012-01-09 17:12:46 +08:00
dumganhar 3c8f593653 Merge pull request #660 from dumganhar/issue#938WaveM_gl 
Issue#938 glGenFramebuffersOES isn't supported on wave m device
 2012-01-08 22:21:37 -08:00
dumganhar 4cc1658d45 fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash. 2012-01-09 14:15:49 +08:00
dumganhar 259aaf42a6 Fixed: get extension function from eglGetProcAddress on bada platform 2012-01-09 14:15:18 +08:00
minggo a5150259f0 Merge pull request #659 from dumganhar/useVirtualProperty 
Use virtual property
 2012-01-08 19:20:02 -08:00
dumganhar 30a02030b0 make the property function to virtual 2012-01-09 11:07:45 +08:00
dumganhar 9a8bde433b Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-09 10:35:15 +08:00
dumganhar a773e4fb96 move SelectorProtocol to CCObject 2012-01-08 21:03:16 +08:00
dumganhar 81ea3eae78 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-06 21:42:56 +08:00
dumganhar 2f1c313d12 Merge pull request #658 from gzito/master 
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
 2012-01-04 22:09:22 -08:00
gzito 65ddb88000 Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version) 2012-01-04 23:34:48 +01:00
dumganhar 85673885be Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-04 20:56:56 +08:00
minggo d9a6cd0e19 Merge pull request #657 from minggo/iss937_x86 
fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86
 2012-01-04 02:06:24 -08:00