Dale Stammen
32a5a2cbb8
Merge branch 'v3' into wp8-shader-fix
2014-10-28 22:08:04 -07:00
Dale Stammen
145156d698
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:56:49 -07:00
Dale Stammen
6d46ee8f3d
fixed location of renderer filter
2014-10-27 11:09:27 -07:00
Dale Stammen
b483162128
added ignore warning 4756
2014-10-27 11:07:27 -07:00
minggo
23f922420a
Merge pull request #8919 from ahlwong/v3
...
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
2014-10-27 11:48:50 +08:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
Ahlwong
dfcdf10898
Fix Label Additional Kerning All Strings
2014-10-24 08:57:37 -07:00
Dale Stammen
40e49cdc12
Merge branch 'v3' into wp8.1-universal
2014-10-24 07:08:55 -07:00
Ahlwong
012683bf6e
Fix kerning on signle characters
2014-10-23 21:18:51 -07:00
James Chen
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
Dale Stammen
b6329c6c7b
added correct options to compile c file
2014-10-23 13:27:24 -07:00
Dale Stammen
b520e80e04
updated 2d and base file locations
2014-10-23 09:03:35 -07:00
Dale Stammen
a4f13a91ab
added CC_NO_GL_POINTSIZE preprocessor define
2014-10-23 07:36:23 -07:00
Dale Stammen
89d3d7b7cf
added missing cocos2d files
2014-10-23 07:29:57 -07:00
Dale Stammen
753bc5034a
removed winrt/wp8 code. no longer needed
2014-10-23 06:59:09 -07:00
Mircea Rila
3d276db6d2
fix some warnings / remove TABs
2014-10-23 12:54:15 +03:00
Dhilan007
20d372b356
Fixed Label shifting when outline feature enabled
2014-10-22 14:34:01 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
Dhilan007
0bb02fb34f
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 10:41:01 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
Dhilan007
4586954e0a
fixed miss sqlite3 for release build on window.
2014-10-17 11:39:06 +08:00
Dale Stammen
d5b0830c3b
added missing files
2014-10-16 11:15:39 -07:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# 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-10-16 10:59:58 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
minggo
68d58b05e9
Merge pull request #8700 from iSevenDays/v3
...
CMake fix for Mac Os X
2014-10-15 21:24:18 +08:00
SunLightJuly
74952d7258
added CCClippingRectangleNode.cpp to CMakeList
2014-10-15 14:17:04 +08:00
SunLightJuly
3352fb7bf3
reset wp8 project files
2014-10-15 14:14:02 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00
Dale Stammen
4bed458371
added missing protobuf-lite files
2014-10-14 17:41:40 -07:00
Dale Stammen
180fa4c324
added new cocos2d wp8 dll project files
2014-10-14 14:28:06 -07:00
Dale Stammen
9ef5f3a48f
added wp8 and winrt property sheets
2014-10-14 14:27:29 -07:00
Dale Stammen
8983a57869
added Windows 8.1 universal app project files
2014-10-14 14:25:01 -07:00
Dale Stammen
eb74b642da
added Windows 8.1 universal app project files
2014-10-14 14:23:39 -07:00
Anton Sokolchenko
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
Dale Stammen
ec5af7ae90
added missing CC_USE_PHYSICS
2014-10-14 14:12:27 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
pipu
a8febf9656
1. update wp8 projects.
2014-10-13 15:31:29 +08:00
pipu
72f5808678
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-13 14:48:10 +08:00
minggo
0351000c97
Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap
...
V3 add staggered tile map
2014-10-13 13:50:50 +08:00
pipu
93a7e22eb6
Modifying libcocos2d.vcxproj.filters
2014-10-12 18:55:43 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
pipu
779e73dad0
1. change config.h in win32.
2014-10-12 15:27:41 +08:00
pipu
10e390557e
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-12 15:07:37 +08:00
minggo
b144eb345a
Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug
...
fix DrawNode's memory leak -- delete vaos those are generated and forget...
2014-10-11 17:31:17 +08:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
Huabing.Xu
7747e2ecf5
Merge branch 'v3' into v3_addStaggeredTileMap
2014-10-11 15:15:12 +08:00
Huabing.Xu
27f48b0011
add implementation for staggered tmx map
2014-10-11 14:22:31 +08:00
pipu
583a756d33
Reverting build/cocos2d-win32.vc2012.sln
...
Reverting cocos/2d/libcocos2d.vcxproj
2014-10-11 14:13:56 +08:00
huangshiwu
184d9356b8
fix DrawNode's memory leak -- delete vaos those are generated and forget to release
2014-10-11 12:00:14 +08:00
SunLightJuly
a36dbf5362
ClippingRegionNode --> ClippingRectangleNode
2014-10-11 11:49:01 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
pipu
efe22a0dd7
Modifying protocol buffers for win32 version
2014-10-10 21:55:59 +08:00
SunLightJuly
ba064167a8
modified project files and make files
2014-10-10 18:43:40 +08:00
Huabing.Xu
766c9469d4
add staggered wrapper(using ortho for its implementation now)
2014-10-10 17:52:13 +08:00
Dhilan007
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
minggo
4b7d5694b8
Merge pull request #8573 from Dhilan007/v3-labelatlas
...
fix #8569 : LabelAtlas opacity do not change when setting parent node's opacity
2014-10-10 15:52:50 +08:00
andyque
d5fe0758ed
fix cocostudio include path
2014-10-10 13:48:49 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
minggo
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
minggo
b8c5ce6db3
Merge pull request #8588 from Dhilan007/v3-label8582
...
fixed issue#8582: opacity of label
2014-10-09 15:50:44 +08:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
Dhilan007
462e38cbc6
fixed opacity of label
2014-10-09 10:54:35 +08:00
SunLightJuly
1062dec335
modified project files and make files
2014-10-08 18:44:58 +08:00
Dhilan007
6f50143e0a
Fixed LabelAtlas opacity do not change when setting parent node's opacity
2014-10-08 18:28:24 +08:00
Dhilan007
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
minggo
8aa03e107f
Merge pull request #8209 from boyu0/fix_physics_crash
...
fix bug: physics crashes when remove/add children too quick.
2014-10-08 13:48:03 +08:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Ricardo Quesada
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
Ricardo Quesada
12e9d18ab7
Compiles on Windows Phone 8
2014-10-01 19:08:34 -07:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
Dhilan007
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
boyu0
2b0afa6063
fix bug: physics crashes when remove/add children too quick.
2014-09-30 08:15:46 +08:00
SunLightJuly
fbbc90431e
standardized codes
2014-09-29 15:42:56 +08:00
SunLightJuly
e0b9878e58
added ClippingRegionNode
2014-09-29 15:07:05 +08:00
minggo
6583bf6b1f
Merge pull request #8179 from MSOpenTech/wp8-v3-fix
...
WP8 fixes for v3.3 app certification tests
2014-09-29 13:42:40 +08:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
Dhilan007
d52144d1e0
fix linker errors on WIN32
2014-09-28 21:45:09 +08:00
songchengjiang
39deb73c3a
move light from 3d to base(Windows)
2014-09-28 17:23:25 +08:00
minggo
289c1edfe7
Merge pull request #8174 from lite3/v3
...
fix compile error when CC_SPRITE_DEBUG_DRAW
2014-09-28 16:21:04 +08:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
Dale Stammen
3c7a22f776
removed CMakeLists.txt
2014-09-26 12:42:20 -07:00
Dale Stammen
fd3177d350
removed WINRT
2014-09-26 11:41:12 -07:00
Dale Stammen
209f67f222
fixed property sheet
2014-09-26 11:01:43 -07:00
Dale Stammen
f24312bc77
added UNICODE
2014-09-26 11:01:05 -07:00
lite3
da361810a3
fix compile error when CC_SPRITE_DEBUG_DRAW
2014-09-26 17:14:55 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
6626655308
move render logic from Director to scene
2014-09-26 09:36:43 +08:00
minggo
9509f4cf9a
Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix
...
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
2014-09-25 14:44:28 +08:00
minggo
9510d6d946
Merge pull request #8136 from andyque/moveWinEditBox
...
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-25 13:38:19 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
toma
d1faf75b58
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
2014-09-25 01:46:17 +09:00
andyque
3c434ec354
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-24 17:47:38 +08:00
cpascal
a70f51b1e3
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
...
I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32.
--
In the CCPlatformConfig.h,
the definitions are..
// win32
#if defined(WIN32) && defined(_WINDOWS)
#undef
CC_TARGET_PLATFORM
#define CC_TARGET_PLATFORM
CC_PLATFORM_WIN32
#endif
2014-09-23 17:35:57 +09:00
Dmitry Bushtets
d242d79443
* added default value for _batchNode in CCSprite
2014-09-22 19:00:21 +03:00
minggo
e8b20d8583
Merge pull request #8093 from wohaaitinciu/v3_WebView_win32
...
web view win32
2014-09-22 09:30:29 +08:00
Jeff
2ffbe23c50
The files name: modify underline to hyphen
2014-09-19 10:24:17 +08:00
Jeff
e4e2cea97a
link error
2014-09-18 19:59:22 +08:00
Jeff
476ede6ccb
link error
2014-09-18 19:56:53 +08:00
songchengjiang
3c67515378
Finished light reconstruction
2014-09-18 16:38:35 +08:00
Huabing.Xu
cf4d0faad3
optimise update of particle system for free mode
2014-09-18 15:24:27 +08:00
minggo
442f30af1f
Merge pull request #8091 from dabingnn/v3_PageTurnZFighting
...
new version of avoid z fighting in pageTurn
2014-09-18 10:50:31 +08:00
Jeff
1dffbd0a7b
fix link errors
2014-09-18 01:52:08 +08:00
yangxiao
8c77130ae0
refactor light compile
2014-09-17 18:58:35 +08:00
Huabing.Xu
3a0e9be97e
new version of avoid z fighting in pageTurn
2014-09-17 18:33:18 +08:00
minggo
ccbf694927
Merge pull request #8086 from huangshiwu/v3_test
...
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
2014-09-17 14:50:42 +08:00
yangxiao
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
huangshiwu
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
minggo
38810eeb2e
Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices
...
change indices to short for fast tmx
2014-09-17 11:31:58 +08:00
Huabing.Xu
725d107ae5
change indices to short for fast tmx
2014-09-17 11:06:15 +08:00
huangshiwu
3907e5c1a2
fix ClippingNode's memory leak bug
2014-09-16 14:50:00 +08:00
huangshiwu
d0d3e185ce
fix wp8 and winrt compile error --add chipmunk static lib
2014-09-16 10:03:00 +08:00
joewan
93fdcf1f04
fix memory leak when use menu_selector.
2014-09-14 21:41:19 +08:00
minggo
0f42d9bbd8
Merge pull request #8022 from Dhilan007/v3-labelfix
...
Label:It may display incorrectly with outline feature enabled.
2014-09-12 17:54:02 +08:00
Dhilan007
23f1b740bf
Label:It may display incorrectly with outline feature enabled.
2014-09-12 16:03:01 +08:00
huangshiwu
0addaf3912
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
2014-09-12 15:38:29 +08:00
huangshiwu
f1f6373b6e
fix Cocos2dShaderCompile's compile error --use chipmunk static library
2014-09-12 15:29:10 +08:00
minggo
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
huangshiwu
11d8829b3a
Deprecate DrawPrimitives and enhance DrawNode --little modify
2014-09-12 14:50:41 +08:00
huangshiwu
6182a872c6
Deprecate DrawPrimitives and enhance DrawNode --more modify
2014-09-12 11:12:20 +08:00
huangshiwu
147bb7301b
fix wp8 compile error --add BillBoard and BillBoardTest
2014-09-12 09:33:30 +08:00
huangshiwu
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
huangshiwu
8d8f4436db
Deprecate DrawPrimitives and enhance DrawNode --fix android compile error
2014-09-11 17:55:47 +08:00
huangshiwu
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
yangxiao
9901cad113
merge cocos
2014-09-11 15:55:00 +08:00
andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
andyque
1945c4f31e
fix compile error
2014-09-11 14:45:55 +08:00
yangxiao
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
yangxiao
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
andyque
acae8a2535
Merge branch 'v3' into addChipmunkStaticLib
...
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
2014-09-10 10:00:15 +08:00
Ricardo Quesada
d5a6289a9b
compiles on wp8
2014-09-09 18:22:11 -07:00
Ricardo Quesada
6b4323642a
compiles on winphone8
2014-09-09 18:15:16 -07:00
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
yangxiao
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
andyque
6a4397a3eb
change toolset from 12.0 to 4.0
2014-09-09 15:57:21 +08:00
minggo
905c429ff5
remove unneeded code
2014-09-09 10:58:07 +08:00
minggo
31c508ef6d
deprecated Node::_setZOrder()
2014-09-09 10:55:27 +08:00
minggo
6b99ce6ec0
Merge pull request #7939 from minggo/remove-_setLocalZOrder
...
remove Node::_setLocalZOrder()
2014-09-09 10:49:09 +08:00
andyque
d6b96d1e46
add chipmunk to wp project
2014-09-06 13:28:00 +08:00
andyque
2a8601ee1f
Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib
2014-09-05 15:43:59 +08:00
huangshiwu
01358f0b62
fix wp8 compile error and modify default resource path
2014-09-05 15:43:08 +08:00
andyque
08c7f32627
add chipmunk static library for win32
2014-09-05 15:38:12 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
minggo
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
Huabing.Xu
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
andyque
3451672365
restore some configs
2014-09-04 10:49:45 +08:00
Ricardo Quesada
047025696c
Merge pull request #7680 from andyque/fixNormalizedPosition
...
fix normalizedPosition bug
2014-09-03 10:07:22 -07:00
andyque
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
minggo
5cca8cc87d
remove Node::_setLocalZOrder()
2014-09-03 17:26:50 +08:00
yangxiao
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
andyque
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
minggo
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
minggo
9351caaa58
Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer
...
fix transition scene stencil buffer
2014-09-03 10:26:28 +08:00
andyque
fab9a0052b
fix normalizedPosition bug
2014-09-03 09:16:31 +08:00
andyque
dafbf28283
fix release mode compile error
2014-09-02 16:42:23 +08:00
andyque
fadfa87afd
fix vs2013 compile error
2014-09-02 16:42:04 +08:00
andyque
dffdef1118
fix transition scene stencil buffer
2014-09-02 11:21:11 +08:00
andyque
6dc45f86e4
fix windows compile error
2014-09-02 10:05:22 +08:00
Huabing.Xu
6824453804
windows work for trianglesCommand
2014-09-01 15:08:09 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
songchengjiang
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
minggo
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
minggo
afaea360fd
Merge pull request #7908 from dabingnn/v3_fix_bugs
...
V3 fix bugs
2014-08-29 16:45:52 +08:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
minggo
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
songchengjiang
43eb725c27
resolve conflict
2014-08-29 11:02:34 +08:00
songchengjiang
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
minggo
a125ed0453
Merge pull request #7906 from Teivaz/v3_WP8
...
[WP8] Fixed project compilation.
2014-08-29 10:03:25 +08:00
Huabing.Xu
7c870cfcc1
fix skew matrix bug
2014-08-29 09:50:26 +08:00
Ricardo Quesada
20d22a1c8a
Users new `// MARK: ` feature to mark sections
...
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
2014-08-28 14:56:15 -07:00
teivaz
1d08acac08
* [WP8] Fixed project compilation. Removed references to deleted source files
2014-08-28 13:47:14 +03:00
minggo
50a2cb2b86
remove unneeded includes
2014-08-28 17:32:23 +08:00
minggo
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
681c3c06f1
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
...
stopAllActionsByTag && removeAllActionsByTag
2014-08-28 14:24:37 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
yangxiao
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
minggo
17ab047b7d
fix compiling error on windows
2014-08-27 15:13:41 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
minggo
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
minggo
ac029c3d0d
Merge pull request #7887 from super626/v3
...
2d cull only for default camera
2014-08-27 13:39:13 +08:00
yangxiao
26f7345693
2d cull only for default camera
2014-08-27 12:09:23 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
yangxiao
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
yangxiao
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
samuele3hu
07cf4d3526
Fix the win32 and android compile error
2014-08-25 14:10:13 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
zii
e8a5fc9fef
Update CCActionManager.cpp
2014-08-23 17:06:46 +08:00
zii
4763531085
Update CCActionManager.cpp
2014-08-23 17:03:26 +08:00
minggo
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
samuele3hu
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
yangxiao
7818b28ee3
Merge branch 'newcode' into v3
2014-08-22 13:32:57 +08:00
andyque
84cf0ee834
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 11:49:39 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
pandamicro
909dd0d397
Update #3897 : Refactor missed protected constructors
2014-08-21 15:11:33 +08:00
teivaz
aecdb832a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-08-21 13:48:05 +03:00
teivaz
a70688dc96
+ [WINRT] Inserted newly added files to cocos WIN RT project
2014-08-21 13:47:53 +03:00
yangxiao
c26a81bb55
Merge branch 'newcode' into v3
2014-08-21 09:53:06 +08:00
yangxiao
fcf4d79b06
setGLProgramState support
2014-08-20 19:01:04 +08:00
minggo
bbf5c56e83
Merge pull request #7827 from andyque/ccRandom
...
add c++11 random library support
2014-08-20 13:35:12 +08:00
andyque
34629f1014
fix windows & win8 & wp8 compile error
2014-08-20 12:02:12 +08:00
Sergey
055a143f9d
Label performance problem
2014-08-19 15:02:09 +04:00
teivaz
db805ee2c8
* Fixed WP8 cocos library project
...
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
minggo
22fa650bbf
Merge pull request #7807 from samuele3hu/v3_3_3d_module
...
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
2014-08-18 22:38:58 +08:00
samuele3hu
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
songchengjiang
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
Dmitry Bushtets
1257f642c7
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
2014-08-15 13:20:37 +03:00
songmiao
08a4ebba06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
songmiao
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
songchengjiang
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
minggo
aa052eb1c1
add CCModuleManager into vs project
2014-08-15 14:39:15 +08:00
songchengjiang
7ed40a8051
Added Light
2014-08-15 10:32:07 +08:00
teivaz
90e5870499
* Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project)
2014-08-14 15:35:36 +03:00
teivaz
885fd16b9e
* Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project)
2014-08-14 15:20:48 +03:00
teivaz
e9563696db
* Fixed WP8 compilation errors (added path to CCGLView.h)
...
- Modified filters for CCCamera.h/cpp
2014-08-14 15:14:25 +03:00
yangxiao
a508477eda
remove unused code
2014-08-14 19:07:40 +08:00
yangxiao
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00