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
samuele3hu
c5e5c49332
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-04 09:52:28 +08:00
James Chen
31540768eb
Merge pull request #3047 from natural-law/develop
...
Add user login/logout plugin UC.
2013-07-03 18:47:16 -07:00
Ricardo Quesada
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
Ricardo Quesada
216c6eada5
Adds more const in getters
...
In Sprite and Texture2D
2013-07-03 17:44:41 -07:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
Ricardo Quesada
d88a4244b9
Obfuscated Test JS added on iOS and Mac
...
new version of game.js. I guess it was autogenerated
2013-07-03 15:29:57 -07:00
Ricardo Quesada
d399a044a9
Adds JS tests for iOS
2013-07-03 14:05:02 -07:00
Ricardo Quesada
22b42bfe7d
SimpleGame and HelloCpp works as expected
...
their Info.plist was broken
2013-07-03 13:24:39 -07:00
Ricardo Quesada
77dbe995d4
Merge branch 'develop' into ios_mac_one_project
2013-07-03 11:39:00 -07:00
YangLe
18b662c942
fix CCScale9Sprite for rotated sprite frame
...
fix Issue #1145
2013-07-04 00:03:44 +08:00
James Chen
065146c533
Merge pull request #3067 from dumganhar/develop
...
Using PositionColor shader when texture is NULL in Sprite.
2013-07-03 08:37:23 -07:00
James Chen
3fa5c776b8
issue #2359 : Using PositionColor shader when texture is NULL in Sprite.
...
TODO: PostionTextureColor shader should support empty texture.
2013-07-03 23:34:45 +08:00
Rene Klacan
b040addd53
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into tilemap_plain_xml_format_support
2013-07-03 16:55:32 +02:00
Rene Klacan
294f9f34f7
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
2013-07-03 15:51:24 +02:00
zhangbin
cb9c103689
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-03 18:21:47 +08:00
James Chen
7892f1ac9d
Merge pull request #3053 from dumganhar/iss2285-js-motionstreak
...
Adding MotionStreak test for TestJavascript.
2013-07-03 01:36:07 -07:00
James Chen
1a1040bdd5
[manually] Updating auto-generated JS glue codes.
2013-07-03 16:33:34 +08:00
James Chen
75d8e10994
[manual] Updating auto-generated jsbinding glue codes.
2013-07-03 16:27:26 +08:00
James Chen
b441871cd1
Merge pull request #3065 from dumganhar/iss2359-ccontrolswitch
...
Sprite will become white block when using CCControlSwitch.
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
2013-07-03 01:22:14 -07:00
Rene Klacan
92c382be04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support
2013-07-03 10:19:35 +02:00
James Chen
501afdd2e3
closed #2359 : Sprite will become white block when using CCControlSwitch.
...
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
2013-07-03 16:16:30 +08:00
James Chen
331c688f6f
Merge pull request #3063 from dumganhar/DarraghCoy-selector_cast_safety
...
Merge PR#3058: Adding extra safety to selector casting macros
2013-07-03 01:09:09 -07:00
James Chen
ed7e208895
Revert some codes in cocos2d_specifics.cpp.
2013-07-03 16:07:06 +08:00
minggo
63c14b7e19
[ci skip]
2013-07-03 16:01:19 +08:00
minggo
bf47cf55c7
Merge pull request #3059 from jotel/shadow-fix
...
Text Shadows fix
2013-07-03 01:00:03 -07:00
minggo
ab5e7b4b61
[ci skip]
2013-07-03 15:44:28 +08:00
minggo
2f88109a96
Merge pull request #3055 from DarraghCoy/add_rect_union_with_rect
...
Add Rect::unionWithRect
2013-07-03 00:42:55 -07:00
minggo
3e91ab0133
[ci skip]
2013-07-03 15:31:55 +08:00
minggo
de15064317
Merge pull request #3062 from minggo/iss2346-opengl-error
...
Fixed a bug in CCTMXLayer when set uniform
2013-07-03 00:31:10 -07:00
minggo
735ebf0e7f
Merge pull request #3064 from minggo/iss2361-set-bugfix
...
fix a crash caused by Set::removeAllObjects()
2013-07-03 00:29:29 -07:00
minggo
f089e62e8f
closed #2361:fix a crsash caused by Set::removeAllObjects
2013-07-03 15:26:58 +08:00