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

11820 Commits

Author SHA1 Message Date
samuele3hu 1dabab2ca5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
 2013-08-28 15:35:33 +08:00
James Chen a8140dd31b Adding test for issue http://www.cocos2d-x.org/issues/2401 . 2013-08-28 15:12:41 +08:00
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
James Chen b235bf07b7 [Mac] Adding WebsocketTest and SocketIOTest. 2013-08-28 15:02:57 +08:00
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 2013-08-28 13:42:22 +08:00
minggo e41eaf7355 Merge pull request #3495 from shinriyo/shinriyo 
Python2.x 3.x runnable
 2013-08-27 21:06:33 -07:00
Huabing.Xu 29746d513a issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
shinriyo 498d8d9e6d Python2.x 3.x runnable 
For Python2.x 3.x runnable, I used print()
 2013-08-28 11:53:18 +09:00
minggo 20e2e5c3d6 Merge pull request #3494 from CocosRobot/updategeneratedsubmodule_1377656189 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-27 19:24:54 -07:00
CocosRobot 275d719ede [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-28 02:16:33 +00:00
minggo 48444c864c Merge pull request #3484 from ledyba/develop 
Override LayerMultiplex::init()
 2013-08-27 19:08:39 -07:00
James Chen fefa9a12d9 Merge pull request #3492 from CocosRobot/updategeneratedsubmodule_1377618171 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-08-27 08:43:57 -07:00
CocosRobot fbfb4d1002 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-27 15:42:55 +00:00
James Chen 245dce7e9c Merge pull request #3490 from dumganhar/move-auto-generated 
closed #2732: The auto-generated codes of JSBindings and LuaBindings use the same sub-repo
 2013-08-27 08:02:32 -07:00
James Chen f3e0775cef issue #2732: [travis ci] install llvm for linux. 2013-08-27 22:04:08 +08:00
James Chen 384bf00070 issue #2732: Updating travis script. Linux port needs to generate luabinding codes. 2013-08-27 21:52:06 +08:00
James Chen 78d8576a3a closed #2732: [Linux emscripten] Updating Makefile. 2013-08-27 21:40:29 +08:00
James Chen 935222f27c issue #2732: Adding 'tools/tolua/userconf.ini' to ignore list. 2013-08-27 17:20:40 +08:00
James Chen 16a8e1d92e issue #2732: [Linux, Emscripten] Updating Makefile. 2013-08-27 17:20:12 +08:00
James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 
Conflicts:
	scripting/auto-generated
 2013-08-27 16:59:59 +08:00
James Chen 0e1770ca82 issue #2732: [iOS] Adding 'Cocos2d.lua". 2013-08-27 16:57:10 +08:00
James Chen 64ab842a74 issue #2732: [iOS]Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:53:41 +08:00
James Chen eb2335952c issue #2732: [iOS, Mac] Removing unused files (LuaCocos2d.cpp/.h). 2013-08-27 16:52:39 +08:00
James Chen 7523a6e685 issue #2732: Removing unused files (LuaCocos2d.cpp/.h). 2013-08-27 16:47:06 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen e76e316063 issue #2732: [Win32] Updating project configuration for libJSBinding.vcxproj and liblua.vcxproj. 2013-08-27 16:30:56 +08:00
James Chen 220d4b7d8a issue #2732: Updating scripting/javascript/bindings/Android.mk and scripting/lua/proj.android/Android.mk. 2013-08-27 16:21:06 +08:00
James Chen 7bc1a01f18 issue #2732: Removing "scripting/lua/cocos2dx_support/generated" folder. 2013-08-27 16:20:13 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
James Chen c2099f5d3e issue #2732: Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'. 2013-08-27 14:50:53 +08:00
James Chen 43a0225267 issue #2732: Deleting tolua/userconf.ini 2013-08-27 14:45:19 +08:00
minggo 5834fc2f37 Merge pull request #3470 from boyu0/iss2494_Point_isSegmentIntersect_bug 
closed #2494: Fix bug when two line is incident, the Point::isSegmentIntersect() may return wrong result
 2013-08-26 23:27:00 -07:00
James Chen 0d8192597f Merge pull request #3486 from CocosRobot/updategeneratedsubmodule_1377584196 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-26 23:25:03 -07:00
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes 
Remove unneeded codes
 2013-08-26 23:23:41 -07:00
minggo c4a97cdfa1 Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes 
Perf and bug fixes
 2013-08-26 23:22:33 -07:00
CocosRobot 514967dedc [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-27 06:16:39 +00:00
James Chen 213b7aea21 Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator 
issue #2433: Add lua bindings generator and modify releated test samples
 2013-08-26 23:09:56 -07:00
Ricardo Quesada 48ef1f24c3 fixes possible crash when using `SpriteFrameCache` 
the returned dictionary was double-released. ouch.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:08:56 -07:00
Ricardo Quesada 0093263c18 Little performance improvements 
Uses `AffineTransform::IDENTITY`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:08:21 -07:00
Ricardo Quesada 62c578667b API compliant with cocos2d-x best practices 
Uses `int` instead of `unsigned int` as described in the cocos2d-x best practices

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:07:40 -07:00
Ricardo Quesada b3b3583583 CCNode perf improvements 
AffineTransforms uses a const global variable for the `IDENTITY`
`removeObject` only seeks the index once

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-26 18:04:51 -07:00
psi 9b352d5ff4 Merge remote-tracking branch 'parent/develop' into develop 
merged from parent
 2013-08-26 21:36:38 +09:00
psi 1beea771b4 type 2013-08-26 20:42:41 +09:00
psi f0620b0e85 add overrode init method for LayerMultiplex 2013-08-26 20:38:23 +09:00
samuele3hu 59e3785baf issue #2433:Modify platform config 2013-08-26 18:45:50 +08:00
samuele3hu 84fcb26e44 issue #2433:compile error 2013-08-26 18:30:03 +08:00
James Chen 6501c9bffd Merge pull request #3479 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-26 03:23:14 -07:00
samuele3hu c7b0b6791f issue #2433:Update typed function and add some manual binding 2013-08-26 18:09:15 +08:00
minggo e567b6c54b fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
minggo 61d82924be update Android.mk to remove deleted cpp files 2013-08-26 18:01:42 +08:00