James Chen
|
093cf17f05
|
Merge pull request #3038 from young40/develop
close #2348: [plugin-x][Umeng] fix not sending Event when paramMap is nil
|
2013-07-01 02:10:10 -07:00 |
James Chen
|
728f6cd484
|
Update AUTHORS [ci skip]
|
2013-07-01 16:56:22 +08:00 |
James Chen
|
8b1325b544
|
Merge pull request #3034 from Squallium/develop
Added CocosDenshion dependency to libextension project
|
2013-07-01 01:54:02 -07:00 |
Peter Young
|
cedfd6bbdc
|
[plugin-x][Umeng] fix not sending Event when paramMap is nil
|
2013-07-01 16:51:31 +08:00 |
James Chen
|
0d040bae76
|
closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file.
|
2013-07-01 16:48:42 +08:00 |
minggo
|
ce3cea2fdb
|
closed #2346: use shader program to set uniform
|
2013-07-01 16:02:46 +08:00 |
samuele3hu
|
f03c96d673
|
Merge branch 'develop' of https://github.com/samuele3hu/cocos2d-x into execDev
|
2013-07-01 15:34:27 +08:00 |
samuele3hu
|
60ff2f7472
|
Merge pull request #3 from cocos2d/develop
sync with upstream (cocos2d/cocos2d-x)
|
2013-07-01 00:33:39 -07:00 |
samuele3hu
|
3e3548db77
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
|
2013-07-01 15:05:04 +08:00 |
samuele3hu
|
fe8e30c3e0
|
issue #2243:Add a uniform fund in ScriptEngineProtocol
|
2013-07-01 15:04:14 +08:00 |
James Chen
|
e20356a32d
|
Merge pull request #3037 from boyu0/refactor_2339
change the useage text
|
2013-06-30 23:37:12 -07:00 |
James Chen
|
c872666650
|
Merge pull request #3025 from boyu0/refactor_2339
closed #2339: Refactor checkParams() in create_project.py, use OptionParser to parse the params
|
2013-06-30 23:19:08 -07:00 |
boyu0
|
1156ae4f60
|
change the useage text
|
2013-07-01 14:10:14 +08:00 |
Ricardo Quesada
|
40cf6a7956
|
unified mac project for all the cocos2d-x libraries
|
2013-06-30 23:07:56 -07:00 |
minggo
|
9697c5af9a
|
[ci ignore]
|
2013-07-01 10:14:12 +08:00 |
minggo
|
73f3f43252
|
Merge pull request #3035 from Squallium/develop
Added ccFPSImages entity as linked resource
|
2013-06-30 19:12:17 -07:00 |
Squallium
|
c770a4bdc8
|
Added ccFPSImages entity as linked resource
|
2013-06-30 22:00:29 +02:00 |
Squallium
|
aeb9c5a45f
|
adding ccFPSImages entity as linked resource
|
2013-06-30 21:43:40 +02:00 |
Squallium
|
c3e043ef20
|
Added CocosDenshion dependency to libextension project
|
2013-06-30 21:38:06 +02:00 |
boyu0
|
2625847a74
|
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
|
2013-07-01 01:04:01 +08:00 |
James Chen
|
2c08f25c47
|
Merge pull request #3032 from dumganhar/iss2342-build-errors
closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
|
2013-06-29 00:05:31 -07:00 |
James Chen
|
b76798505c
|
closed #2342: Fixing indention.
|
2013-06-29 15:04:43 +08:00 |
James Chen
|
bb2f19535b
|
closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
|
2013-06-29 15:01:50 +08:00 |
Justin Hawkwood
|
37ca32e75c
|
Corrected code to use textDefinition properties
|
2013-06-29 15:00:17 +08:00 |
James Chen
|
0f048e23bf
|
Merge pull request #3031 from CocosRobot/updategeneratedsubmodule_1372480518
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-28 22:38:34 -07:00 |
CocosRobot
|
bc6acb6411
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-29 04:35:21 +00:00 |
James Chen
|
7326d54348
|
Merge pull request #3030 from dumganhar/ricardoquesada-js_mac
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3026
|
2013-06-28 21:29:59 -07:00 |
James Chen
|
9bac943040
|
issue #2325: [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp.
|
2013-06-29 12:25:44 +08:00 |
James Chen
|
5bc8706ece
|
Merge branch 'develop' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-js_mac
|
2013-06-29 12:12:36 +08:00 |
James Chen
|
7dd6218344
|
issue #2325: [MAC] Setting the windows size to 800x450 which is the same as HTML5-tests.
|
2013-06-29 12:12:26 +08:00 |
James Chen
|
d454bb06c7
|
Merge pull request #24 from ricardoquesada/js_mac
Merge js_mac branch of ricardoquesada's repo.
|
2013-06-28 21:10:45 -07:00 |
James Chen
|
e20de6b6aa
|
Reverting submodules.
|
2013-06-29 11:45:16 +08:00 |
James Chen
|
e2b9863bf7
|
issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.
|
2013-06-29 11:44:14 +08:00 |
Ricardo Quesada
|
b846a3060e
|
cocos2d-x in Mac:
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
|
2013-06-28 19:02:10 -07:00 |
Rene Klacan
|
444a6e689e
|
added windows keyboard support
|
2013-06-29 01:46:39 +02:00 |
Ricardo Quesada
|
41a6a51208
|
Merge remote-tracking branch 'cocos2d/develop' into js_mac
|
2013-06-28 13:40:15 -07:00 |
James Chen
|
1e45c121df
|
Merge pull request #3027 from natural-law/develop
Adjust the sample projects in plugin
|
2013-06-28 00:55:31 -07:00 |
zhangbin
|
c790d8de9b
|
issue #2336, Modify the compiler of plugins project on ios.
|
2013-06-28 15:21:39 +08:00 |
Ricardo Quesada
|
6e1af21c0e
|
Uses new cocos2d-console
|
2013-06-27 22:19:33 -07:00 |
Ricardo Quesada
|
9b1684b666
|
Merge remote-tracking branch 'cocos2d/develop' into js_mac
|
2013-06-27 22:15:03 -07:00 |
Ricardo Quesada
|
96a50bf736
|
updates cocos2d-mac workspace
|
2013-06-27 22:14:26 -07:00 |
zhangbin
|
a72207bf95
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-06-28 11:48:54 +08:00 |
zhangbin
|
71f9023cc4
|
issue #2336, Remove the unused sample projects in plugin.
|
2013-06-28 11:48:24 +08:00 |
zhangbin
|
530afbb9d9
|
issue #2336, Add a sample project with all plugins.
|
2013-06-28 11:46:39 +08:00 |
boyu0
|
2cccadeaab
|
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
|
2013-06-28 10:12:55 +08:00 |
Ricardo Quesada
|
b0de6d0e8c
|
Project fixes
In debug: optimization is NONE, and other small fixes for Mac
|
2013-06-27 18:14:24 -07:00 |
James Chen
|
2514c99176
|
Merge pull request #3020 from dumganhar/iss2340-spidermonkey_v22
issue #2340: Upgrading SpiderMonekey to Firefox v22
|
2013-06-27 18:13:17 -07:00 |
Ricardo Quesada
|
b1be161e5d
|
updates to SpiderMonkey v22
|
2013-06-27 17:34:53 -07:00 |
Ricardo Quesada
|
5bb256e837
|
Merge branch 'develop' into js_mac
|
2013-06-27 10:48:58 -07:00 |
James Chen
|
0f2719fa06
|
issue #2340: Checking jsc( js compiled) files first.
|
2013-06-27 17:20:02 +08:00 |