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

15270 Commits

Author SHA1 Message Date
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
Ricardo Quesada 2f4011ab17 minor fixes with the information 2014-01-06 17:31:47 -08:00
Ricardo Quesada 957c3b41da Tables fixes 
Since markdown doesn't support  tables, it is using
"fended" blocks to simulate tables
 2014-01-06 17:04:12 -08:00
Ricardo Quesada a5f5104ab7 misc changes 2014-01-06 16:33:14 -08:00
Ricardo Quesada d15768d630 Removes RELASE_NOTES 2014-01-06 16:28:24 -08:00
Ricardo Quesada df44a69caa Adds TOC 2014-01-06 16:26:48 -08:00
Ricardo Quesada df3e83094b Adds RELEASE_NOTES.md to repo 2014-01-06 16:23:06 -08:00
Ricardo Quesada 9d58951d56 Merge pull request #4934 from ricardoquesada/changelog_fixes 
Adds release date to CHANGELOG
 2014-01-06 14:25:41 -08:00
Ricardo Quesada 11ad6cd974 Adds release date to CHANGELOG 2014-01-06 14:24:24 -08:00
James Chen b7ceb8bcac Merge pull request #4931 from heliclei/develop 
[jenkins]Add create-job.py:create build job by pr, build all android targets
 2014-01-06 06:26:21 -08:00
heliclei 4c2fe530f9 fix post data format 2014-01-06 22:24:47 +08:00
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
heliclei bc5303f6f2 build all android targets 2014-01-06 20:58:00 +08:00
Dhilan007 2d10dd8e84 remove should not have path. 2014-01-06 20:35:07 +08:00
Dhilan007 aec4045797 fix error for load spriteFrames from plist in CCAnimationCache class. 2014-01-06 20:23:45 +08:00
James Chen 559e5b771f Merge pull request #4928 from dumganhar/more-warning-fix 
More warning fixes
 2014-01-06 04:18:22 -08:00
minggo 0a7e9a6d10 Merge pull request #4929 from samuele3hu/developNewUI 
Fix:Resolve the lua android template errors
 2014-01-06 04:16:31 -08:00
samuele3hu 2949ab754f Fix:Regeneration cocos_files.json 2014-01-06 20:11:44 +08:00
samuele3hu ac46932c06 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 
Conflicts:
	tools/project-creator/module/cocos_files.json
 2014-01-06 20:07:39 +08:00
James Chen 75804ac8a2 Warning fix in ccUTF8.cpp/h 2014-01-06 20:04:09 +08:00
James Chen 1bd0f90437 Warning fix in js_manual_conversions.cpp/h 2014-01-06 20:02:01 +08:00
James Chen dd0e157c74 Warning fix in CCTextFieldTTF.cpp. 2014-01-06 20:01:28 +08:00
samuele3hu f36d4a9236 Fix:Resolve the lua android template errors 2014-01-06 19:59:31 +08:00
James Chen 1ad6064c30 Merge pull request #4927 from dumganhar/value-fix 
Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value.
 2014-01-06 03:59:06 -08:00
minggo 4966ca948b Merge pull request #4926 from Dhilan007/develop_crash 
fix compiling error on vs project.
 2014-01-06 03:58:46 -08:00
James Chen ea60dbb640 Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value. 2014-01-06 19:55:59 +08:00
Dhilan007 4087afaf4e fix compiling error on vs project. 2014-01-06 19:55:29 +08:00
minggo 18934eeca3 Merge pull request #4923 from Dhilan007/develop_crash 
fix crash in NewEventDispatcherTest.cpp on vs
 2014-01-06 03:06:58 -08:00
Dhilan007 4806ef5c6f change time of initialization 2014-01-06 18:26:14 +08:00
Dhilan007 8e3eb8580f fix crash in NewEventDispatcherTest.cpp on vs 2014-01-06 18:00:52 +08:00
minggo b934b4633c Merge pull request #4922 from Dhilan007/develop_crash 
fix crash in TouchesTest.cpp on vs
 2014-01-06 01:40:52 -08:00
Dhilan007 5786c8aa41 fix crash in TouchesTest.cpp on vs 2014-01-06 17:31:49 +08:00
Dhilan007 3a95c9db3e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 17:21:34 +08:00
minggo cd6b000016 Merge pull request #4920 from minggo/develop 
don't rlease autoreleased object
 2014-01-06 01:21:13 -08:00
minggo 4033ecea77 don't rlease autoreleased object 2014-01-06 17:20:42 +08:00
Dhilan007 922fd50903 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 17:20:00 +08:00
James Chen e705dfe471 Merge pull request #4917 from chengstory/AddTriggerCode 
Add Trigger code to sceneTest on cocos2dx 3.x.
 2014-01-06 01:16:46 -08:00
minggo 5d37050cfc Merge pull request #4919 from minggo/develop 
don't release autoreleased objec
 2014-01-06 01:04:13 -08:00
minggo 7b55c3da1e don't release autoreleased objec 2014-01-06 17:03:24 +08:00
Dhilan007 268ea55d64 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 16:48:47 +08:00
minggo 14693cbf35 Merge pull request #4918 from minggo/develop 
don't assign last element with (null, null)
 2014-01-06 00:45:29 -08:00
minggo 63ad431349 don't assign last element with (null, null) 2014-01-06 16:41:42 +08:00
Dhilan007 a8e03b264f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 16:39:38 +08:00
zhangcheng 573737df40 Add Trigger code to sceneTest on cocos2dx 3.x. 2014-01-06 16:32:39 +08:00