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

16048 Commits

Author SHA1 Message Date
James Chen 2ff4a44324 closed #3857: Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode. 
For more details why I did this, please refer to http://www.cocos2d-x.org/issues/3857.
 2014-01-26 14:19:42 +08:00
James Chen cb7e2b5ece Update CHANGELOG [ci skip] 2014-01-26 13:58:37 +08:00
James Chen 6f45d9ca27 Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac 
closed #3856: Crash when Firefox connects to JSB application.
 2014-01-25 21:55:34 -08:00
James Chen 04f2cc48a2 closed #3856: Crash when Firefox connects to JSB application. 2014-01-26 13:54:48 +08:00
minggo b7d5d430a4 Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode 
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
 2014-01-25 20:37:31 -08:00
boyu0 682a6819cb issue #3401: change getContactData function return value back to pointer. 2014-01-26 12:02:42 +08:00
samuele3hu 48498f726e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 
Conflicts:
	cocos/scripting/lua/bindings/CCLuaStack.cpp
 2014-01-26 11:59:54 +08:00
samuele3hu 9b514927f5 issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio 2014-01-26 11:55:02 +08:00
James Chen 500a87c9f8 Merge pull request #5226 from Dhilan007/develop_vs 
update template for add socket files[lua]
 2014-01-25 19:47:49 -08:00
Dhilan007 ace3ecb48a update template for add socket files[lua] 2014-01-26 11:28:57 +08:00
James Chen 5b9f1697d3 closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +08:00
James Chen bad08f4999 Merge pull request #5224 from Dhilan007/develop_crash 
updated vs project[Lua]:
 2014-01-25 18:42:46 -08:00
Dhilan007 c7e9cee835 updated vs project[Lua]: 
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
 2014-01-26 10:25:49 +08:00
samuele3hu e6b1df3388 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 09:46:41 +08:00
samuele3hu 7a8ecb108c issue #3837:Add the debug support for Mac 2014-01-26 09:42:07 +08:00
martell 609ee3db2b Added Dutch for 3.x branch 2014-01-25 20:38:15 +00:00
James Chen 98215dd4e4 Merge pull request #5221 from Dhilan007/develop_vs 
fix link error on vs.
 2014-01-25 03:43:53 -08:00
Dhilan007 b6cd40521e fix link error on vs. 2014-01-25 19:41:20 +08:00
James Chen 7069a5afa9 Merge pull request #5218 from Dhilan007/develop_crash 
fix get_num_of_cpu on win32.
 2014-01-24 21:26:32 -08:00
Ricardo Quesada 8c62fcb7ba Merge branch 'develop' into glview_improvements 2014-01-24 14:22:25 -08:00
Ricardo Quesada ed299202b6 Android works again 2014-01-24 13:43:46 -08:00
James Chen f95a862718 Merge pull request #5220 from dumganhar/develop 
Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
 2014-01-24 06:36:44 -08:00
James Chen 8efa186649 Fixes a comment typo in CCObject.h. 2014-01-24 22:34:14 +08:00
James Chen 04d91f7e1d Fix a mistake in Color4B(const Color3B& color). 2014-01-24 22:33:43 +08:00
James Chen 7a8f24a313 Merge pull request #5219 from dabingnn/develop_hotFix 
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
 2014-01-24 06:20:53 -08:00
Huabing.Xu 52ca254ecf 3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest 2014-01-24 18:39:26 +08:00
Dhilan007 3a09cdfe2e fix get_num_of_cpu on win32. 2014-01-24 18:34:02 +08:00
Dhilan007 f3331feac6 fix get_num_of_cpu on win32. 2014-01-24 18:30:37 +08:00
minggo 68dc82c217 Merge pull request #5203 from dumganhar/iss3713-ref-patch 
issue #3713: Object::release() of debug version will check whether the object was in autorelease pool.
 2014-01-24 02:04:15 -08:00
minggo cdae60b6c8 Merge pull request #5212 from samuele3hu/developBug 
Add luasocket's support for lua
 2014-01-24 02:00:15 -08:00
minggo fc0c0ac571 Merge pull request #5214 from Dhilan007/develop_crash 
fix save path not initialized.
 2014-01-24 01:59:52 -08:00
James Chen 9217e09b45 Merge pull request #5216 from CocosRobot/updategeneratedsubmodule_1390556889 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-24 01:58:15 -08:00
James Chen b6932d580d issue #3713: Modifies the scope of DEBUG macro in CCAutoreleasePool.h , contains(Object* obj) should be valid in RELEASE version too. 2014-01-24 17:57:36 +08:00
James Chen 6e704b6843 issue #3713: Adds AutoreleasePool::isClearing() for easily debugging memory issues. It only valid in DEBUG mode. 2014-01-24 17:51:36 +08:00
CocosRobot 8c3af04b72 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-24 09:48:11 +00:00
minggo 47563f0da1 Merge pull request #5171 from samuele3hu/developBugFix 
fix:Update the RELEASE_NOTES.md file
 2014-01-24 01:47:36 -08:00
samuele3hu b127c7954e issue #3837:Add LuaSocket license file 2014-01-24 17:44:05 +08:00
minggo 1f88d2ea65 Merge pull request #5213 from lihex/develop 
reset to default texture format after running test case
 2014-01-24 01:33:00 -08:00
minggo 7c53586f1f Merge pull request #5210 from Dhilan007/develop_label 
close #3835:fix TMXMapInfo::startElement insert property to properties fail.
 2014-01-24 01:32:22 -08:00
lihex 99345698ea reset to default texture format after running test case 2014-01-24 17:28:56 +08:00
samuele3hu e2325924e4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-24 17:24:46 +08:00
samuele3hu 58eab72d26 issue:Add luasocket's support for lua 2014-01-24 17:24:10 +08:00
Dhilan007 7ad2b95e7b fix save path not initialized. 2014-01-24 17:12:59 +08:00
minggo 87043a3bb6 Merge pull request #5211 from minggo/bug-fix 
reset to default texture format after running test case
 2014-01-24 00:54:52 -08:00
minggo d1cf374459 reset to default texture format after running test case 2014-01-24 16:53:59 +08:00
Dhilan007 6655ad79d7 use const ValueMap& for setters. 2014-01-24 16:05:38 +08:00
minggo a44ffd3558 Merge pull request #5208 from CocosRobot/updategeneratedsubmodule_1390549111 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-23 23:41:51 -08:00
CocosRobot e19c6e2caa [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-24 07:38:34 +00:00
Dhilan007 43ef9051a3 close #3835:fix TMXMapInfo::startElement insert property to properties fail 2014-01-24 15:37:32 +08:00
minggo aac068fc0e Merge pull request #5206 from dabingnn/develop_hotFix 
3.0 Beta2 HotFix: remove Camera Zoom Test temporarily.
 2014-01-23 23:18:08 -08:00