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

11692 Commits

Author SHA1 Message Date
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
minggo ec3fa59ae3 remove unneeded files 2013-08-26 17:40:25 +08:00
James Chen 1915a68a26 Merge pull request #3481 from dumganhar/develop 
closed #2446: Add a tool to auto export releasing zip file
 2013-08-26 01:57:04 -07:00
James Chen 11ea111aff closed #2446: Add a tool to auto export releasing zip file 2013-08-26 16:57:10 +08:00
James Chen 1cfd26aded Merge pull request #3480 from dumganhar/develop 
[Android] Disabling x86 from APP_ABI. Otherwise the time of compiling will be very long.
 2013-08-26 01:54:02 -07:00
James Chen c9ffc44bc4 [Android] Removing x86 from APP_ABI. Otherwise the time of compiling will be very long. 2013-08-26 16:52:20 +08:00
boyu0 1e452bf0bc closed #2494: add isLineOverlap, isLineParallel, isSegmentOverlap method to Point. 2013-08-26 13:45:45 +08:00
minggo c186ed6a7f Merge pull request #3447 from NatWeiss/patch-5 
Fixes full paths on Android (cleaner)
 2013-08-25 18:35:57 -07:00
minggo 5c0b53e77b Merge pull request #3475 from ricardoquesada/perf_fixes 
Adds "Sort all Children" perf test
 2013-08-25 18:32:14 -07:00
Ricardo Quesada b6a90b81aa Adds missing include 2013-08-25 10:50:29 -07:00
Ricardo Quesada ea8eb601af Uses std::sort() 
Uses std::sort() for inserting the nodes.

This code is not final, but preliminary results show that std::sort() is 60% faster

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-24 10:56:07 -07:00
Lee, Jae-Hong bbf9053788 [Tizen] Update project files. 
- Update file list.
- change order of link files.
 2013-08-25 02:22:50 +09:00
Ricardo Quesada 364288cf66 Adds "Sort all Children" perf test 
Adds a new perf tests: "sortAllChildren"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-08-23 13:14:57 -07:00
xbruce cfc5a7f669 Update cocos2d_specifics.cpp 
add need unroot
 2013-08-23 18:22:58 +08:00
xbruce 8076d568ba Update cocos2d_specifics.hpp 
add need unroot
 2013-08-23 18:20:31 +08:00
samuele3hu 6ae80bcaf0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-23 16:14:19 +08:00
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00