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

15425 Commits

Author SHA1 Message Date
minggo 1275d03c77 add override 2014-01-07 16:30:12 +08:00
heliclei 05f6fedd1e fix windows symbol link path error 2014-01-07 16:27:23 +08:00
James Chen 7b6bdf40f8 Updates README.md for linux build 2014-01-07 16:25:37 +08:00
minggo 6bb4f9822a ActionProgress has fade and tint effect 2014-01-07 16:23:58 +08:00
edwardzhou e1c21aa9cb rename UIHelper to Helper for consistency 2014-01-07 16:22:18 +08:00
James Chen d733556270 Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 00:00:19 -08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
James Chen 1be11f8a82 Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR for template. 2014-01-06 23:55:57 -08:00
CocosRobot f8e7f570f3 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 07:54:58 +00:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
Ricardo Quesada 947ed05e4c Merge pull request #4953 from ricardoquesada/render_quad_material_id 
RenderQuad with bigger size
 2014-01-06 23:41:50 -08:00
heliclei 5dadbce813 fix symbol link create error 2014-01-07 15:41:18 +08:00
Ricardo Quesada aa2168f66f RenderQuad with bigger size 
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
 2014-01-06 23:41:01 -08:00
James Chen b5e573edc1 Merge pull request #4952 from dumganhar/update-releasenote 
Updates releasenote for EventDispatcher
 2014-01-06 23:01:23 -08:00
James Chen 9626a44f70 Update RELEASE_NOTES.md 2014-01-07 15:00:15 +08:00
James Chen b50b110287 Update RELEASE_NOTES.md 2014-01-07 14:53:39 +08:00
James Chen c1827c9658 Update RELEASE_NOTES.md 2014-01-07 14:50:26 +08:00
James Chen 1031dbcd75 Updates release note for EventDispatcher. 2014-01-07 14:41:30 +08:00
James Chen 94d641a423 Merge pull request #4950 from dumganhar/update-readme 
Updates README.md for running new project.
 2014-01-06 22:11:17 -08:00
James Chen 2a3e24d5b5 Updates README.md for running new project. 2014-01-07 14:09:05 +08:00
James Chen 2eb8691f6a Merge pull request #4946 from dumganhar/linux-template-fix 
Linux template update
 2014-01-06 20:57:28 -08:00
minggo 295b92e6c7 Merge pull request #4949 from minggo/develop 
update changelog
 2014-01-06 20:50:13 -08:00
minggo e0b2d16a54 update changelog 2014-01-07 12:48:55 +08:00
James Chen 37b6ef99e3 Wrong dir fix for travis ci. 2014-01-06 20:04:30 -08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
James Chen b4da4071e7 Merge pull request #4943 from CocosRobot/updategeneratedsubmodule_1389065122 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-06 19:48:36 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
minggo 49d314363f Merge pull request #4945 from dabingnn/develop_label_shaderBug 
fix label fnt bug for wrong shader
 2014-01-06 19:44:06 -08:00
James Chen 2f7c41bd28 [travis] builds linux template now. 2014-01-06 19:42:51 -08:00
Huabing.Xu 6c6da4cf77 fix label fnt bug for wrong shader 2014-01-07 11:39:55 +08:00
James Chen 23012352ce Deletes unused Makefile for linux. 2014-01-06 19:36:13 -08:00
James Chen 2512c15cb9 Renames title names for cpp and lua templates. 2014-01-06 19:35:33 -08:00
James Chen 9183a69873 Simplifies linux template, build.sh is not needed now. 2014-01-06 19:34:48 -08:00
James Chen c965131a08 Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt. 2014-01-06 19:33:28 -08:00
CocosRobot 641255e3ef [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 03:25:39 +00:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
boyu0 f7c88a8134 issue #3401: update cmake project set 2014-01-07 11:09:40 +08:00
James Chen e52d8e562b Merge pull request #4942 from Dhilan007/develop_submodule 
Updates JS-Tests submodule.
 2014-01-06 19:03:49 -08:00
minggo 721181632b Merge pull request #4930 from Dhilan007/develop_crash 
fix error for load spriteFrames from plist in CCAnimationCache class.
 2014-01-06 18:57:47 -08:00
Dhilan007 f897407470 Updates JS-Tests submodule. 2014-01-07 10:55:42 +08:00
James Chen 465b33f162 Merge pull request #4941 from samuele3hu/developNewUI 
Fix:Resolve the release version of lua test sample compile error
 2014-01-06 18:29:38 -08:00
James Chen 9c0a2c9431 Merge pull request #4939 from nutty898/develop_nutty_modify_framework_removeuselesssample 
Develop nutty modify framework removeuselesssample
 2014-01-06 18:23:15 -08:00
CaiWenzhi 46b8805cef Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample 2014-01-07 10:21:01 +08:00
boyu0 8e64ef6d6d issue #3401: add physics lua auto generate to android.mk 2014-01-07 10:20:59 +08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
samuele3hu c553fd2b73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 10:10:17 +08:00
samuele3hu 01013195d3 Fix:Resolve the release lua test sample compile error 2014-01-07 10:08:58 +08:00
Ricardo Quesada 9d22c55d35 Merge pull request #4937 from ricardoquesada/relase_notes 
Relase notes
 2014-01-06 17:49:52 -08:00
CaiWenzhi 8cfc6fcafb Remove useless samples 2014-01-07 09:47:46 +08:00