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