James Chen
1cfca9bc60
Updating property in CCDictionary.
2013-06-15 13:42:05 +08:00
James Chen
490b605aec
Merge pull request #2895 from dumganhar/minggo-iss2284-merge-master
...
fixed #2284 : Merge PR https://github.com/cocos2d/cocos2d-x/pull/2889
2013-06-14 21:33:19 -07:00
James Chen
c7c7189d90
Fix emscripten bugs.
2013-06-15 12:07:19 +08:00
James Chen
8c671bd0e9
Adding EMCC_DEBUG=1 to debug
2013-06-15 11:52:46 +08:00
James Chen
08b3107467
Updating emscripten submodule to lastest version.
2013-06-15 11:44:11 +08:00
James Chen
cec360df38
Reverting run-script.sh
2013-06-15 11:43:43 +08:00
James Chen
aeb331d3c4
issue #2284 : Don't use multiple process to build emscripten since it'll generate errors.
2013-06-15 11:28:31 +08:00
James Chen
7295551f0f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-15 11:15:28 +08:00
minggo
5e83f36433
issue #2284 : not treat using deprecated functions as error
2013-06-14 17:32:07 +08:00
minggo
47f4aee3cc
issue #2284 : use GLuint to fix compiling error
2013-06-14 16:48:18 +08:00
James Chen
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
minggo
ab8448e96b
issue #2284 : enable c++11 for emscripten port
2013-06-14 15:27:11 +08:00
minggo
400642baa8
issue #2284 : initialize parameter as declared
2013-06-14 15:18:35 +08:00
minggo
3543ee2ac3
issue #2284 : add some files into extensions linux project
2013-06-14 14:55:46 +08:00
minggo
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
James Chen
3cf597f7a1
Merge pull request #2887 from dumganhar/develop
...
Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.).
2013-06-13 23:26:26 -07:00
James Chen
216e38fbb5
Merge pull request #2888 from CocosRobot/updategeneratedsubmodule_1371191053
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-13 23:25:52 -07:00
CocosRobot
96d12bc1b9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-14 06:24:17 +00:00
James Chen
e56c63b03d
Merge pull request #2884 from ricardoquesada/actions_clone_pattern
...
issue #2289 : Actions with clone() pattern 1/3
2013-06-13 23:19:04 -07:00
James Chen
6e8b390094
Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.).
2013-06-14 14:15:04 +08:00
minggo
20e505ccbb
Merge pull request #2885 from ricardoquesada/CC_CALLBACK_prefix
...
Adds CC prefix to CALLBACK()
2013-06-13 21:45:50 -07:00
Ricardo Quesada
8a6d33a212
Adds CC prefix to CALLBACK()
...
Now it is called: CC_CALLBACK()
2013-06-13 20:36:43 -07:00
Ricardo Quesada
e2e68aa36d
Removes "calling explicit constructor"
2013-06-13 20:08:56 -07:00
Ricardo Quesada
98190a21c0
Actions with clone() pattern 1/3
...
This is the 1st patch of 3.
1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
2013-06-13 17:25:14 -07:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
fbe4e505fd
Update AUTHORS [ci skip]
2013-06-13 15:01:52 +08:00
James Chen
b372fc8534
Merge pull request #2872 from maciekczwa/develop
...
fixed #2283 : Adding Polish language support.
2013-06-13 00:00:36 -07:00
James Chen
b429d1a387
Update AUTHORS [ci skip]
2013-06-13 14:54:22 +08:00
James Chen
1f2f366ef6
Merge pull request #2868 from folecr/develop
...
fixed #2281 : When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes
2013-06-12 23:52:53 -07:00
James Chen
0de1a4ebd8
Merge pull request #2877 from pyrasis/tizen_2.1
...
Support Tizen device
2013-06-12 22:56:23 -07:00
minggo
6ef681bfff
Merge pull request #2876 from ricardoquesada/chipmunk_6_1_5
...
updates chipmunk2d to v6.1.5
2013-06-12 22:53:35 -07:00
minggo
5996e99b74
Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks
...
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
2013-06-12 22:51:21 -07:00
Ricardo Quesada
c1d519aac2
LabelTTF vertical alignment fixed on OS X
...
vertical alignment was broken on OS X.
top and bottom were switched.
2013-06-13 10:46:28 +08:00
minggo
92ce25371a
Merge pull request #2874 from ricardoquesada/labelttf_mac_fix
...
LabelTTF vertical alignment fixed on OS X
2013-06-12 19:45:31 -07:00
Ricardo Quesada
1780643c63
merge pull reqeust fixing for iOS7 and Xcode5 into master
2013-06-13 10:43:41 +08:00
minggo
f123a5c48d
Merge pull request #2873 from ricardoquesada/ios7_xcode5_fixes
...
Fixes for iOS7 and Xcode5
2013-06-12 19:28:22 -07:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
Ricardo Quesada
e770121711
updates chipmunk2d to v6.1.5
2013-06-11 17:03:20 -07:00
Ricardo Quesada
83b43ab93e
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
...
Handy macros for callbacks.
Instead of:
std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
CALLBACK_1(func_ptr, instance)
And also removes more warnings from the tests
2013-06-11 16:30:05 -07:00
Ricardo Quesada
75b9913c92
LabelTTF vertical alignment fixed on OS X
...
vertical alignment was broken on OS X.
top and bottom were switched.
2013-06-11 14:59:40 -07:00
Ricardo Quesada
af49023741
Fixes for iOS7 and Xcode5
2013-06-11 12:11:05 -07:00
folecr
bab8eff915
enableDebugger() will be called inside ScriptingCore when JSB_ENABLE_DEBUGGER is #defined
2013-06-11 08:18:22 -07:00
Maciej Czerniak
1e71ea85f3
add Polish language support
2013-06-11 16:46:38 +02:00
Maciej Czerniak
dddb487639
fix formatting
2013-06-11 16:43:35 +02:00
Maciej Czerniak
c9b88e1c0c
add missing Norwegian language for marmelade platform
2013-06-11 16:41:54 +02:00
Maciej Czerniak
eb79c01003
add missing Norwegian language for linux platform
2013-06-11 16:39:33 +02:00
minggo
ef319da264
Update AUTHORS
...
[ti ignore]
2013-06-11 21:50:02 +08:00
minggo
9404f3e0ce
Merge pull request #2704 from simpliplant/develop
...
Hardware keyboard support
2013-06-11 06:48:33 -07:00
Rene Klacan
44851e36e9
removed forgotten debug printf
2013-06-11 15:37:51 +02:00
James Chen
71e038a869
Merge pull request #2870 from dumganhar/master
...
[travis-ci] Speed up android build. [master]
2013-06-10 20:51:24 -07:00