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

29468 Commits

Author SHA1 Message Date
minggo e10dab2098 Merge pull request #11679 from WenhaiLin/v3-fileutils-suitablePath 
Add FileUtils::getSuitableFOpen
 2015-05-05 09:29:58 +08:00
XiaoYang 89b5e8d99f Merge pull request #318 from zhukaixy/texturecube 
Texturecube
 2015-05-05 09:19:02 +08:00
zhukaixy a103d792f3 modify the texture.repeatParam to clamp to avoid warping artifacts of skybox 2015-05-04 17:43:42 +08:00
zhukaixy 2eee11302e Merge branch 'texturecube' of github.com:super626/cocos2d-x into texturecube 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-05-04 17:38:25 +08:00
zhukaixy d562ca51ba modify the texture.repeatParam to clamp to avoid warping artifacts of skybox 2015-05-04 17:34:49 +08:00
WenhaiLin 26c9be7881 Add FileUtils::getSuitableFOpen[window-universal] 2015-05-04 16:06:04 +08:00
WenhaiLin 1839564fbb Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7 2015-05-04 10:16:47 +08:00
WenhaiLin ed4c638663 Add test case for issue#10576 2015-05-04 10:09:14 +08:00
WenhaiLin 22c46b5c14 Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called. 2015-05-04 10:07:37 +08:00
TankorSmash 88833213ca Fix setSprite never updating progress on ProgressTimer 
Basically whenever you set a new sprite on a ProgressTimer, the new sprite is hidden.

 Calling setPercentage once with the same value doesn't work because the new percentage is the same as the old one. I've got a workaround setting the percentage to 0 and then back to the old value, but this change seems to solve that issue entirely.
 2015-05-03 14:35:50 -04:00
WenhaiLin 004cb5464e Fixed crash 2015-05-03 22:15:58 +08:00
Vladimir Timofeev 557f3e86b9 Fix warning in CCPURender.cpp: Comment out unused function 'compareParticle3D' because code that use it was commented. 2015-05-01 12:46:53 +03:00
Vladimir Timofeev fd3e44b72b Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms. 2015-05-01 12:36:19 +03:00
Vladimir Timofeev 62cad07a81 Fix couple of unused entities in cpp-tests 2015-05-01 12:24:04 +03:00
Vladimir Timofeev 912956a3b3 Correct field initialization order in spine (Xcode warnings). 2015-05-01 12:20:11 +03:00
Vladimir Timofeev 0aecc15a25 Correct field initialization order in various places (Xcode warnings) 2015-05-01 12:19:30 +03:00
Vladimir Timofeev 2d8c687d6e Fix the Frame class: 
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
 2015-05-01 11:51:20 +03:00
Vladimir Timofeev ad494a7131 Make a UserDefault destructor to be virtual. 
Because the UserDefault has virtual functions and allow programmers to inherit from, it must have a virtual destructor to allow a child object to destroy correctly.
 2015-05-01 11:45:47 +03:00
minggo 254a4b0b0c Merge pull request #11660 from natural-law/v3 
Rename the target name of Xcode project in templates.
 2015-04-30 18:13:41 +08:00
minggo c5a363ed41 Merge pull request #11668 from CocosRobot/update_cocosfiles_1430385825 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-30 17:31:52 +08:00
CocosRobot 038ac5ab2a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 09:23:48 +00:00
samuele3hu f4b57511b0 Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public 2015-04-30 17:18:12 +08:00
minggo 1e8b28c909 Merge pull request #11661 from andyque/update-3rd-party-libs-v3 
update deps to 48
 2015-04-30 17:17:13 +08:00
andyque 866cb77ccd fix copy extra unneeded lua scripts in cpp-test project 2015-04-30 16:47:00 +08:00
andyque 3cdae9c547 update deps 48 2015-04-30 16:18:34 +08:00
WenhaiLin 0e1338f6f8 Add test case for issue#10773 2015-04-30 16:11:59 +08:00
minggo 03bf2e7bfe Merge pull request #11658 from CocosRobot/update_lua_bindings_1430376855 
[AUTO]: updating luabinding automatically
 2015-04-30 16:05:33 +08:00
minggo 49b3a512ce Merge pull request #11657 from CocosRobot/update_cocosfiles_1430376631 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-30 15:55:05 +08:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08:00
WenhaiLin 7472bafee3 Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program. 2015-04-30 15:13:41 +08:00
CocosRobot 2b916b3b80 [AUTO]: updating luabinding automatically 2015-04-30 06:56:36 +00:00
CocosRobot 1759fa96fe [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 06:50:33 +00:00
minggo 561e57b47f Merge pull request #11656 from minggo/merge-v36 
Merge v36
 2015-04-30 14:47:42 +08:00
minggo 521b311f59 change to use v3 branch 2015-04-30 13:59:58 +08:00
minggo cd51a18172 change to use v3 branch 2015-04-30 13:50:43 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
minggo dbc036fef4 [ci skip]update CHANGELOG 2015-04-30 10:51:09 +08:00
minggo c785b7a021 Merge pull request #11655 from CocosRobot/update_cocosfiles_1430358246 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-30 09:44:27 +08:00
CocosRobot 8507d7e5a4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 01:44:07 +00:00
minggo 79a6f2f510 Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix 
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
 2015-04-30 09:41:52 +08:00
Dale Stammen dfee3ae3cb added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 10:23:22 -07:00
Dale Stammen 904abeab87 added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 09:48:14 -07:00
Dale Stammen f64012d77b special shaders for Windows Phone 8.1 with no gl_PointSprite 2015-04-29 09:47:44 -07:00
minggo 0df4c5fc06 [ci skip]update CHANGELOG 2015-04-29 18:47:35 +08:00
minggo c2c44dec82 Merge pull request #11651 from WenhaiLin/v3.6 
VideoPlayer:Fixed can't play video on Android 2.3.x
 2015-04-29 18:43:57 +08:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
WenhaiLin 8f3566add9 Merge branch 'v3.6' of https://github.com/WenhaiLin/cocos2d-x into v3.6 2015-04-29 18:37:18 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
minggo 9586cdf2c8 Merge pull request #11650 from xiaofeng11/v3.6 
Fix a logical bug that may cause null pointer been used
 2015-04-29 16:21:17 +08:00
XiaoFeng 9d0741544c Fix a logical bug that may cause null pointer been used 2015-04-29 15:58:44 +08:00