andyque
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
andyque
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
andyque
0c0f18e7f3
issue #5047 , refactor LayoutParameterType
2014-05-09 17:38:05 +08:00
andyque
d12a71f738
issue #5057 , refactor UILayoutDefine
2014-05-09 17:16:11 +08:00
andyque
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
andyque
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
andyque
305f052344
issue #5057 , refactor LayoutClippingType
2014-05-09 16:31:22 +08:00
andyque
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
andyque
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
andyque
d799ffce40
issue #5057 , remove include dependency
2014-05-09 15:32:51 +08:00
andyque
f070fc335f
issue #5057 , refactor BrightStyle to strong typed enum
2014-05-09 15:23:34 +08:00
andyque
762e8d9249
issue #5057 , refactor WidgetType to strong typed enum
2014-05-09 15:16:33 +08:00
andyque
6a7277c38f
issue #5057 , refactor TextureResType to strong typed enum
2014-05-09 14:56:05 +08:00
andyque
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
chuanweizhang2013
d502e41af4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
2014-05-09 14:28:14 +08:00
yangxiao
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07:00
Dhilan007
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
andyque
21e4d05e6e
issue #5057 , refactor SEL_TouchEvent to std::function
2014-05-09 11:28:36 +08:00
andyque
a699230e75
issue #5057 , replace license
2014-05-09 09:39:18 +08:00
andyque
1d7726133c
issue #5057 , refactor enum SizeType to strong typed enum
2014-05-09 09:37:51 +08:00
andyque
3ef1facfb0
issue #5057 , replace deprecated enum with strong typed enum
2014-05-09 09:29:07 +08:00
Ricardo Quesada
7fee9cc266
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-08 18:02:27 -07:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Huabing.Xu
1d5bfb5a10
roll back _yCoordFlipped changes
2014-05-08 16:45:08 -07:00
Ricardo Quesada
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
Ricardo Quesada
2e669c1d28
GLProgram::create() returns a linked GLProgram
2014-05-08 16:04:59 -07:00
Ricardo Quesada
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
Ricardo Quesada
453b670ad2
Removes CCVertexAttribBind
2014-05-08 14:01:26 -07:00
Ricardo Quesada
9ea4aa1e16
Simplified VertexAttrib
2014-05-08 14:01:03 -07:00
Ricardo Quesada
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
Ricardo Quesada
a2361b30de
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-08 10:16:49 -07:00
Ricardo Quesada
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
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
cocoscodeide
6efaa2fe8f
Merge pull request #2 from chuanweizhang2013/v3luaruntime
...
modify luadebug and adjust code file
2014-05-08 22:09:06 +08: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
andyque
fd362d2ace
issue #5057 . deprcated PositionType and make a new enum class instead
2014-05-08 18:25:49 +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
andyque
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +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
chuanweizhang2013
8f7cb74dd1
fixed debug
2014-05-08 16:02:55 +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
Jason Xu
8507fd7f8d
FIx: correct TotalTime of ActionObject.
2014-05-08 10:28:41 +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
yinkaile
7d937f1c79
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-08 09:30:55 +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
minggo
1cbe29071b
remove unneeded codes
2014-05-07 16:49:32 +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
yinkaile
ba5544b63d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-07 15:47:37 +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
cocoscodeide
04600227ae
Merge pull request #1 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-05-07 11:34:35 +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
yinkaile
ede895ed6d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-06 09:34:34 +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
chuanweizhang2013
cd7ea468e8
modify lua_debugger.c
2014-05-05 21:18:33 +08:00
James Chen
0995204abc
Optimization for Value
2014-05-05 19:00:46 +08: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
2youyou2
44b93f3548
change tab to 4 space
2014-05-05 17:46:06 +08:00
2youyou2
d4f644814c
change tab to 4 space
2014-05-05 17:43:15 +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
2youyou2
f6eac43a0a
fixed no effect with stopping tween between two frames
2014-05-05 09:45:06 +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
Ricardo Quesada
53b293e85f
Merge branch 'v3' into improved_directory_structure
2014-04-30 17:52:52 -07:00
Ricardo Quesada
98f26b4987
Compiles on Windows
2014-04-30 17:44:41 -07:00
Ricardo Quesada
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
Huabing.Xu
183dd1ec64
inverse and conjugate, negate for matrix
2014-05-01 01:59:36 +08:00
Huabing.Xu
8fe4c472fd
inverse and conjugate for quaternion
2014-05-01 01:32:16 +08:00
Huabing.Xu
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
Huabing.Xu
c722b74e36
Merge branch 'v3' into v3_refactor_normalize
2014-04-30 20:08:37 +08:00
Huabing.Xu
84515b521d
refactor normalize in Quaternion
2014-04-30 20:06:49 +08:00
Huabing.Xu
441279c7ab
refactor normalize in Vector4
2014-04-30 19:59:06 +08:00
Huabing.Xu
3ccb6dcbed
refactor normalize in Vector3
2014-04-30 19:50:36 +08:00
Huabing.Xu
7bc9b96d1a
remove some cumbersome struct keyword
2014-04-30 18:37:30 +08:00
Huabing.Xu
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
minggo
2cbbaed5b3
Merge pull request #6512 from dabingnn/v3_renderTextureBug
...
V3 render texture bug
2014-04-30 17:52:14 +08:00
minggo
0dff539a18
Merge pull request #6521 from boyu0/particle_yCoordFlipped_bug
...
Fix ParticleSystem yCoordFlipped bug.
2014-04-30 17:03:01 +08:00
boyu0
489adaf315
fix indent
2014-04-30 16:33:35 +08:00
boyu0
c1d60f4b33
Fix ParticleSystem yCoordFlipped bug.
2014-04-30 16:18:39 +08:00
boyu0
0699aa94fe
Change Value::asBool() return false by default.
2014-04-30 15:07:26 +08:00
yangxiao
11dc9367ff
wrong rotation
2014-04-29 18:19:30 -07:00
yangxiao
3237d7b23d
Revert "wrong rotation"
...
This reverts commit 3c9560017e
.
2014-04-29 18:14:41 -07:00
Ricardo Quesada
1954edc655
Adds Apache2 license to GamePlay3d files
2014-04-29 17:50:12 -07:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
yangxiao
3c9560017e
wrong rotation
2014-04-29 17:27:32 -07:00
samuele3hu
58a9e40b82
Modify some functions return value from `bool` to `int`
2014-04-29 17:17:18 +08:00
samuele3hu
4eaec951b6
use `new` and `CC_SAFE_DELETE_ARRAY` to replace `malloc` and `free`
2014-04-29 16:04:08 +08:00
Huabing.Xu
331c2d3872
readd wp8 code which is removed by accident
2014-04-29 16:03:50 +08:00
Huabing.Xu
faa0f67644
using pointer instead of Director::getInstance() in RenderTexture
2014-04-29 15:13:24 +08:00
Huabing.Xu
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
samuele3hu
ae488e5afa
Replace `vec2s` with `points`
2014-04-29 14:39:19 +08:00
samuele3hu
84c1f9281e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
2014-04-28 16:28:44 +08:00
samuele3hu
d729a161a4
Add some deprecated functions and replace the Point related to Vector2
2014-04-28 16:28:15 +08:00
CocosRobot
78a7c98b26
[AUTO]: updating luabinding automatically
2014-04-28 07:01:59 +00:00
James Chen
e96883ec43
Merge pull request #6394 from samuele3hu/dev_compile_error
...
Fix compile error for Lua
2014-04-28 14:57:48 +08:00
James Chen
35207fd8ba
Merge pull request #6399 from dumganhar/v3
...
fullPathForFilename optimization: Checking whether the path is an empty string.
2014-04-28 14:56:01 +08:00
James Chen
4f41b9d3ac
fullPathForFilename optimization: Checking whether the path is an empty string.
2014-04-28 14:53:30 +08:00
samuele3hu
c3f40bdc24
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
2014-04-28 14:05:08 +08:00
samuele3hu
d3670644bf
Fix compile error for Lua
2014-04-28 14:04:37 +08:00
James Chen
8538b27385
Merge pull request #6391 from dabingnn/v3_optimize
...
V3 optimize
2014-04-28 13:39:15 +08:00
Huabing.Xu
e6f7854225
clean for kazmath in project file
2014-04-28 13:14:22 +08:00
James Chen
6e0ee08d84
Merge pull request #6390 from Dhilan007/v3
...
fixed compile fail on wp8
2014-04-28 11:59:06 +08:00
Dhilan007
b4a9381238
fixed return type is not right
2014-04-28 11:55:45 +08:00
Dhilan007
35f83fc40a
fixed compile fail
2014-04-28 11:42:54 +08:00
James Chen
aa04176d83
Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip
...
fixed the clipping of ui layout read from CocoStudio could not work
2014-04-28 11:08:40 +08:00
pipu
c492f4d3c3
fixed ui layout clip
2014-04-28 10:06:11 +08:00
James Chen
cbcf2e2bc8
Merge pull request #6384 from dabingnn/v3_optimize
...
change tab to space for CCDirector.cpp
2014-04-28 09:54:43 +08:00
Huabing.Xu
64d7a6bd37
change tab to space
2014-04-28 09:51:10 +08:00
Ricardo Quesada
d0ebc14076
compiles on linux
2014-04-26 10:41:57 -07:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Ricardo Quesada
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
Ricardo Quesada
c7a606fc78
Adds auto-culling for labels!
...
yeah!
2014-04-25 19:00:22 -07:00
Ricardo Quesada
22fb1a774a
version is v3.1-alpha0
2014-04-25 18:03:35 -07:00
Ricardo Quesada
b801995bbe
Merge branch 'v3' into develop_migrate_math_lib
2014-04-25 17:56:52 -07:00
James Chen
c1f220447a
Merge pull request #6373 from xhcnb/deprecated_callback
...
use new ccHttpRequestCallback.
2014-04-25 17:34:11 +08:00
Jason Xu
42c374157d
CC_CALLBACK_2 not std::bind directly
2014-04-25 17:32:21 +08:00
James Chen
d868196aae
Merge pull request #6372 from twhittock/mac-application-retcodes
...
Returns correct value for Application::run on Mac platform
2014-04-25 17:19:51 +08:00
Jason Xu
5cc483276b
use new ccHttpRequestCallback.
2014-04-25 17:15:57 +08:00
Tom Whittock
ec42b7c76a
Use correct return codes from mac CCApplication
2014-04-25 10:01:10 +01:00
Huabing.Xu
85e97f246d
Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib
2014-04-25 16:37:31 +08:00
Huabing.Xu
dbf241c38d
fix compile error after merge
2014-04-25 16:30:51 +08:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
Huabing.Xu
613ba6e5b6
work on linux now
2014-04-25 15:10:37 +08:00
James Chen
828401a23d
Merge pull request #6302 from zifter/FixParticle
...
closed #4880 : Particle systems loading incorrectly in CocosBuilder
2014-04-25 14:15:44 +08:00
James Chen
8ffd663eb6
Merge pull request #6154 from newnon/develop_jni_improvements
...
[android] Adds onActivityResult listeners
2014-04-25 13:51:36 +08:00
James Chen
1b82cd7f08
Merge pull request #6093 from dplusic/develop
...
fixed cc.pGetAngle not using absolute value
2014-04-25 13:41:41 +08:00
CocosRobot
e9b51a2a42
[AUTO]: updating luabinding automatically
2014-04-25 04:00:21 +00:00
James Chen
cd6fe294b8
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
...
closed #4771 : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
James Chen
efd16bc37e
Merge pull request #6264 from iSevenDays/patch-10
...
Fix loosing precision: int -> size_t for the return value of `recv`
2014-04-25 11:11:52 +08:00
James Chen
328408d792
Merge pull request #6263 from Mazyod/develop-cpp11-http-client
...
closed #4702 : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
James Chen
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
adcacbf5eb
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelAtlas.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2014-04-24 16:58:46 +08:00
minggo
55911e1e78
Merge pull request #6356 from Dhilan007/develop_v3
...
fixed drawDebugData of LabelBMFont/LabelAtlas.
2014-04-23 15:24:30 +08:00
minggo
1c15d7fd08
Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader
...
Fixed bug of gui reader
2014-04-23 15:16:31 +08:00
Dhilan007
a4ac5ab054
fixed drawDebugData of LabelBMFont/LabelAtlas.
2014-04-23 15:05:02 +08:00
CaiWenzhi
4750e8b417
Fixed bug of gui reader
2014-04-23 15:02:35 +08:00
Huabing.Xu
587f65098f
Fix compile error after merging
2014-04-23 14:59:45 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
Dhilan007
75772af82b
fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled.
2014-04-22 23:18:23 +08:00
minggo
506d628619
Merge pull request #6352 from natural-law/develop
...
Solve compiling errors when some macros changed in ccConfig.h.
2014-04-22 17:00:28 +08:00
minggo
ccc935137b
Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash
...
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
2014-04-22 16:53:32 +08:00
zhangbin
2305ba59e6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos/2d/CCActionInterval.cpp
2014-04-22 16:49:27 +08:00
zhangbin
093bd20a74
Solve compiling errors when some macros changed in ccConfig.h.
2014-04-22 16:42:13 +08:00
James Chen
b8e77d8968
Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION
2014-04-21 22:38:15 -07:00
James Chen
99654289ed
Invokes 'Node::onExit' only when the node is running.
2014-04-21 22:31:34 +08:00
James Chen
8038d3daa5
Fixed tilemaptest crashes when click 'next' button quickly
2014-04-21 22:24:44 +08:00
Huabing.Xu
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
Huabing.Xu
83ee1b4bdc
android OK
2014-04-21 17:38:10 +08:00
Huabing.Xu
68e058b12d
IOS/Mac OK: remove kazMath
...
Make code compatible with old tests
2014-04-21 17:37:52 +08:00
minggo
3ac08b7349
Merge pull request #6300 from elvman/develop
...
Flipping RenderTexture's sprite instead of scaling it by -1
2014-04-21 15:23:10 +08:00
CocosRobot
77130708c2
[AUTO]: updating luabinding automatically
2014-04-21 06:45:09 +00:00
minggo
0a5b92c56f
Merge pull request #6305 from samuele3hu/developAudio
...
fix the bug that exit layer can’t end the SimpleAudioEngine
2014-04-21 14:40:40 +08:00
minggo
02c2fc8abf
Merge pull request #6333 from chuanweizhang2013/luaruntime
...
translate
2014-04-21 14:06:32 +08:00
minggo
8a75bccdc1
Merge pull request #6332 from minggo/develop
...
update version
2014-04-21 13:44:40 +08:00
minggo
b53b9ceb3e
update version
2014-04-21 13:43:42 +08:00
boyu0
710fe9d940
closed #4771 : modify test.
2014-04-21 13:32:47 +08:00
chuanweizhang2013
1fe52b1557
translate
2014-04-21 11:07:14 +08:00
minggo
1c44dbe385
Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios
...
closed #4904 : fix ios Image::saveToFile crashes when save jpg file.
2014-04-21 11:02:11 +08:00
boyu0
a1024353f1
issue #4904 : fix iOS Image::safeToFile crashes when save jpg file.
2014-04-21 10:25:34 +08:00
Huabing.Xu
e74f8719cf
fix warning in compiling
2014-04-21 09:52:59 +08:00
Dale Stammen
9792a4708a
fixed curl DEBUGASSERT for release builds
2014-04-19 10:33:40 -07:00
Dale Stammen
6646e6c860
input event refactor. console enabled for wp8
2014-04-19 10:12:34 -07:00
Dale Stammen
d235539b39
added missing include paths
2014-04-19 10:12:06 -07:00
Dale Stammen
8d6fe7be1a
added missing files
2014-04-19 10:11:44 -07:00
Dale Stammen
4a7fa029cc
updated property sheet include paths and warnings
2014-04-19 10:09:10 -07:00
Dale Stammen
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
Dale Stammen
b0adaee331
added missing WP8 device orientation
2014-04-19 10:06:27 -07:00
Dale Stammen
768e0bd53f
updated wp8 precompiled shaders
2014-04-19 10:05:21 -07:00
Dale Stammen
8f14597717
check if _currentUTF16String is null
2014-04-19 09:38:45 -07:00
Dale Stammen
9cf463bf6a
start of input queue support
2014-04-19 09:37:54 -07:00
Dale Stammen
12b01dcb25
input events refactor
2014-04-19 09:32:59 -07:00
Dale Stammen
1a56f435fe
added missing files
2014-04-19 09:32:12 -07:00
Dale Stammen
bebfe31b48
removed input files from refactor
2014-04-19 09:28:37 -07:00
Dale Stammen
66ed186a56
added missing files
2014-04-19 09:27:28 -07:00
Dale Stammen
f2b5d7c395
updated winrt project file
2014-04-19 09:26:52 -07:00
Dale Stammen
d19e898f21
removed ccset.h
2014-04-19 09:26:38 -07:00
Dale Stammen
4baa7ebacf
added CC_PLATFORM_WINRT
2014-04-19 09:25:54 -07:00
Dale Stammen
1403737d2d
added functions to display ip address of device
2014-04-19 09:12:20 -07:00
Dale Stammen
f233251f4f
added functions to display ip address of device
2014-04-19 09:12:04 -07:00
Dale Stammen
008bde1e27
fixed font path when fontname is empty string
2014-04-19 09:11:20 -07:00
Dale Stammen
b54a1064fd
fixed accelerometer for wp8
2014-04-19 09:10:34 -07:00
Huabing.Xu
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
minggo
8e83cd7900
Merge pull request #6261 from iSevenDays/patch-9
...
Fix memory leak
2014-04-18 14:19:17 +08:00
minggo
0e7280b1ca
Merge pull request #6304 from dumganhar/iss4568-crash
...
closed #4568 : Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
2014-04-18 14:00:40 +08:00
minggo
b7e5306275
Merge pull request #6313 from chuanweizhang2013/luaruntime
...
update android runtime
2014-04-18 13:59:32 +08:00
samuele3hu
7e81f32016
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText
2014-04-18 11:55:30 +08:00
samuele3hu
914516a4e0
fix the compile error about luabindings and add the `RichText` test cases.
2014-04-18 11:54:57 +08:00
chuanweizhang2013
2a9c99ff66
Merge pull request #25 from cocos2d/develop
...
update cocos2d-x
2014-04-18 11:45:53 +08:00
CocosRobot
a78a1090c3
[AUTO]: updating luabinding automatically
2014-04-18 02:51:14 +00:00
minggo
7399ef2527
Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize
...
Develop nutty widgetsupportscontentsize
2014-04-18 10:47:10 +08:00
minggo
a8a8ef85e6
add comment for EventListenerTouchOneByOne::checkAvailable()
2014-04-17 14:46:52 +08:00
CaiWenzhi
a8bfa094c0
Remove useless codes
2014-04-17 14:27:21 +08:00
CaiWenzhi
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
CaiWenzhi
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
samuele3hu
11515f6ab3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
2014-04-17 11:06:20 +08:00
samuele3hu
1331fff62c
fix the bug that exit layer can’t end SimpleAudioEngine
2014-04-17 10:36:08 +08:00
James Chen
30e1d41dbf
Makes 'compareRenderCommand' as a static function instead of a global function
2014-04-17 10:16:37 +08:00
andyque
a9ed075d50
closed #4883 . fixed slider hittest problem
2014-04-17 10:15:58 +08:00
James Chen
63f54cb5f7
closed #4568 : Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
...
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
2014-04-17 10:15:11 +08:00
zifter
08d975268d
Fix for issue http://www.cocos2d-x.org/issues/4880 .
2014-04-17 03:15:43 +03:00
Elviss Strazdins
5ddef013ba
Flipping RenderTexture's sprite instead of scaling it by -1
2014-04-17 02:22:34 +03:00
Huabing.Xu
d14d3007d0
remove kazmath include file
2014-04-16 14:08:58 +08:00
Huabing.Xu
346d42f723
remove warning message---finished
2014-04-16 11:20:45 +08:00
Huabing.Xu
6fd7197d96
remove warning message---continue
2014-04-16 11:18:23 +08:00
Huabing.Xu
a32bb8cd23
remove warning message---continue
2014-04-16 10:58:34 +08:00
Huabing.Xu
b01941b6ac
remove warning message---continue
2014-04-16 10:42:39 +08:00
Huabing.Xu
2bb32a8e4b
remove warning message
2014-04-16 10:27:17 +08:00
Huabing.Xu
30dec564e6
remove kazmath/kazmath.h include
2014-04-15 23:50:28 +08:00
Huabing.Xu
debad86ec1
fix compile error after merge
2014-04-15 22:35:35 +08:00
Huabing.Xu
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
Huabing.Xu
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
Huabing.Xu
e2a24dec84
replace Point with Vector2
2014-04-15 18:08:29 +08:00
Huabing.Xu
917ae6e88b
deprecate Point, using Vector2 instead
2014-04-15 17:46:44 +08:00
Huabing.Xu
5303f50904
Migrate to Vector2 in DrawPrimitive.h
2014-04-15 17:29:23 +08:00