James Chen
ea10032b24
issue #2170 : Adding missing libs for Android.
2013-08-05 11:43:43 +08:00
James Chen
9a9ffaeb4d
issue #2170 : A typo fix.
2013-08-05 11:33:59 +08:00
James Chen
b8a7a4291f
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 11:26:34 +08:00
James Chen
eaabd93051
issue #2170 : Fixing compilaction errors on Emscripten.
2013-08-05 11:10:12 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
James Chen
0db8b2bbf3
closed #2469:LabelTest and TileMapTest crash on windows.
2013-08-02 17:31:19 +08:00
James Chen
c1d715b778
Adding windows support for New Label.
2013-08-02 15:01:27 +08:00
James Chen
67d710a41c
Adding Android support for new label.
2013-08-02 13:46:26 +08:00
minggo
5e03b9b29d
Merge pull request #3347 from timothyqiu/docfix
...
More documentation fixes
2013-08-01 18:22:43 -07:00
Timothy Qiu
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
Thomas Perl
6f967fc107
Qt 5: Build fixes for Qt 5 platform
...
Recent changes to the develop branch broke Qt 5 support.
2013-08-01 09:20:17 +02:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
James Chen
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Sergey Shambir
d23d486720
Linux: added SDL2 backend as replacement for GLFW.
...
Initially planned as alternative, made replacement after discussion with
minggo.
Summary:
GLFW v.3 released in June. New version breaks API without real need:
http://cocos2d-x.org/boards/6/topics/31277
Meanwhile SDL2 is very stable. SDL2 used in Steam Runtime and will be
part of Ubuntu SDK, it's supported by other distributions.
Completed:
- OpenGL initialization and window handling with SDL
- Keyboard, IME emulation, mouse and touches support with SDL
- Window title now contains app name on Linux
- Backspace correctly handled with new backend
Note:
- SDL on X11 have no proper multitouch, but backend handles multitouch
events to support future Linux graphics.
2013-07-30 23:08:26 +04:00
minggo
ba4e0d8d39
closed #2438:re-add libwebp.a
2013-07-30 18:06:01 +08:00
minggo
1d2b1c79c2
closed #2438:remove mac 32-bit support
2013-07-30 18:02:35 +08:00
boyu0
5225bb2f7f
fix the travis ci compile error
2013-07-30 14:16:23 +08:00
boyu0
c4a1bf8986
fix the travis ci compile error
2013-07-30 14:07:31 +08:00
boyu0
31da5ebeb7
fix some compile error and pass the linux compile
2013-07-30 13:45:50 +08:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
Timothy Qiu
b3da051807
Remove colon after @param @warning @deprecated
...
Added a missing @param.
2013-07-30 10:56:14 +08:00
James Chen
2566f74cd7
closed #2440 : Files with Non-ascii path can't be found on Windows.
2013-07-29 18:27:26 +08:00
boyu0
4348e87e31
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
2013-07-29 17:56:36 +08:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
4c32303b2e
Merge pull request #3317 from dumganhar/member-var-init
...
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
2013-07-29 00:29:08 -07:00
James Chen
5aab0cab7b
[Android] Fixing build errors for ndk-r9.
2013-07-29 14:54:00 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
James Chen
b7afc9db43
issue #2430 : [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE.
2013-07-27 23:20:00 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
minggo
295a23e535
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 07:57:28 +08:00
carlo morgantini
8416e7cf6d
Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-26 15:54:50 -07:00
Sergii Rudchenko
3ea77ec933
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 01:17:13 +03:00
James Chen
825dd5927f
issue #2430 : Fixing conflicts.
2013-07-27 01:11:21 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
James Chen
c9def73930
Application::Platform::OS_MACOS --> Application::Platform::OS_MAC.
2013-07-26 20:24:33 +08:00
Éloi Rivard
95b826d82a
Fixed a bug in emscripten file utils.
2013-07-26 14:19:47 +02:00
Éloi Rivard
3ffc026c6c
Added some guards in file utils.
2013-07-26 14:19:20 +02:00
James Chen
9b6d3e6090
ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT
2013-07-26 20:07:41 +08:00
James Chen
7d9d799194
issue #2430 : Fixing a typo.
2013-07-26 19:54:44 +08:00
James Chen
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
James Chen
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +08:00
James Chen
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00