XiaoYang
9f444b7010
Merge pull request #104 from liuliang2004/Meshv3
...
Modification is compatible with the old model
2014-08-19 14:32:05 +08:00
liuliang
9d3bab3810
Modification is compatible with the old model
2014-08-19 14:03:41 +08:00
songchengjiang
680f089ae1
Shader: Light struct modification
2014-08-19 13:54:30 +08:00
yangxiao
5cf30a363c
remove unused code
2014-08-19 13:54:06 +08:00
yangxiao
289b04a2ae
merge cocos2d
2014-08-19 13:19:42 +08:00
yangxiao
b2d43a4167
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-19 11:56:21 +08:00
yangxiao
f2729c7ef2
cache work
2014-08-19 11:56:09 +08:00
xiangxw
bef6a2a7f1
fix sendPrompt()
...
a extra '\0' will be sent when sizeof() is used
2014-08-19 11:46:30 +08:00
minggo
dd1bc70cde
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
...
bug on began touch - prevpoint
2014-08-19 09:49:01 +08:00
teivaz
db805ee2c8
* Fixed WP8 cocos library project
...
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
CocosRobot
4236e89245
[AUTO]: updating luabinding automatically
2014-08-18 15:26:32 +00:00
minggo
38fdef614a
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
...
add swallow touch and propagation to parent widgets customization
2014-08-18 23:16:22 +08:00
CocosRobot
85d505b427
[AUTO]: updating luabinding automatically
2014-08-18 14:47:35 +00: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
lvlong
43bc54b134
delete empty line
2014-08-18 20:28:59 +08:00
lvlong
2b70cf3dd8
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 20:22:56 +08:00
lvlong
9c25139895
animation & animations
2014-08-18 20:22:18 +08:00
yangxiao
d5df1f3ab2
forget return true
2014-08-18 18:56:01 +08:00
yangxiao
d6ed1af1f7
compute submesh aabb error
2014-08-18 18:34:18 +08:00
minggo
2f2ee43b21
Merge pull request #7808 from 2youyouo2/v3
...
fixed ArmatureAnimation::setSpeedScale
2014-08-18 18:19:23 +08:00
songchengjiang
9603366fcb
Fixed Android compiled Problem
2014-08-18 18:05:13 +08:00
lvlong
da26fa3ca5
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 18:04:44 +08:00
lvlong
7311d5139b
add VERTEX_ATTRIB_TEX_COORD1
2014-08-18 18:02:58 +08:00
yangxiao
b9c28dd8d7
return true
2014-08-18 17:57:14 +08:00
yangxiao
2f600f8af4
fix bundle mac
2014-08-18 17:52:27 +08:00
liuliang
ee4e4ca455
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-18 17:39:28 +08:00
liuliang
e151b207a4
Modified binary load model, compatible with the old format
2014-08-18 17:31:04 +08:00
songchengjiang
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
yangxiao
01c1691a4f
deal aabb
2014-08-18 17:02:13 +08:00
minggo
e2829cd68a
Merge pull request #7802 from SmartCat/v3
...
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
2014-08-18 16:56:15 +08:00
kaile.yin
6abaf27b14
fixed ArmatureAnimation::setSpeedScale
2014-08-18 16:19:54 +08:00
samuele3hu
91fd40dd3a
Add a newline for some files
2014-08-18 15:27:54 +08:00
samuele3hu
2d8ae3a917
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
2014-08-18 15:08:04 +08:00
samuele3hu
e0168c373c
Add manual lua bindings for 3d and adjust related test case on different platform
2014-08-18 15:04:32 +08:00
samuele3hu
7596a8a831
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-18 14:58:57 +08:00
yangxiao
30ce92f677
obj work, make code clean
2014-08-18 14:16:34 +08:00
yangxiao
219404bd7d
change tex param
2014-08-18 11:42:41 +08:00
yangxiao
cd4da73beb
merge, obj not work now
2014-08-18 11:28:57 +08:00
yangxiao
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
liuliang
2f816aea2c
Modified load static model
2014-08-18 10:32:23 +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
yangxiao
1e961e00b7
obj loader work
2014-08-17 22:49:53 +08:00
songchengjiang
9b3a02f350
Added Light Test
...
Added Point Light
2014-08-17 21:33:33 +08:00
lvlong
da63032a46
draw sub mesh bug
2014-08-16 20:38:00 +08:00
lvlong
b1c9fb99e3
animation is ok.
2014-08-16 19:51:59 +08:00
lvlong
9c41b1a826
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 18:20:29 +08:00
lvlong
4f4b8dc25c
for testing
2014-08-16 18:19:41 +08:00
yangxiao
fb1b7ca3bb
fix skeleton
2014-08-16 18:18:15 +08:00
lvlong
24bb827ef4
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 16:58:02 +08:00
yangxiao
7159914248
old model work
2014-08-16 16:56:04 +08:00
lvlong
4dd9102e87
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 15:45:28 +08:00
lvlong
5b59b8a987
fixed some loading problems.
2014-08-16 15:40:00 +08:00
yangxiao
a11ac316bf
create model
2014-08-16 14:52:44 +08:00
yangxiao
8a5bbabe21
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:49:47 +08:00
yangxiao
47d15a4aa1
load
2014-08-16 14:49:38 +08:00
lvlong
84dcff2f7a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-16 14:44:41 +08:00
lvlong
d60a7734b1
merge bundle.
2014-08-16 14:28:15 +08:00
yangxiao
ae361c91cd
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:16:27 +08:00
yangxiao
ef2db59825
modify render
2014-08-16 14:16:17 +08:00
liuliang
ae79603791
Modify the material parsing
2014-08-16 14:14:37 +08:00
lvlong
f8f416cd3c
merge bundle
2014-08-16 11:12:26 +08:00
liuliang
21dcc51c0f
Modify the material parsing
2014-08-16 10:41:42 +08:00
liuliang
1b92409d78
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-16 09:59:25 +08:00
liuliang
f35dd346eb
Modify Analytic
2014-08-16 09:59:08 +08:00
yangxiao
3ab7c6b952
create from bundle data
2014-08-15 20:52:45 +08:00
songchengjiang
def3f8220b
Fixed GLProgram
2014-08-15 19:24:06 +08:00
songchengjiang
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
liuliang
b4a20feabc
Parse the data file
2014-08-15 18:27:28 +08:00
yangxiao
9ab48bd71e
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 18:27:03 +08:00
yangxiao
a740841f5e
submeshid
2014-08-15 18:21:58 +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
liuliang
0db924d7cd
Parse the data file
2014-08-15 18:20:37 +08:00
liuliang
c533f66b9f
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-15 17:46:40 +08:00
liuliang
b5665a4723
Modify the binary parsing
2014-08-15 17:46:21 +08:00
liuliang
ab80c5026d
Modify the binary parsing
2014-08-15 17:45:37 +08:00
yangxiao
d09695b118
create from data
2014-08-15 17:41:04 +08:00
yangxiao
6f0fc48e8e
merge cocos2d
2014-08-15 16:36:17 +08:00
yangxiao
e2312bd353
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 15:55:32 +08:00
yangxiao
42916bcbe6
newmodel
2014-08-15 15:55:21 +08:00
CocosRobot
bdfc48b127
[AUTO]: updating luabinding automatically
2014-08-15 07:44:57 +00:00
liuliang
4c8b24d113
Modify the binary parsing
2014-08-15 15:32:15 +08:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
andyque
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
andyque
cf8e40f8ce
deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead
2014-08-15 15:26:19 +08:00
minggo
b842c57954
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
...
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
CocosRobot
24f0e8aada
[AUTO]: updating luabinding automatically
2014-08-15 07:23:17 +00:00
minggo
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
minggo
e59283343a
Merge pull request #7751 from zawasp/win32_minimize
...
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
yangxiao
88bb1482e3
newmodel
2014-08-15 14:58:30 +08:00
minggo
11b4793d75
Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
...
fix android background and foreground crash for primitive
2014-08-15 14:56:49 +08:00
songchengjiang
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
minggo
408472625c
add CCModuleManager into CMakeLists.txt
2014-08-15 14:46:21 +08:00
minggo
aa052eb1c1
add CCModuleManager into vs project
2014-08-15 14:39:15 +08:00
minggo
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
Huabing.Xu
5e7b75c5c7
fix android background and foreground crash for primitive
2014-08-15 14:05:17 +08:00
minggo
bcbb589cfb
Merge pull request #7784 from Teivaz/v3
...
Fixed WP8 compilation errors
2014-08-15 13:39:05 +08:00
minggo
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
yangxiao
fdcec51cf4
struct for newmodel
2014-08-15 13:03:53 +08:00
minggo
db17084b6d
fix warnings
2014-08-15 12:06:16 +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
minggo
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
minggo
1643c29a00
Merge pull request #7782 from liang8305/v3
...
mLastTickInNanoSeconds is the renderStart
2014-08-14 18:11:41 +08:00
yangxiao
84bb22780a
merge cocos2d
2014-08-14 17:16:20 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
胖梁
3619fb943a
mLastTickInNanoSeconds is the renderStart
...
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;
so:
no need nanoTime() twice
2014-08-14 17:07:04 +08:00
andyque
e8a5147b92
copy new added widget property to clone method
2014-08-14 16:56:15 +08:00
Mircea Rila
d9a0c6a2ad
replace tabs with spaces
2014-08-14 10:48:09 +03:00
andyque
e27a2aee91
fix typo
2014-08-14 14:36:30 +08:00
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
lvlong
dbf58b8873
modify function name and add default to switch block.
2014-08-14 13:15:37 +08:00
andyque
18851d3e81
add customization to UIButton and UIPageView
2014-08-14 11:14:24 +08:00
samuele3hu
85ad4241a0
Modify Xcode project setting
2014-08-14 11:10:52 +08:00
minggo
888da8eee8
Merge pull request #7776 from CocosRobot/update_lua_bindings_1407982527
...
[AUTO]: updating luabinding automatically
2014-08-14 10:38:21 +08:00
yangxiao
f6da3b76b5
use renderer passed instead of get from global
2014-08-14 10:29:17 +08:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
CocosRobot
6467dcaa57
[AUTO]: updating luabinding automatically
2014-08-14 02:17:25 +00:00
minggo
f9e6dab507
Merge pull request #7770 from Dhilan007/v3-label-issue
...
close issue#5734:Label:The letters sometimes slightly cut.
2014-08-14 10:04:00 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
minggo
e468beea86
Merge pull request #7760 from dabingnn/v3_addCallBackForRenderTexture
...
add comment for the limit of RenderTextue::saveToFile
2014-08-14 09:43:54 +08:00
minggo
a6c75c0eb6
Merge pull request #7767 from super626/v3_merge2
...
reset camera position in initDefault, Fix some tile map can not show bug
2014-08-14 09:43:40 +08:00
minggo
d76724b6aa
Merge pull request #7773 from CocosRobot/update_lua_bindings_1407980273
...
[AUTO]: updating luabinding automatically
2014-08-14 09:43:08 +08:00
CocosRobot
7a99220aad
[AUTO]: updating luabinding automatically
2014-08-14 01:39:44 +00:00
minggo
0b86e129b0
Merge pull request #7762 from andyque/addAlignmentToUILabel
...
add UITextField color & place hold color, fix double delete bug
2014-08-14 09:38:57 +08:00
minggo
f1ae73bf30
Merge pull request #7766 from samuele3hu/v3_3_fix
...
Add release_print lua binding
2014-08-14 09:35:16 +08:00
minggo
91d5f69584
Merge pull request #7768 from andyque/addDisableStateToControl
...
add missing safe guard in checkbox callback
2014-08-14 09:34:55 +08:00
minggo
234f100187
Merge pull request #7769 from super626/mirrortest
...
add mirror test
2014-08-14 09:31:57 +08:00
minggo
7d2ca95988
Merge pull request #7749 from zawasp/virtual_pause_resume
...
virtual Node::pause() / Node::resume()
2014-08-14 09:31:10 +08:00
yangxiao
7bfd636b16
reset default camera rotation
2014-08-14 09:06:06 +08:00
samuele3hu
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
Dhilan007
ff147b6cf8
close issue#5734:Label:The letters sometimes slightly cut.
2014-08-13 18:40:35 +08:00
yangxiao
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
andyque
3ee6a9ab10
add missing safe guard in checkbox callback
2014-08-13 17:15:15 +08:00
yangxiao
b4ec344bcf
reset camera position in initDefault
2014-08-13 15:57:22 +08:00
CocosRobot
df7c0ae1cb
[AUTO]: updating luabinding automatically
2014-08-13 06:42:14 +00:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
andyque
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
samuele3hu
5b1ceb5e5d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_fix
2014-08-13 10:31:12 +08:00
samuele3hu
8ab7647b54
Add release_print lua bindings
2014-08-13 10:27:06 +08:00
Huabing.Xu
5b99ee71c1
add comment for the limit of RenderTextue::saveToFile
2014-08-13 10:14:26 +08:00
minggo
d223629477
Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
...
add callback for RenderTexture::saveToFile
2014-08-13 10:05:08 +08:00
minggo
9ae20d1bd3
Merge pull request #7740 from GavinThornton/v3
...
Update CCEventTouch.h
2014-08-13 09:39:17 +08:00
Mircea Rila
cfafeb1e87
add minimize / restore for win32
2014-08-12 22:22:47 +03:00
Mircea Rila
0154f7a94a
virtual Node::pause() / Node::resume()
2014-08-12 21:05:09 +03:00
yangxiao
5ce9afbd69
create default camera at Scene constructor
2014-08-12 23:34:06 +08:00
yangxiao
46e59f1150
Merge branch 'newcode' into v3_merge
2014-08-12 17:34:58 +08:00
gin0606
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
minggo
46cdd6f8dd
Merge pull request #7701 from dabingnn/v3_renderPrimitive
...
V3 render primitive
2014-08-12 16:11:40 +08:00
GavinThornton
1d0deb0bc1
Update CCEventTouch.h
...
MAX_TOUCHES=5 is less than most touch devices, iPad/Android tablets can almost all handle all 10-11 touches. Perhaps a value of 15 would be better?
Note: There is a #define IOS_MAX_TOUCHES_COUNT 10 in CCEAGLView.mm already for this, but multitouch fails on touch 5 in "void GLViewProtocol::handleTouchesBegin" at the code:-
// The touches is more than MAX_TOUCHES ?
if (unusedIndex == -1) {
CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex);
continue;
}
2014-08-12 01:02:06 -07:00
minggo
cc37780861
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
...
V3 add skinned outline
2014-08-12 15:07:21 +08:00
yangxiao
32645c1622
fix default camera, add listener for projection change
2014-08-12 14:42:08 +08:00
Huabing.Xu
cb8c80de0d
export MeshSkin as CC_DLL
2014-08-12 14:41:25 +08:00
lvlong
f191bebe72
optimize Sprite3D get aabb.
2014-08-12 13:45:06 +08:00
minggo
d80d7ed714
Merge pull request #7037 from boyu0/feature5537_physics_step
...
closed #5537 : add setAutoStep, isAutoStep and step method for PhysicsWorld
2014-08-12 13:37:29 +08:00
Huabing.Xu
6cf2e7d091
add CC_DLL for primitive classes
2014-08-12 11:56:21 +08:00
Huabing.Xu
1145859d38
remove commented codes
2014-08-12 11:44:06 +08:00
gin0606
89cf0c1e8c
fix getEngine
2014-08-12 12:01:27 +09:00
Huabing.Xu
3a7b673164
add callback for RenderTexture::saveToFile
2014-08-12 10:50:57 +08:00
boyu0
790ef9e818
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
...
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
2014-08-12 10:20:34 +08:00
CocosRobot
cbbe7b9c60
[AUTO]: updating luabinding automatically
2014-08-12 02:08:16 +00:00
minggo
bed1ccf0f3
Merge pull request #7733 from huangshiwu/v3_glviewfix
...
CCGLView modefy
2014-08-12 09:51:27 +08:00
minggo
e3723d8398
Merge pull request #7734 from 2youyouo2/v3
...
fixed bone rotation isn't right
2014-08-12 09:51:12 +08:00
minggo
ba092ede25
Merge pull request #7732 from andyque/addDLLExportToLayoutParameter
...
add virtual destructor
2014-08-12 09:49:29 +08:00
kaile.yin
358b1f6736
fixed bone rotation isn't right
2014-08-11 19:53:51 +08:00
huangshiwu
77bc3a0e60
GLView modefy additional
2014-08-11 16:55:23 +08:00
minggo
e0ef4d16d3
Merge pull request #7724 from cpascal/fix_ime
...
Fix a correct onGLFWCharCallback
2014-08-11 16:18:59 +08:00
minggo
ec1864cb7a
Merge pull request #7731 from dabingnn/v3_add_CC_DLL_For_cocos2dVersion
...
add missed CC_DLL for cocos2dVersion function
2014-08-11 16:18:31 +08:00
huangshiwu
1177b0d545
CCGLView modefy
2014-08-11 16:15:02 +08:00
andyque
3e1f7119f9
add virtual destructor
2014-08-11 15:54:40 +08:00
Huabing.Xu
5086758063
add missed CC_DLL for cocos2dVersion function
2014-08-11 15:50:48 +08:00
minggo
b34e97cfd6
Merge pull request #7729 from andyque/fixCascadedColor
...
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:33:36 +08:00
andyque
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
minggo
43a3603a8b
Merge pull request #7720 from samuele3hu/v3_module
...
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
2014-08-11 15:01:28 +08:00
minggo
3704800fa5
Merge pull request #7728 from super626/v3_merge
...
Fix Camera
2014-08-11 14:59:31 +08:00
Huabing.Xu
c1a71453d5
Merge branch 'v3_renderPrimitive' into v3
2014-08-11 14:39:16 +08:00
Huabing.Xu
031efaf242
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
2014-08-11 14:37:43 +08:00
Huabing.Xu
6aff707eab
windows work now for renderPrimitive
2014-08-11 14:18:07 +08:00
yangxiao
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +08:00
samuele3hu
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
Huabing.Xu
2a28744dc5
Merge branch 'v3' into v3_renderPrimitive
2014-08-11 12:48:23 +08:00
yangxiao
6d15c26a61
move create default camera to Scene::initWithSize
2014-08-11 10:55:14 +08:00
lvlong
c592ac4248
for pull request modify!!
2014-08-11 10:40:34 +08:00
minggo
0f942d3417
Merge pull request #7719 from boyu0/physics_bitmask_fix
...
fix PhysicsBody bitmask bug.
2014-08-11 10:35:06 +08:00
samuele3hu
47c034af5d
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
2014-08-11 10:25:40 +08:00
yangxiao
2576622778
move create camera to Scene::initWithSize
2014-08-11 10:07:23 +08:00
minggo
437257e7e6
Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity
...
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-11 09:37:51 +08:00
CocosRobot
3d222ab73a
[AUTO]: updating luabinding automatically
2014-08-11 01:31:04 +00:00
cpascal
5e1570e36e
Fix a correct onGLFWCharCallback
2014-08-10 01:42:21 +09:00
jimmystar
63c9780c49
Update CCScene.cpp
...
in line 157, here need to create and add camera, if not ,in the function createWithPhysics, will show black screen.
2014-08-09 17:37:18 +08:00
yangxiao
53c143c679
remove normalize
2014-08-09 00:02:40 +08:00
yangxiao
73a0b7701d
remove normalize
2014-08-09 00:02:19 +08:00
lvlong
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
samuele3hu
2dacbf6f26
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-08 16:59:33 +08:00
bo yu
517b26e343
fix typo
2014-08-08 16:56:48 +08:00
boyu0
ee3a8da13c
fix PhysicsBody bitmask bug.
2014-08-08 16:38:20 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00