yangxiao
815f0b7bd9
useCallback to false
2014-05-08 10:12:12 -07:00
Dale Stammen
eea1ba6946
added missing files to projects
2014-05-08 10:11:42 -07:00
minggo
56622dc765
Merge pull request #6555 from Dhilan007/v3_video
...
issue #4859:Add a widget to play video
2014-05-08 18:33:51 +08:00
Dhilan007
af26fb9b07
issue #4870:Add a ui widget of playing video
2014-05-08 18:13:50 +08:00
Dhilan007
bda73bc7b3
issue #4868:Use system widget to play video on iOS
2014-05-08 18:12:53 +08:00
Dhilan007
bda8a73ae5
issue #4867:Use system widget to play video on Android
2014-05-08 18:12:03 +08:00
minggo
f12bdeca9a
Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug
...
Fixed bug of guireader
2014-05-08 18:06:21 +08:00
minggo
c886bf21a8
Merge pull request #6631 from Dhilan007/v3_labelhotfixed
...
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 17:24:08 +08:00
minggo
d84e26c7b4
Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background
...
sounds pause automatically when switching background
2014-05-08 17:11:29 +08:00
Ryeeeeee
80103487fe
rename variable
2014-05-08 16:53:24 +08:00
CaiWenzhi
0a46b3c8d2
Merge branch 'v3' into v3_nutty_fixedreaderbug
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-05-08 15:56:34 +08:00
Dhilan007
966e7e2b20
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 15:47:37 +08:00
minggo
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
CaiWenzhi
a562f19880
Fixed bug of guireader
2014-05-08 15:15:09 +08:00
Ryeeeeee
eec96e9e96
sounds pause automatically when switching background
2014-05-08 14:44:47 +08:00
CocosRobot
119ef29a87
[AUTO]: updating luabinding automatically
2014-05-08 06:03:37 +00:00
minggo
e9caee282f
Merge pull request #6574 from andyque/focus3861
...
issue #3861 , add focus functionality to ui framework
2014-05-08 13:44:01 +08:00
Ricardo Quesada
4b15b884e7
Uniform is a struct
2014-05-07 20:38:15 -07:00
andyque
f6d0135b9b
Merge branch 'v3' into focus3861
2014-05-08 11:27:57 +08:00
andyque
238ffcc545
issue #4861 , fix pass focus to child
2014-05-08 11:24:09 +08:00
Ricardo Quesada
90ec7dd9ec
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-07 20:21:03 -07:00
Ricardo Quesada
b401f6adc1
Lots of new code
...
Adds GLProgramState
2014-05-07 20:20:19 -07:00
CocosRobot
7aff750381
[AUTO]: updating luabinding automatically
2014-05-08 03:19:36 +00:00
andyque
b5f1f7455b
issue #4861 , fix a problem when layout focus loops
2014-05-08 10:46:05 +08:00
Dhilan007
7495f22708
closed #4906:Fixed the label continue to appear when its opacity is set to 0.
2014-05-08 10:12:29 +08:00
Huabing.Xu
41f48e7fa9
Merge branch 'v3' into tony_improved_glprogram
2014-05-07 15:30:04 -07:00
Ricardo Quesada
98454eeb69
Adds GLProgram::createXXX()
2014-05-07 14:38:41 -07:00
Ricardo Quesada
02405a8efe
Improved samples
2014-05-07 12:41:04 -07:00
Ricardo Quesada
a2c4ddf028
beautify Uniform and VertexAttrib
2014-05-07 11:26:26 -07:00
Ricardo Quesada
b1ed7178fe
Improved API for Uniforms
2014-05-07 10:44:45 -07:00
yangxiao
5190fb27c8
use proposed vertex attribute api
2014-05-07 09:27:44 -07:00
Mircea Rila
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
andyque
05b7d274c8
issue #4861 . fix distance calculation
2014-05-07 18:27:05 +08:00
James Chen
edcef656cc
Merge pull request #6599 from CocosRobot/update_lua_bindings_1399451378
...
[AUTO]: updating luabinding automatically
2014-05-07 16:39:41 +08:00
James Chen
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
CocosRobot
36843196c5
[AUTO]: updating luabinding automatically
2014-05-07 08:30:46 +00:00
James Chen
9fb38cb332
Merge pull request #6595 from samuele3hu/v3_lua_fix
...
close #5032 : A potential crash bug of Lua binding for sp.SkeletonAnimation.setAnimation
2014-05-07 16:26:13 +08:00
andyque
def0505ba7
closed #4861 , refactor
2014-05-07 14:26:41 +08:00
andyque
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
andyque
8baa88e2e1
closed #4861 , fixed temparory variable issue
2014-05-07 11:55:00 +08:00
andyque
657720e509
Merge remote-tracking branch 'upstream/v3' into focus3861
2014-05-07 11:42:09 +08:00
zhangbin
9966d83c02
Export the `2d` include directory of engine on android.
2014-05-07 10:43:42 +08:00
andyque
ef70c684de
issue #4861 , add requestFocus method and the layout current can get focus
2014-05-07 10:23:57 +08:00
samuele3hu
fb60b9f65a
issue #5032:A potential crash bug of Lua binding
2014-05-07 10:09:54 +08:00
andyque
62a66872aa
issue #4861 , fixed some boundary conditions
2014-05-07 10:05:20 +08:00
Ricardo Quesada
db759005e0
Improvements for Attributes and Uniform API
2014-05-06 17:58:14 -07:00
Ricardo Quesada
21dd6fef69
Improves code a little bit
2014-05-06 12:46:35 -07:00
Trace
cf9e8ff0bd
Merge branch 'newV3' into improved_glprogram
...
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
2014-05-06 12:07:42 -07:00
Trace
69fd841b30
fix the include error
2014-05-06 11:19:51 -07:00
Ricardo Quesada
720852681e
Adds license to VertexAttribBind
2014-05-06 11:15:40 -07:00
yangxiao
bbd4533c5e
Improves GLProgram
...
Adds vetex attrib bind class
2014-05-06 11:03:24 -07:00
andyque
9d71ae29b9
issue #4861 . fixed all widget focus diabled bug
2014-05-06 17:28:12 +08:00
andyque
a15dd55baa
closed #3861 , fixed some typo and indent problem
2014-05-06 12:04:52 +08:00
andyque
bcd2d3ccb3
issue #3861 , fix layout contentSize caculation
2014-05-06 11:46:28 +08:00
minggo
7830818fc0
Merge pull request #6553 from Dhilan007/v3_labelhotfixed
...
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-06 11:41:24 +08:00
Dhilan007
989b3830aa
fixed indent
2014-05-06 11:22:23 +08:00
Dhilan007
e412f91103
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-06 10:36:55 +08:00
minggo
302ec843e7
Merge pull request #6577 from MSOpenTech/v3-wp8-fix
...
V3 wp8 fix
2014-05-06 10:26:19 +08:00
andyque
e65b144ee6
issue #3861 , fixs windows compile error
2014-05-06 10:17:10 +08:00
andyque
16ebe8d41c
issue #3861 , fix linux compile error
2014-05-06 09:40:50 +08:00
Huabing.Xu
c581f74142
Merge branch 'v3' into v3.1_unify_ZERO_ONE
2014-05-05 18:10:13 -07:00
Huabing.Xu
32f9a8ffc6
comment out warning code in quaternion.cpp
...
unify ZERO, ONE, UNIT_X/Y/Z/W into a consistent convention
2014-05-05 18:07:58 -07:00
CocosRobot
db99518c80
[AUTO]: updating luabinding automatically
2014-05-06 00:46:16 +00:00
Ricardo Quesada
afaa701cff
math cocos2d fixes
2014-05-05 17:42:11 -07:00
Ricardo Quesada
f12ea26611
Merge pull request #6582 from ricardoquesada/math_fixes
...
math fixes
2014-05-05 17:11:37 -07:00
Ricardo Quesada
4483d653d5
math fixes
...
- Moves deprecated Point to CCDeprecated.h
- Adds Point2 and Point3
- removes `math` from `cocos2d::math` namespace
2014-05-05 17:10:41 -07:00
CocosRobot
5db3fa8df0
[AUTO]: updating luabinding automatically
2014-05-05 23:58:54 +00:00
Ricardo Quesada
e413b86295
Revert `new Sprite` change done a few days ago
...
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
2014-05-05 16:53:37 -07:00
Ricardo Quesada
0e6dd9afe5
Particles can be created without texture
...
Needed for complex particles like in EarthWarrior3D
2014-05-05 15:50:08 -07:00
Dale Stammen
9a05e86ab6
updated missing files
2014-05-05 13:26:28 -07:00
Dale Stammen
78204c7c91
removed obsolete headers
2014-05-05 13:25:57 -07:00
andyque
0d9d2a57dc
issue #3861 . fix a indent problem
2014-05-05 17:54:21 +08:00
andyque
34b3114e55
issue #3861 . add license to CCEventFocus and CCEventListenerFocus
2014-05-05 17:49:31 +08:00
andyque
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
andyque
afb65bbebd
issue #4861 , fix widget query method
2014-05-05 11:37:39 +08:00
andyque
503be87675
issue #4861 . refactor UILayout to search widget by index
2014-05-05 11:37:39 +08:00
andyque
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
andyque
9383900123
issue #4861 . cleanup some code of UILayout and UIWidget
2014-05-05 11:37:39 +08:00
andyque
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
andyque
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
andyque
b35ddfe5b5
issue #4861 , add focus functionality into Widget class
2014-05-05 11:37:38 +08:00
andyque
1dee81a166
issue #4861 , refactor setFocused into setHilighted
2014-05-05 11:37:38 +08:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
James Chen
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
CocosRobot
cdd04ee11f
[AUTO]: updating luabinding automatically
2014-05-02 01:12:32 +00:00
Ricardo Quesada
b67f3008a5
Lua compiles again
2014-05-01 18:07:25 -07:00
CocosRobot
d75a7c51a3
[AUTO]: updating luabinding automatically
2014-05-02 00:37:21 +00:00
Ricardo Quesada
207e67318d
rolling back tests
2014-05-01 16:55:28 -07:00
Ricardo Quesada
462338879e
rolling back physics in layer
2014-05-01 16:42:35 -07:00
Ricardo Quesada
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
Ricardo Quesada
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
Ricardo Quesada
1cfd133555
fixes tmx maps
2014-05-01 11:51:11 -07:00
CocosRobot
7cb5f4c418
[AUTO]: updating luabinding automatically
2014-05-01 02:25:38 +00:00
Ricardo Quesada
9bd6ace582
compiles on iOS
2014-04-30 19:21:10 -07:00
Ricardo Quesada
b8eba4e1c1
oops
2014-04-30 19:13:58 -07:00
Ricardo Quesada
7b2e558bb0
Merge pull request #6531 from ricardoquesada/fix_builder_squash
...
Fixes linux build
2014-04-30 19:10:12 -07:00
Ricardo Quesada
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
James Chen
35505aa63f
Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829
...
[AUTO]: updating luabinding automatically
2014-05-01 09:33:33 +08:00
CocosRobot
94e01a2e81
[AUTO]: updating luabinding automatically
2014-05-01 00:58:35 +00:00
Ricardo Quesada
598bb91133
you should be 10
2014-04-30 17:56:14 -07:00