Huabing.Xu
7a61ead598
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-05 11:59:46 +08:00
zhangbin
2bdf55d78d
Add workspace for iOS projects of plugin-x.
2013-07-05 11:42:01 +08:00
samuele3hu
9eb31df9f3
issue #2244:Replace the tab with space
2013-07-05 11:29:21 +08:00
samuele3hu
2aef49f251
issue #2244:Replace the tab with space
2013-07-05 11:24:28 +08:00
zhangbin
1d4c9dbfe0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-05 11:02:30 +08:00
James Chen
267823d473
Merge pull request #3077 from dumganhar/iss2371-template
...
Updating multi-platform-template for iOS and Mac, and deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-04 20:01:33 -07:00
James Chen
8f5dba6c44
issue #2371 : Using the same prefix header for iOS and Mac.
2013-07-05 10:53:16 +08:00
zhangbin
4282190781
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-05 10:52:49 +08:00
James Chen
a25dce5b2d
issue #2371 : Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-05 10:52:46 +08:00
zhangbin
e999cc9541
closed #2376 , Add online IAP feature in plugins : uc, nd91 & qh360.
2013-07-05 10:51:08 +08:00
James Chen
cd2fae36f1
issue #2371 : Updating multi-platform-template for iOS and Mac
2013-07-05 10:31:20 +08:00
samuele3hu
bb244edae6
issue #2244:Modify a function name to createCCBReader
2013-07-05 10:25:37 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
James Chen
debfc23b16
Merge pull request #3074 from dumganhar/iss2371-add-lua-ios-mac
...
ios and mac projects need to be unified in one simple xcode project, adding lua projects for Mac and iOS.
2013-07-04 02:55:38 -07:00
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
James Chen
3138281cab
issue #2371 : [Lua] Only 64bit target needs the linking flag '-pagezero_size 1000 -image_base '
2013-07-04 17:53:23 +08:00
James Chen
6ed014ab00
issue #2371 : Removing unused file.
2013-07-04 17:25:52 +08:00
James Chen
dca0874ee3
issue #2371 : Removed unused projects.
2013-07-04 17:24:34 +08:00
James Chen
be98d53264
issue #2371 : Reverting .gitignore file. We need to add .xcworkspacedata to ignore list.
2013-07-04 17:22:07 +08:00
James Chen
1755e7778f
close #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:15:48 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
1d941f7c25
issue #2371 : Adding scripting/lua/luajit/mac/libluajit.a
2013-07-04 17:11:13 +08:00
James Chen
7d3a63bb23
issue #2371 : Adding HelloLua and TestLua projects for MAC.
2013-07-04 17:10:47 +08:00
James Chen
740d0b7cab
issue #2371 : Delete unused files
2013-07-04 17:09:51 +08:00
James Chen
62879c3789
issue #2371 : Updating CCTexture2D.pkg.
2013-07-04 17:09:23 +08:00
James Chen
686a1021b6
issue #2371 : Updating luajit building script for Mac 64 bit. We need to build a 32bit, 64bit fat library.
2013-07-04 17:08:56 +08:00
James Chen
399a6a9a48
issue #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:07:56 +08:00
James Chen
83b23c67fd
issue #2371 : Set design resolution for TestLua.
2013-07-04 17:07:34 +08:00
James Chen
84ce80dcd2
issue #2371 : [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL .
2013-07-04 16:31:50 +08:00
James Chen
50a8067b74
issue #2371 : std::vector<std::string>::iterator --> auto in CCFileUtils.cpp.
2013-07-04 16:30:35 +08:00
James Chen
808ce2e208
close #2371 : Adding Lua projects for Mac.
2013-07-04 16:29:06 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
ddf54a4f49
Merge pull request #3054 from simpliplant/windows_keyboard_support
...
Hardware keyboard support (Windows support + Mac fix)
2013-07-03 23:37:13 -07:00
minggo
be422efca2
[ci skip]
2013-07-04 14:29:34 +08:00
minggo
4880543305
Merge pull request #3073 from xxuejie/add-namespace-to-macro
...
Add namespace prefix to selector macros
2013-07-03 23:28:16 -07:00
minggo
22e5d12503
Merge pull request #3071 from keirantai/develop
...
Regenerated xcode4 templates plist files
2013-07-03 23:27:50 -07:00
minggo
f019700b91
Merge pull request #3072 from minggo/const_love
...
Fix compiling errors of #3070
2013-07-03 23:19:14 -07:00
Xuejie Xiao
a1fbee0bdf
Merge remote-tracking branch 'upstream/develop' into add-namespace-to-macro
...
Conflicts:
cocos2dx/cocoa/CCObject.h
2013-07-04 13:59:36 +08:00
minggo
40effbf3bf
issue #2373:fix a compiling error
2013-07-04 13:58:50 +08:00
James Chen
397b698f07
[iOS] Adding lua projects.
2013-07-04 13:50:09 +08:00
Xuejie Xiao
3401c909d8
Add namespace prefix to selector macros
2013-07-04 13:35:11 +08:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
Keiran Tai
dde6250159
Regenerated xcode4 templates plist files due to missing few important files and causes compile error
2013-07-04 11:13:15 +08:00
James Chen
b5b85fc1f4
Merge pull request #3060 from ricardoquesada/ios_mac_one_project
...
issue #2372 : ios and mac projects unified in one simple xcode project
2013-07-03 19:40:24 -07:00
minggo
1d94ce12a2
Merge branch 'const_love' of https://github.com/ricardoquesada/cocos2d-x into const_love
2013-07-04 10:29:56 +08:00
James Chen
3fe56a9b49
Update AUTHORS [ci skip]
2013-07-04 10:24:29 +08:00
James Chen
cf369c0c66
Merge pull request #3052 from smshuja/pivotjoint-class
...
Pivotjoint constructor and pointQueryFirst in Space class will return false instead of invalid shape object
2013-07-03 19:21:48 -07:00
James Chen
5b698c88cc
Update AUTHORS [ci skip]
2013-07-04 10:01:26 +08:00
James Chen
8b6915f5f0
Merge pull request #3068 from smilingpoplar/patch-1
...
fix CCScale9Sprite for rotated sprite frame
2013-07-03 18:58:52 -07:00