Timothy Qiu
978fc634be
Use C++ code in C++ comments.
...
Removed Hungarian notation from parts of the code.
2013-08-01 16:40:56 +08:00
boyu0
93aa3c7ada
issue #2345 : refract CCImage and CCTexture2D.
2013-08-01 15:53:52 +08:00
James Chen
163157d827
Merge pull request #3345 from thp/develop-qt5-fixes
...
Qt 5: Build fixes for Qt 5 platform
2013-08-01 00:46:29 -07: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
zhangbin
54dbc93caf
Invoke methods of Flurry SDK on UI thread in plugin flurry.
2013-08-01 15:05:57 +08:00
James Chen
08807cb5f5
Merge pull request #3344 from malvim/develop
...
Fixing typo in create-multi-platform-projects.py
2013-07-31 19:42:58 -07:00
Huabing.Xu
9a9d0b9def
closed #2423 : add ActionTargetedReverse test case
2013-08-01 10:28:18 +08:00
Marcelo Alvim
7ae63c839a
Fixing typo in create-multi-platform-projects.py
...
/usr/bin/evn -> /usr/bin/env
2013-07-31 23:18:07 -03:00
Huabing.Xu
97f6e11f0d
issue #2423 : change TargetedAction::reverse() function from just cloning to reversing the internal action
2013-08-01 10:07:40 +08:00
carlo morgantini
ba4a48ec7a
CCTexture2D interface changed
2013-07-31 13:59:08 -07: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
carlo morgantini
95f8fe7690
fix bugs
2013-07-31 12:11:56 -07:00
James Chen
31d8200e05
Update AUTHORS [ci skip]
2013-07-31 22:10:08 +08: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
James Chen
74155f296d
Merge pull request #3337 from CocosRobot/updategeneratedsubmodule_1375259197
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-31 01:29:10 -07:00
CocosRobot
e1d572fce5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-31 08:26:40 +00:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
minggo
d887008bb8
Merge pull request #3336 from minggo/simplify-sample-code
...
Simplify sample code
2013-07-31 00:41:20 -07:00
minggo
e412fe5a31
use Point::+ to simplify HelloWorld sample
2013-07-31 14:38:50 +08:00
minggo
afc0e4bf8f
make Point -> Size & Size -> Point explicit
2013-07-31 14:36:52 +08:00
minggo
73d2c3cb9e
Merge pull request #3335 from minggo/remove-box2d-warning
...
Don't trigger warning for box2d
2013-07-30 23:21:24 -07:00
minggo
9abd73590c
Don't trigger warning for box2d
2013-07-31 13:50:43 +08:00
minggo
b9210e8d62
Merge pull request #3333 from dabingnn/Iss2448-OpenGLTestCrash-LuaJS-Bug
...
Iss2448 open gl test crash lua js bug
2013-07-30 21:49:57 -07:00
Huabing.Xu
b68339ef4e
replace indent by using space instead of tab
2013-07-31 10:58:15 +08:00
Huabing.Xu
c1023b5cb5
closed #2448 : Fix some indent syntax!
2013-07-31 10:46:10 +08:00
Huabing.Xu
832fcf2adb
closed #2448 : Fix crash when call glGetAttachedShaders with a NULL parameter on Windows
2013-07-31 10:37:42 +08:00
minggo
0241470ff9
Merge pull request #3330 from dabingnn/Iss2447-ClippingNodeTestCrash-bug
...
closed #2447 : Fix clippingNodeTest RawStencilBufferTest6 crash bug
2013-07-30 18:42:46 -07:00
minggo
d108eca41a
[ci skip]
2013-07-31 09:27:32 +08:00
minggo
a8f10c480d
Merge pull request #3332 from azmeuk/clang
...
Clang support for Linux
2013-07-30 18:26:12 -07:00
minggo
35ebda21a9
Merge pull request #3331 from minggo/iss2438-remove_mac_32
...
Iss2438 remove mac 32
2013-07-30 18:18:22 -07:00
carlo morgantini
ff56ad5435
fix bugs with new Label stuff and add new sample for unicode
2013-07-30 16:41:26 -07:00
Sergey Shambir
7385db5a34
Linux: added SDL2 to travis scripts and install-deps-linux.sh
2013-07-30 23:20:18 +04: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
carlo morgantini
9de1ef3f97
New label TTF. New text alignment sample.
2013-07-30 10:27:22 -07:00
Éloi Rivard
524b6903a5
Added clang support for linux.
2013-07-30 14:49:44 +02:00
Éloi Rivard
15081f5616
Removed all warnings from Box2D since it is an external project.
2013-07-30 14:48:44 +02: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
Huabing.Xu
6a1938056c
closed #2447 : Fix clippingNodeTest RawStencilBufferTest6 crash bug
2013-07-30 16:27:13 +08:00
Éloi Rivard
14e200e61a
Added debugging information in emscripten DEBUG mode
2013-07-30 10:11:30 +02:00
James Chen
df33991a38
Merge pull request #3329 from pyrasis/tizen_2.2
...
[Tizen] Fix compile error
2013-07-30 00:34:40 -07:00
minggo
eec2d0205a
Merge pull request #3328 from natural-law/develop
...
Add plugin flurry ads
2013-07-30 00:09:18 -07:00
zhangbin
c8b4d4fdc6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-30 14:58:06 +08:00
zhangbin
0f8e1d930a
closed #2439 , Add sample code for plugin flurry Ads.
2013-07-30 14:57:37 +08:00
zhangbin
e187be3942
issue #2439 , Add flurry ads plugin for android.
2013-07-30 14:56:45 +08:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09: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
James Chen
3633ebfe0c
Merge pull request #3224 from azmeuk/emscripten
...
emscripten keyboard support
2013-07-29 22:50:27 -07:00
boyu0
31da5ebeb7
fix some compile error and pass the linux compile
2013-07-30 13:45:50 +08:00