Ricardo Quesada
a1d20bfb7e
Merge pull request #6378 from ricardoquesada/include_fixes_squash
...
Squashed commit of the following:
2014-04-26 10:12:06 -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
3253018869
Merge pull request #6371 from dabingnn/develop_migrate_math_lib
...
Develop migrate math lib
2014-04-25 23:34:43 -07:00
Ricardo Quesada
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
Ricardo Quesada
0860455724
Updates CHANGELOG
2014-04-25 19:01:04 -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
cc11ab9c73
Update AUTHORS [ci skip]
2014-04-25 17:42:26 +08:00
James Chen
74044b2685
Update AUTHORS [ci skip]
2014-04-25 17:41:03 +08:00
James Chen
277766a021
Update CHANGELOG [ci skip]
2014-04-25 17:40:56 +08:00
James Chen
c1f220447a
Merge pull request #6373 from xhcnb/deprecated_callback
...
use new ccHttpRequestCallback.
2014-04-25 17:34:11 +08:00
James Chen
9d7880a2a3
Update CHANGELOG [ci skip]
2014-04-25 17:33:35 +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
zhangbin
560c24a09a
Update the reference of submodule plugin-x.
2014-04-25 15:26:04 +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
376f8d27d9
Merge pull request #6260 from iSevenDays/patch-8
...
Fix possible memory leak in Image::saveImageToPNG
2014-04-25 13:53:55 +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
06d9187783
Merge pull request #6270 from andyque/feature4783
...
closed #4783 , add outline shader files
2014-04-25 13:50:44 +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
Zhe Wang
94cae4a4e5
Update LICENSE_cocos2d-x.txt
2014-04-25 13:06:24 +08:00
James Chen
69303cbac0
Merge pull request #6367 from CocosRobot/update_lua_bindings_1398398362
...
[AUTO]: updating luabinding automatically
2014-04-25 12:42:46 +08:00
James Chen
d885882ef5
Merge pull request #6291 from dumganhar/perf-callback
...
Adds performance test for callbacks: 1) std::function,2) (target->*selector)(), 3) simulate new api of Scheduler
2014-04-25 12:42:16 +08:00
James Chen
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +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
58386c7a22
Merge pull request #6366 from CocosRobot/update_cocosfiles_1398395125
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 11:06:26 +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
CocosRobot
679f8c7750
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 03:05:26 +00:00
James Chen
cc7ded036f
Merge pull request #6365 from dumganhar/pull/6012
...
Merge PR #6012 : Add cocos2d::RefPtr<T>
2014-04-25 11:01:43 +08:00
James Chen
8d706060a7
Merge pull request #6358 from shujunqiao/emptytest-upload
...
[ci skip], add ssh upload file in emptytest.py.
2014-04-25 10:59:58 +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
b9dc5ab4a7
Merge pull request #6364 from CocosRobot/update_cocosfiles_1398393835
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 10:44:36 +08:00
CocosRobot
617ccbb4fa
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 02:43:56 +00: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
James Chen
0db54caa0a
Merge pull request #6360 from lmskater/add-ci-release-command
...
[Jenkins][ci skip] Change 'payload' to 'tag'
2014-04-25 10:37:13 +08:00
James Chen
45cc122074
Merge pull request #6359 from pandamicro/NewPhysicsSpriteFix
...
Fixed #4755 : Fix PhysicsSprite transform not updated issue
2014-04-25 10:36:46 +08:00
Huabing.Xu
589646343d
Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib
2014-04-25 10:00:03 +08:00
Huabing.Xu
7395dcbbe3
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-25 09:59:46 +08:00
minggo
5b0b0f0e07
[ci skip]
2014-04-24 18:21:55 +08:00
Huabing.Xu
1137df57e0
Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib
2014-04-24 17:16:51 +08:00
Huabing.Xu
c2da6727be
fix compile warning after merge
2014-04-24 17:00:28 +08:00