Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
Nite Luo
|
3194da4e7d
|
Merge pull request #10720 from darkdukey/hide_cursor
Hide cursor
|
2015-03-13 10:48:15 -07:00 |
SunLightJuly
|
6871e30b8d
|
define __G__TRACKBACK__ in cocos.init
|
2015-03-13 16:39:36 +08:00 |
CocosRobot
|
2f0eb6712d
|
[AUTO]: updating luabinding automatically
|
2015-03-13 07:15:34 +00:00 |
Huabing.Xu
|
639ed335b3
|
Merge pull request #10839 from pipu/node_load_callback
To add the function node load callback called during create node from csb file.
|
2015-03-13 15:06:14 +08:00 |
Huabing.Xu
|
03c3a4d5ed
|
Merge pull request #10836 from pipu/reconstruct_object_extension_data
To reconstruct object extension data.
|
2015-03-13 15:04:41 +08:00 |
CocosRobot
|
fa2fe74986
|
[AUTO]: updating luabinding automatically
|
2015-03-13 06:19:29 +00:00 |
Huabing.Xu
|
1fa9145a56
|
Merge pull request #10832 from super626/v3
fix bugs
|
2015-03-13 14:13:24 +08:00 |
Huabing.Xu
|
c3aea9f6c0
|
update version string and releaseNotes for 3.5
|
2015-03-13 11:51:32 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
pipu
|
56c3d1c6f6
|
To add the function node load callback called during create node from csb file.
|
2015-03-12 17:36:39 +08:00 |
pipu
|
7515fc78f5
|
To set csd version for serializing.
|
2015-03-12 16:15:17 +08:00 |
pipu
|
c72c8e865d
|
To reconstruct object extension data.
|
2015-03-12 15:47:15 +08:00 |
yangxiao
|
50c3a9cb4c
|
fix removeAllChildren cause camera to be destroyed bug
|
2015-03-12 10:39:21 +08:00 |
GarfieldKwong
|
656842d6f1
|
fix issue autorelease will not release trigger by autorelease.
|
2015-03-11 15:31:06 +08:00 |
minggo
|
d2be2290a3
|
Merge pull request #10796 from Mazyod/http-client-mac
Http client mac
|
2015-03-11 14:26:08 +08:00 |
CocosRobot
|
e079216248
|
[AUTO]: updating luabinding automatically
|
2015-03-11 02:45:36 +00:00 |
minggo
|
04393854e8
|
Merge pull request #10789 from fusijie/fix-moveto-reverse
disable MoveTo::reverse()
|
2015-03-11 10:39:45 +08:00 |
minggo
|
c4ac2b5f47
|
Merge pull request #10795 from pipu/optimize_ButtonReader
To optimize ButtonReader for source path and source.
|
2015-03-11 10:05:48 +08:00 |
minggo
|
c701f89329
|
Merge pull request #10683 from Mazyod/mac-editbox-fix
Fix editbox on Mac
|
2015-03-11 10:00:50 +08:00 |
pipu
|
90da84a663
|
To modify that check whether or not string is not empty.
|
2015-03-11 09:59:07 +08:00 |
Jacky
|
605ce58293
|
disable MoveTo::reverse()
|
2015-03-11 09:55:32 +08:00 |
Mazyad Alabduljaleel
|
983ffd96c7
|
Now, mac uses ObjC HTTP client
|
2015-03-10 14:48:57 +04:00 |
minggo
|
858178ad8e
|
Merge pull request #10772 from super626/v3
refactor init method
|
2015-03-10 17:50:06 +08:00 |
pipu
|
00bf9f5bfb
|
To optimize the situation that source path is existed, but source is not existed.
|
2015-03-10 17:48:48 +08:00 |
minggo
|
afb06b5c42
|
Merge pull request #10770 from m2q1n9/patch-1
fix cocostudio anchor point bug
|
2015-03-10 13:40:44 +08:00 |
minggo
|
8e6d9d5dd2
|
Merge pull request #10740 from newnon/v3_windows_network_path
Windows network path fix
|
2015-03-10 11:25:53 +08:00 |
minggo
|
f3567ba1af
|
Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
|
2015-03-10 11:19:29 +08:00 |
minggo
|
5ac2fb398c
|
Merge pull request #10774 from minggo/sync-from-v4
Label:Fixed transform not update correctly
|
2015-03-10 09:54:20 +08:00 |
minggo
|
a4698eaaaf
|
Merge pull request #10781 from mogemimi/add-const-to-member-function
Add const to Value::getDescription() function
|
2015-03-10 09:49:56 +08:00 |
yangxiao
|
5131a23de4
|
solve conflict
|
2015-03-10 09:18:13 +08:00 |
Dale Stammen
|
24d706cb7a
|
added /bigobj to C++ compiler command line options
|
2015-03-09 09:39:36 -07:00 |
Dale Stammen
|
35222a8193
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-09 09:20:25 -07:00 |
Dale Stammen
|
a828f73ccb
|
updated expiration date of project certificates
|
2015-03-09 08:31:06 -07:00 |
mogemimi
|
de4105516a
|
Add const to Value::getDescription() function
|
2015-03-09 22:34:24 +09:00 |
Jongryul Kook
|
0d65dd13be
|
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
|
2015-03-09 21:20:17 +09:00 |
WenhaiLin
|
cd95905a04
|
Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera
|
2015-03-09 17:26:43 +08:00 |
yangxiao
|
45bd6180ad
|
fix create bundle using empty path
|
2015-03-09 17:09:18 +08:00 |
yangxiao
|
ff3eba6143
|
refact init
|
2015-03-09 16:29:57 +08:00 |
m2q1n9
|
c97742072f
|
fix cocostudio anchor point bug
fix a bug which will cause anchor point config not work
|
2015-03-09 14:30:41 +08:00 |
Dale Stammen
|
a9479a1585
|
updated WP8 precompiled shaders
|
2015-03-08 21:42:27 -07:00 |
Dale Stammen
|
6cd881d8f8
|
added missing Particle3D files
|
2015-03-08 21:37:29 -07:00 |
Dale Stammen
|
362edec6d6
|
added missing Particle3D files
|
2015-03-08 21:31:43 -07:00 |
minggo
|
badfa5501d
|
Merge pull request #10723 from pipu/reconstruct_parse_callbackbind
To reconstruct callback binding for nest node
|
2015-03-09 10:55:47 +08:00 |
pipu
|
c21538e6e2
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:38:02 +08:00 |
CocosRobot
|
1f78b18d22
|
[AUTO]: updating luabinding automatically
|
2015-03-09 02:27:14 +00:00 |
pipu
|
1fa9b2577a
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:16:14 +08:00 |
Mazyad Alabduljaleel
|
ce377c4a1e
|
Fix compilation issues on Android and Win
|
2015-03-06 16:05:05 +04:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
XiaoYang
|
27ae60e626
|
Merge pull request #249 from songchengjiang/particle_merge
support win8.1
|
2015-03-06 17:57:34 +08:00 |
minggo
|
2238cb0dbb
|
Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio
Sourcr Refactor. Abstracted common functionality from two jni methods an...
|
2015-03-06 16:14:59 +08:00 |
minggo
|
15853a435e
|
Merge pull request #10738 from newnon/v3_mingw_build_fix
MinGW build fix
|
2015-03-06 15:49:13 +08:00 |
minggo
|
65926a9f0b
|
Merge pull request #10734 from pipu/projectnode_animation_innerspeed
Serialize and parse attribute "innerspeed" for ProjectNode.
|
2015-03-06 15:43:57 +08:00 |
songchengjiang
|
4ca90341b9
|
support win8.1
|
2015-03-06 15:35:02 +08:00 |
minggo
|
c96f3b135a
|
Merge pull request #10733 from pipu/modify_layout_attribute_name
To modify layout attribute name that are used in serialized and parsed.
|
2015-03-06 15:00:33 +08:00 |
yangxiao
|
457ac3fdd7
|
reset unproject with viewport cocostudio using it
|
2015-03-06 11:29:40 +08:00 |
yangxiao
|
d7c1d6b6aa
|
add billboard to transparent queue
|
2015-03-06 09:57:48 +08:00 |
andyque
|
e93f39fae1
|
fix typo
|
2015-03-05 17:05:08 +08:00 |
andyque
|
a229793e31
|
fix Linux glfw linker error on v3
|
2015-03-05 16:34:51 +08:00 |
Sergey
|
8270355ad6
|
blending function for Scale9Sprite
|
2015-03-05 11:13:51 +03:00 |
Sergey
|
de284c98ce
|
MinGW build fix
|
2015-03-05 11:11:13 +03:00 |
Sergey Perepelitsa
|
215fe8a0c9
|
Windows network path fix
|
2015-03-05 11:10:03 +03:00 |
pipu
|
fadac31868
|
Serialize and parse attribute "inner speed" for ProjectNode.
|
2015-03-05 15:48:17 +08:00 |
songchengjiang
|
444dbfdf9e
|
replace .mesh with .c3b
modify ParticleUniverse file structure
|
2015-03-05 14:54:32 +08:00 |
pipu
|
be1b0b7239
|
To modify layout attribute name that are used in serialized and parsed.
|
2015-03-05 14:34:35 +08:00 |
yangxiao
|
faf299c5a1
|
make path shorter
|
2015-03-05 13:24:06 +08:00 |
Jacky
|
c38c4a1373
|
fixed source coding error.
|
2015-03-04 18:15:05 +08:00 |
Krishna
|
35403439f3
|
Fixed compilation issue. Introduced missing CLASS_NAME
|
2015-03-04 10:48:30 +01:00 |
Krishna
|
ec3a8d49f9
|
Fixed compilation error.
|
2015-03-04 10:43:31 +01:00 |
pipu
|
010a077fa8
|
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
|
2015-03-04 17:29:40 +08:00 |
yangxiao
|
ea7dfe1147
|
lua test
|
2015-03-04 10:42:08 +08:00 |
yangxiao
|
68eaadaffb
|
merge cocos
|
2015-03-04 09:57:42 +08:00 |
Dale Stammen
|
e93fe1b13b
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-03 08:40:07 -08:00 |
CocosRobot
|
93c2b48779
|
[AUTO]: updating luabinding automatically
|
2015-03-03 15:15:43 +00:00 |
minggo
|
13e4525772
|
Merge pull request #10659 from super626/v3
Remove expolosion particle
|
2015-03-03 23:03:02 +08:00 |
cpascal
|
db9985d7cd
|
Added new line with the left curl bracket.
|
2015-03-03 20:39:25 +09:00 |
yangxiao
|
3db3d9ae11
|
merge cocos
|
2015-03-03 17:23:33 +08:00 |
Nite Luo
|
49912c2f62
|
clean up the formatting
|
2015-03-02 23:29:15 -08:00 |
Chad
|
395c14f07d
|
Hide Cursor - Feature Request #8766
Added the ability to hide or show the cursor on desktop builds.
|
2015-03-02 23:21:18 -08:00 |
cpascal
|
a6ee1451f4
|
changed one more indentation.
I made mistake, (now replacing the spaces to tab)
|
2015-03-03 13:44:43 +09:00 |
cpascal
|
4058e16f16
|
Added line break & removed function call in compare operator.
|
2015-03-03 13:40:40 +09:00 |
yangxiao
|
38636dc8b7
|
allow transition time to 0
|
2015-03-03 11:04:34 +08:00 |
yangxiao
|
874f7c7f99
|
fix transparent render bug
|
2015-03-03 10:42:47 +08:00 |
Dale Stammen
|
44b951a51a
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-02 16:42:05 -08:00 |
Mazyad Alabduljaleel
|
9d5fdcb973
|
Support Color4B for editbox text
|
2015-03-02 15:31:59 +04:00 |
songchengjiang
|
5c460ebb2d
|
add/update particle files
|
2015-03-02 13:07:32 +08:00 |
Mazyad Alabduljaleel
|
4387844176
|
Fix editbox on Mac
|
2015-03-01 23:56:18 +04:00 |
kpkhxlgy0
|
99dea9395d
|
enable setWritablePath on platform win32 and mac
|
2015-02-28 18:21:57 +08:00 |
yangxiao
|
56f3f34ee3
|
add Animate3D::setTransitionTime
|
2015-02-28 17:40:25 +08:00 |
CocosRobot
|
84fb4094fc
|
[AUTO]: updating luabinding automatically
|
2015-02-28 03:23:08 +00:00 |
minggo
|
0755400a79
|
Merge pull request #10279 from seobyeongky/motionstreak_bug_fix
MotionStreak MoveTo/MoveBy action OK
|
2015-02-28 11:17:28 +08:00 |
Dale Stammen
|
fd11984e0a
|
disable LTCG
|
2015-02-27 11:21:36 -08:00 |
Dale Stammen
|
e4db9f396e
|
disable LTCG. set warning level to W3
|
2015-02-27 11:16:40 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
e04fd6eb1d
|
updated cocos2d dll name from 3.4 to 3.5
|
2015-02-27 10:54:27 -08:00 |
Dale Stammen
|
d486cc78fb
|
updated cocos2d dll name from 3.4 to 3.5
|
2015-02-27 10:52:32 -08:00 |
Dale Stammen
|
8bc5b37b40
|
removed missing include files from project
|
2015-02-27 10:48:53 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -08:00 |