yinkaile
|
65974f2243
|
standardize code
|
2013-06-07 10:52:32 +08:00 |
yinkaile
|
3cfba7bc9a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
|
2013-06-06 12:35:18 +08:00 |
yinkaile
|
245b0395b1
|
1.upload CCArmature
|
2013-06-06 12:02:54 +08:00 |
minggo
|
c21812b270
|
Merge pull request #2729 from ricardoquesada/timeval_64bit_fix
cc_timeval works on 64bit machines, like OS X
|
2013-06-03 22:47:45 -07:00 |
Ricardo Quesada
|
7e7e943699
|
compiles on linux and other machines without C99 support
|
2013-06-03 20:45:06 -07:00 |
minggo
|
74b86021e6
|
Merge pull request #2624 from benjamesward/master
Fixed linebreaks on Mac OSX
|
2013-06-03 19:40:34 -07:00 |
Ricardo Quesada
|
c6d00a3ccb
|
cc_timeval works on 64bit machines, like OS X
|
2013-06-03 17:31:59 -07:00 |
James Chen
|
cedb427a6e
|
fixed #1647: Adding WebSocket support for Cpp and JSB.
Conflicts:
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-06-02 18:55:57 +08:00 |
James Chen
|
0ff1ef6f84
|
Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x
|
2013-06-01 23:20:11 +08:00 |
Ben Ward
|
d166de4684
|
Fixed tabbing.
|
2013-05-29 15:40:19 +01:00 |
Lee, Jae-Hong
|
ae78bb9b47
|
Modify space character check.
|
2013-05-29 23:14:52 +09:00 |
Lee, Jae-Hong
|
ccd20af8f9
|
Implement setIMEKeyboardState function for Tizen.
|
2013-05-29 22:46:52 +09:00 |
Lee, Jae-Hong
|
e48553bc27
|
Delete ByteBuffer pointer and NULL check.
|
2013-05-29 10:52:45 +09:00 |
Lee, Jae-Hong
|
c20e4f3700
|
Keep a previous text on Tizen CCEditBox.
|
2013-05-28 20:43:47 +09:00 |
Lee, Jae-Hong
|
5031aa1fd3
|
Encoding UTF-8 on Tizen CCEditBox and check empty string.
|
2013-05-28 20:04:37 +09:00 |
minggo
|
6f624351b3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
|
2013-05-28 11:36:05 +08:00 |
minggo
|
beef61fc90
|
issue #2161: android supports ETC format now
|
2013-05-27 14:42:22 +08:00 |
Lee, Jae-Hong
|
47fac0ed98
|
Implement CCEditBox for Tizen. (develop branch)
|
2013-05-26 20:40:13 +09:00 |
Ben Ward
|
dbcb4357e7
|
Fixed linebreaks on Mac OSX
|
2013-05-23 18:30:56 +01:00 |
James Chen
|
5c506e2edc
|
Merge pull request #2607 from pyrasis/background_foreground_tizen
Implementing foreground and background status for Tizen port.
|
2013-05-21 21:43:51 -07:00 |
Lee, Jae-Hong
|
4152850592
|
Remove EVENT_COME_TO_BACKGROUND notification.
|
2013-05-22 13:17:54 +09:00 |
minggo
|
e07761688e
|
Merge pull request #2591 from nicolasgramlich/patch-1
Updated .classpath of Android project to latest ADT 22 build tool compatibility.
|
2013-05-21 19:43:25 -07:00 |
minggo
|
d1a8f54113
|
Merge pull request #2609 from j4m3z0r/emscriptenate
Add Audio Support for Emscripten
|
2013-05-21 18:32:12 -07:00 |
Lee, Jae-Hong
|
d83ed86739
|
Implementing foreground and background status and modify CocosDenshion comment.
|
2013-05-21 22:48:51 +09:00 |
Lee, Jae-Hong
|
4b248d5f8c
|
Delete Tizen 2.0 headers and libraries.
|
2013-05-21 21:52:10 +09:00 |
Lee, Jae-Hong
|
6f34c7cb46
|
Support Tizen 2.1 SDK.
|
2013-05-21 21:22:31 +09:00 |
minggo
|
0857fdd599
|
issue #2188:fix compiling error of iOS
|
2013-05-21 18:18:44 +08:00 |
minggo
|
cc2b00e9fe
|
Merge pull request #2573 from j4m3z0r/emscriptenate
Use browser font rendering instead of FreeType
|
2013-05-20 22:50:28 -07:00 |
James Gregory
|
da7113a04f
|
Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them.
|
2013-05-20 20:09:56 -07:00 |
James Chen
|
acef98a350
|
Merge pull request #2572 from pyrasis/tizen
fixed #2185: Cocos2d-x Tizen support.
|
2013-05-20 20:08:28 -07:00 |
Lee, Jae-Hong
|
5faa5e92af
|
Modify getWritablePath function.
|
2013-05-21 10:56:18 +09:00 |
Lee, Jae-Hong
|
6bb8d58d3a
|
Update cocos2d project and use float.h
|
2013-05-21 10:32:34 +09:00 |
Nicolas Gramlich
|
cef2575180
|
Updated .classpath of Android project to latest ADT 22 build tool compatibility.
Changes correspond to: https://groups.google.com/forum/?fromgroups#!msg/adt-dev/epOfZbKPFdk/RbR2VYNQ5_8J
|
2013-05-20 14:39:25 -06:00 |
James Gregory
|
391fb636fa
|
Add a flag to indicate whether raw image data is pre-multiplied or not, and switch to using Emscripten's SDL implementation when loading images from file (much faster)
|
2013-05-17 17:11:52 -07:00 |
James Gregory
|
7cca63130c
|
Pre-multiply text when rendered by Emscripten's SDL implementation (since HTML5 canvas is non-pre-multiplied).
|
2013-05-17 17:10:51 -07:00 |
James Gregory
|
a1ff189854
|
Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768).
|
2013-05-17 12:39:18 -07:00 |
Lee, Jae-Hong
|
900190e468
|
Replace tab to spaces.
|
2013-05-17 22:04:39 +09:00 |
James Gregory
|
95b5ce2e56
|
Remove freetype since it now works using Emscripten's SDL.
|
2013-05-16 17:34:33 -07:00 |
Lee, Jae-Hong
|
43b11a73d6
|
Remove unused headers and defines.
|
2013-05-16 20:24:00 +09:00 |
Lee, Jae-Hong
|
fb00de3e97
|
Implementing screen orientation function.
|
2013-05-16 20:17:11 +09:00 |
Lee, Jae-Hong
|
e1cf030372
|
Change the default font path.
|
2013-05-16 20:16:57 +09:00 |
Lee, Jae-Hong
|
f47958356c
|
Adding dependencies for libcurl.so
|
2013-05-16 20:09:23 +09:00 |
Lee, Jae-Hong
|
659e884009
|
Use CCImage.cpp from Linux implementation.
|
2013-05-16 20:07:31 +09:00 |
Lee, Jae-Hong
|
e459129fac
|
Move to rootstraps directory.
|
2013-05-16 20:06:25 +09:00 |
Lee, Jae-Hong
|
8915e90a36
|
Adding CCDevice.cpp for Tizen.
|
2013-05-16 20:05:04 +09:00 |
Lee, Jae-Hong
|
0ba2a82d35
|
Set return value.
|
2013-05-16 20:04:51 +09:00 |
Lee, Jae-Hong
|
434878c736
|
Delete libcurl.a because link error. Adding libcurl.so.
|
2013-05-16 20:04:06 +09:00 |
Lee, Jae-Hong
|
109e2feec8
|
Adding libcurl headers and x86 libraries for tizen.
|
2013-05-16 20:03:11 +09:00 |
Lee, Jae-Hong
|
ce4663f851
|
Implementing file utils use with Osp.
|
2013-05-16 20:01:36 +09:00 |
Lee, Jae-Hong
|
704b8013fc
|
Fix Assert bug.
|
2013-05-16 20:01:01 +09:00 |