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

915 Commits

Author SHA1 Message Date
minggo fef079aee6 Merge pull request #8682 from super626/fixbillboard 
Fixbillboard
 2014-10-16 12:04:50 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
SunLightJuly f1ce16b463 added ClippingRectangleNode Test 2014-10-15 13:41:47 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
songchengjiang 081196c933 fixed BillBoard 
Added New Test case
 2014-10-14 15:08:36 +08:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +08:00
songchengjiang ecd63db80b Fixing bug 2014-10-13 19:10:42 +08:00
minggo 0351000c97 Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap 
V3 add staggered tile map
 2014-10-13 13:50:50 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
minggo c01d1b1166 Merge pull request #8646 from huangshiwu/v3_languagecode 
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
 2014-10-11 16:23:49 +08:00
minggo 2db8217b09 Merge pull request #8543 from Dhilan007/v3-fixwarns 
fix warns and memory leak
 2014-10-11 16:07:54 +08:00
huangshiwu 4dd9120e67 fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string 2014-10-11 15:19:20 +08:00
Huabing.Xu 7747e2ecf5 Merge branch 'v3' into v3_addStaggeredTileMap 2014-10-11 15:15:12 +08:00
Huabing.Xu 55431d6a83 add tile map staggered test 2014-10-11 15:09:58 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
andyque 59ff2fbf72 remove dead code 2014-10-10 18:08:25 +08:00
andyque 0f0c3878e5 add more indicator 2014-10-10 17:36:33 +08:00
andyque fb1adb5b90 add issue tests skeleton 2014-10-10 17:07:08 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
andyque da48649370 fix button title only content size issue 2014-10-10 11:01:51 +08:00
pipu ee624e47cc 1. Modifying UIScale9Sprite 
2. Updating UI Test
3. Updatding resource of ActionTimeline
 2014-10-10 10:44:16 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
minggo f928046f50 Merge pull request #8580 from Dhilan007/v3-labelfix 
issue #8492:fix endless loop when dimensions that are not enough to fit one character
 2014-10-09 17:05:39 +08:00
Ricardo Quesada 27cb6afb5e fixes warnings on Android 2014-10-08 18:55:33 -07:00
Dhilan007 8ea473de7b fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
Ricardo Quesada 84da993677 more samples using node::schedule(labmda) 2014-10-03 17:11:39 -07:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
minggo 44aba5b2af Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements 
Scale9Sprite improvements
 2014-09-30 17:09:02 +08:00
Dhilan007 90769ef242 fix compile error on win32 2014-09-30 14:40:24 +08:00
Dhilan007 02fcb6488a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
 2014-09-30 14:19:27 +08:00
Dhilan007 18307d52da fix macro 2014-09-30 09:48:24 +08:00
Dhilan007 7ebe4a5548 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/audio/AudioEngine.cpp
	cocos/audio/apple/AudioPlayer.h
	cocos/audio/include/AudioEngine.h
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
 2014-09-30 09:45:47 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
Ricardo Quesada a16c5d5e43 Adds missing includes 2014-09-29 14:45:43 -03:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao bf84aba47e do not add ambient color by default 2014-09-25 16:27:31 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
Dale Stammen b9c57f7e28 changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist 2014-09-23 10:39:17 -07:00