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

28698 Commits

Author SHA1 Message Date
CocosRobot f65f20e270 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-01 02:57:37 +00:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
XiaoYang 17f4539bbd Merge pull request #277 from lvlonggame/v3 
modify removeFromMap() and initialize _forceDepthWrite
 2015-04-01 10:53:47 +08:00
minggo 02e8a08de7 Merge pull request #11241 from tangziwen/v3_doc 
update 3d doc
 2015-04-01 10:52:35 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3 
Add destroyCocosStudio()
 2015-04-01 10:49:49 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo 7b2fcb5287 Merge pull request #11237 from perminovVS/v3-dev-rename-file-win32 
Win32 correct rename file
 2015-04-01 09:35:18 +08:00
minggo 668457ae53 Merge pull request #11236 from CocosRobot/update_lua_bindings_1427797481 
[AUTO]: updating luabinding automatically
 2015-04-01 09:33:46 +08:00
xiaofeng11 75ae19f660 Merge pull request #4 from pipu/cocostudio_destroyCocosStudio 
Add method destroyCocosStudio() for CocoStudio
 2015-03-31 20:02:44 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
Vladimir Perminov b7279524d6 Win32 correct rename file 
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
 2015-03-31 13:52:40 +03:00
CocosRobot 46f32142c7 [AUTO]: updating luabinding automatically 2015-03-31 10:26:49 +00:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube 
Bug fix: ios devices crash on release mode
 2015-03-31 18:21:22 +08:00
minggo 940c3f2bde [ci skip]update CHANGELOG 2015-03-31 17:56:20 +08:00
minggo 56a20c746f Merge pull request #11232 from kikuta-poppin-games/v3 
fixed xcodeproj link
 2015-03-31 17:33:42 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
minggo 8f385e97d4 Merge pull request #11231 from CocosRobot/update_cocosfiles_1427781237 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-31 17:21:13 +08:00
XiaoYang fec28bc8ba Merge pull request #278 from zhukaixy/texturecube 
bugfix: TextureCube will be crashed on release environment
 2015-03-31 17:03:03 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
xiaofeng11 d8659d72e4 Merge pull request #3 from pipu/deprecated_reader_purge 
Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.
 2015-03-31 15:10:00 +08:00
lvlong 044376be7e Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-03-31 14:57:43 +08:00
pipu bb110449be Reset method purge() definition for some Reader. 2015-03-31 14:56:24 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
kikuta 8678ae0cda fixed xcodeproj link 2015-03-31 15:34:22 +09:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +08:00
CocosRobot 6410eca425 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-31 05:53:58 +00:00
minggo 264b01555d Merge pull request #11228 from CocosRobot/update_lua_bindings_1427774406 
[AUTO]: updating luabinding automatically
 2015-03-31 13:52:21 +08:00
xiaofeng11 71fd476355 Merge pull request #1 from pipu/cocostudio_destroyInstance_v3_xiaofeng 
Add destroyCocosStudio()
 2015-03-31 13:20:18 +08:00
CocosRobot 00792e98a3 [AUTO]: updating luabinding automatically 2015-03-31 04:01:57 +00:00
minggo 4bdc3ec3ca [ci skip]update AUTHORS 2015-03-31 11:59:57 +08:00
minggo 7564e01314 [ci skip]update CHANGELOG 2015-03-31 11:58:09 +08:00
minggo 6ef27df2fc Merge pull request #11223 from hawkwood/patch-6 
Remove use of autorelease NSString and NSURL
 2015-03-31 11:57:00 +08:00
minggo 0e1fda08ee Merge pull request #11222 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-31 11:53:23 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
yangxiao 4e03c62b03 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-03-31 11:09:59 +08:00
yangxiao a6c1d15120 fix warning 2015-03-31 11:09:38 +08:00
lvlong df95ab8f1a size to integer 2015-03-31 11:04:37 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
Justin Hawkwood 237e809f23 Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:27:05 -07:00
Justin Hawkwood 3641ef266c Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:24:48 -07:00
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
XiaoYang dd53f0154d Merge pull request #266 from lvlonggame/v3 
set animate 3d quality
 2015-03-30 18:10:43 +08:00
lvlong 4bc44c207d modify config-example.plist 2015-03-30 18:07:32 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
lvlong f967fef7d0 modify Sprite3DWithSkinTest, can switch animation quality. 2015-03-30 17:08:49 +08:00
yusheng.lu 60e2db1342 test commit1 2015-03-30 16:51:25 +08:00
pipu 6f20da4444 Add destroyCocosStudio() 2015-03-30 16:46:33 +08:00