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

4782 Commits

Author SHA1 Message Date
dumganhar cea250a962 restore original CCCopying as the parent class of CCObject 2012-01-17 10:54:21 +08:00
dumganhar d37664934f Merge branch 'master' of https://github.com/gzito/cocos2d-x into gzito 2012-01-17 10:04:51 +08:00
dumganhar aa4fae3980 restore original CCCopying as the parent class of CCObject 2012-01-17 10:00:22 +08:00
dumganhar ea0fb47f98 Merge branch 'master' into moveSel2CCObject 2012-01-17 09:37:31 +08:00
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01:00
gzito bd22d74331 Merge remote-tracking branch 'remotes/upstream/master' 2012-01-14 23:09:50 +01:00
gzito a9d03e6ad8 Renamed folder from airplay to marmalade 2012-01-14 22:47:19 +01:00
gzito cfd365f5d7 Updated paths from airplay to marmalade 2012-01-14 22:46:20 +01:00
Krystian Szczesny fecd429044 Fixed missing "using namespace cocos2d;" in LuaCocos2d.cpp when using tolua++ 
Added tolua++ for Mac, which was posted on Cocos2d-x forums by Haseeb Yousaf
 2012-01-14 11:31:49 +01:00
dumganhar 1d460b70c7 Merge pull request #680 from dumganhar/modify_prompt 
update create-qnx-project.sh
 2012-01-12 05:14:41 -08:00
dumganhar f15cf31872 update create-qnx-project.sh 2012-01-12 21:12:58 +08:00
dumganhar d2f41bca1a Merge pull request #679 from dumganhar/modify_prompt 
Modify prompt of building successfully
 2012-01-12 05:10:31 -08:00
dumganhar 29b03b5355 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_prompt 2012-01-12 21:07:10 +08:00
dumganhar 7c99004f27 modify prompt of building successfully 2012-01-12 21:06:05 +08:00
minggo dc6a4ce709 Merge pull request #678 from minggo/test 
make linux template work correctly
 2012-01-12 04:24:38 -08:00
minggo 813342fb83 make linux template work correctly 2012-01-12 20:20:09 +08:00
dumganhar d3642be42d Merge pull request #677 from dumganhar/modify_linux_port 
modify eclipse project setting for linux port
 2012-01-12 04:00:02 -08:00
minggo 07452fb561 Merge pull request #676 from minggo/test 
update CHANGELOG
 2012-01-12 03:33:04 -08:00
minggo bd5ff14e45 Merge branch 'test' of https://github.com/minggo/cocos2d-x into test 2012-01-12 19:30:46 +08:00
minggo fc44e1b778 update CHANGELOG 2012-01-12 19:29:08 +08:00
dumganhar 3f7ab5a58f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port 2012-01-12 19:17:31 +08:00
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