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

2839 Commits

Author SHA1 Message Date
dumganhar 2dde865c37 Merge branch 'master' into bada 2011-10-20 21:27:22 +08:00
Leon 5c4a3c3fda Merge remote branch 'upstream/master' 2011-10-20 18:34:10 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
Walzer 8179d79061 update ChangeLog & Authors for v0.9.2 2011-10-20 17:49:43 +08:00
Walzer c561737fb7 add CC_PROPERTY_READONLY & CC_PROPERTY marco into doxygen.cocos2d-x PREDEFINED field. Thanks to Ningyu Ran's contribution http://www.cocos2d-x.org/boards/6/topics/4620 2011-10-20 17:49:29 +08:00
Walzer b0be69e26e merge HelloLua modifications & updates into xcode4 template for lua. 2011-10-20 15:56:51 +08:00
Walzer cf7d411c71 fix copying license files error in install-tempaltes-xcode.sh 2011-10-20 15:44:20 +08:00
Walzer c1f67374c4 issue #753, update [windows addSubview:__glView] into box2d/chipmunk/lua xcode4 templates 2011-10-20 15:33:27 +08:00
Walzer 67bbbb2800 1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name 
2. fixed a tiny bug, FontTest can show font name on the top correctly
 2011-10-20 14:56:39 +08:00
dumganhar ccbdf54c6d if audio is playing, skip of it; 2011-10-20 13:49:01 +08:00
dumganhar 6451d8b6bf use ceil to compute viewport 2011-10-20 13:44:21 +08:00
dumganhar 63e8fe156b reset audio when audioout is interupted 2011-10-20 13:43:10 +08:00
Walzer 3baf45e923 Merge pull request #561 from walzer/master 
update xcode4 templates generator & xcode4 template for lua.
 2011-10-19 08:12:02 -07:00
Walzer 00669cc5ad update xcode4 templates generator & xcode4 template for lua. 2011-10-19 23:11:17 +08:00
Walzer abf35fe90a Merge pull request #560 from walzer/master 
fixed #754
 2011-10-19 07:21:42 -07:00
Walzer 707e22a2c8 fixed bug #754, particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version. 2011-10-19 22:20:13 +08:00
Walzer 641dfcf153 Merge pull request #559 from walzer/master 
fixed #753, visual orientation is wrong on ios5 simulator
 2011-10-19 06:44:52 -07:00
Walzer e3c39fe835 fixed #753, visual orientation is wrong on ios5 simulator 2011-10-19 21:43:25 +08:00
Walzer 5986a9da74 Merge commit '8aa014d3cd0ff82d40f801d3740829925fff5d87' from github.com/cocos2d/cocos2d-x.git 2011-10-19 21:00:21 +08:00
minggo 8aa014d3cd Merge pull request #558 from minggo/iss755 
fixed #743
 2011-10-19 05:05:23 -07:00
minggo 2490388f28 remove unneeded packages 2011-10-19 20:03:18 +08:00
minggo 68d03de677 fixed #743: let nativeInit() get correct screensize when running on device with software android buttons 2011-10-19 19:55:23 +08:00
dumganhar 707f2c2561 fix buffer count wrong 2011-10-19 17:15:21 +08:00
minggo 7e8e7c7e87 Merge pull request #557 from minggo/iss755 
fixed #755
 2011-10-19 02:03:19 -07:00
minggo 2d3bfd4a1a fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices 2011-10-19 17:01:35 +08:00
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
Leon 77b3a32e16 fix compile error on 64 bit Linux 2011-10-19 15:12:38 +08:00
minggo a37e87b69b Merge pull request #555 from minggo/master 
add ignore file types
 2011-10-18 23:51:01 -07:00
minggo d8825594a1 add ignore file types 2011-10-18 23:50:06 -07:00
minggo 866401e5d8 add ignore file types 2011-10-18 23:47:40 -07:00
minggo e9c133351d Merge pull request #554 from minggo/master 
make script more strongable
 2011-10-18 23:27:56 -07:00
minggo cc1c29c0ca Merge branch 'master' of https://github.com/minggo/cocos2d-x 2011-10-18 23:21:53 -07:00
minggo 3a17163897 make script more strongable 2011-10-18 23:21:39 -07:00
dumganhar a59fa1d596 use AudioOut to play effect 2011-10-18 18:10:53 +08:00
Walzer 43ee194833 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-10-18 17:42:30 +08:00
Walzer ae411f9503 fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h 2011-10-18 17:41:19 +08:00
dumganhar 40cf322d60 don't use CCAudioOut 2011-10-18 11:11:36 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
minggo cdbdef573c Merge pull request #553 from minggo/master 
copy files from HelloWorld/Classes and delete unneeded files
 2011-10-17 18:57:13 -07:00
minggo 8b3ce10ece copy files from HelloWorld/Classes and delete unneeded files 2011-10-18 09:55:56 +08:00
dumganhar e247668ee0 AudioOut support ogg format 2011-10-18 09:45:04 +08:00
minggo 5c3c0e4983 Merge pull request #551 from minggo/master 
change effect file to make CocosDenshionTest work ok in win32
 2011-10-16 23:24:53 -07:00
minggo 43d64360cf Merge branch 'master' of https://github.com/minggo/cocos2d-x 2011-10-17 14:22:53 +08:00
minggo 1ccfcc1e94 change effect file 2011-10-17 14:22:10 +08:00
dumganhar 6af6257fa9 Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada 
Conflicts:
	CocosDenshion/bada/CCAudioOut.cpp
	CocosDenshion/bada/CCAudioOut.h
 2011-10-17 13:45:16 +08:00
minggo 1eaa5a3f6f Merge pull request #550 from minggo/master 
modify the path to relative path in project setting
 2011-10-16 20:55:25 -07:00
minggo 9a834585bb modify the path to relative path in project setting 2011-10-16 20:53:48 -07:00
dumganhar 064014aeae make some special configure 2011-10-16 22:44:29 +08:00
minggo 602a7b5bc1 Merge pull request #549 from minggo/master 
make HelloWorld and tests work ok on linux with eclipse
 2011-10-16 02:23:23 -07:00
minggo 80cd3266df make HelloWorld and tests work ok on linux with eclipse 2011-10-16 02:21:17 -07:00