4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
1c40f7b61b
CCScrollView should override removeChild
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +08:00
1b875cb353
Fixed compile error
2015-09-19 01:57:45 +01:00
cb1a574b56
AssetsManagerEx unzipping freeze app
...
Unzipping in main thread bad idea.
Need good solution. My code fix freezing, but need similar batch
Download.
2015-09-17 23:43:56 +03:00
06b74695c2
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
...
Fix bags, can't open file on windows platforms, if this contains utf8
chars
2015-09-17 23:30:32 +03:00
ded9a9e6d4
Merge pull request #13893 from yangws/downloader
...
Remove AssetsManager dependence with CRUL.
2015-09-17 22:18:56 +08:00
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
d95edeee17
Merge pull request #13882 from pandamicro/v3
...
Fix performance issue in AssetsManagerEx due to object copy
2015-09-17 11:40:16 +08:00
20d9442167
Fix performance issue in AssetsManagerEx due to object copy
...
Reported in #13513
2015-09-17 10:00:02 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
bf477c6bfb
Restructure AssetsManagerEx.
2015-09-15 11:23:46 +08:00
d6934cfc4b
rename var resumeDownloaded to resumeDownloaded.
2015-09-08 16:38:02 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
fb55c2cd63
Merge pull request #13398 from perminovVS/v3-dev-use-more-get-file-extension
...
More FileUtils::getFileExtension
2015-08-18 17:27:11 +08:00
b16dc7b425
Merge pull request #13427 from songchengjiang/v3_backup
...
performance optimization and bug fixing
2015-08-18 09:59:24 +08:00
6008c8352b
performance optimization and bug fixing
2015-08-18 09:51:26 +08:00
9c729e1953
More FileUtils::getFileExtension
...
check .material in CCPU
check .zip in AssetsManager
2015-08-16 15:01:15 +03:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
8b2747c53b
fix particle3D file error
2015-08-06 18:03:50 +08:00
37030a427c
Fix AssetsManager crash by protect Downloader with shared_ptr
2015-08-04 12:45:49 +08:00
5f9469ac7b
Merge pull request #12239 from pandamicro/PhysicsSpriteFix
...
Fix transform issue of PhysicsSprite itself and its children
2015-08-01 18:08:57 +08:00
81f77b0010
Improve sync transform logic using custom listener
2015-08-01 16:50:16 +08:00
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
7a36a57aff
Fixed inertial scrolling for `CCScrollView`
...
The inertial scrolling in `CCScrollView` usually works only if you're using the `Direction::BOTH` direction, and if there's enough scrolling space *both* on the X and the Y axis. But when you use the `Direction::HORIZONTAL` or `Direction::VERTICAL` directions you usually have 0px of available space on the Y or X axis respectively, so it won't work.
This change enables you to scroll the view just on the X or on the Y axis using `Direction::HORIZONTAL` or `Direction::VERTICAL` and to use the inertial scroll accordingly.
2015-07-08 10:03:03 +02:00
8179fe04f0
And more warnings.
2015-07-07 23:10:04 +08:00
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
080e2debe8
Fix transform issue of PhysicsSprite itself and its children
2015-06-08 13:43:51 +08:00
ed6d6521ac
Add CURLOPT_NOSIGNAL to avoid multithread issue on timeout
2015-06-04 17:59:56 +08:00
83f7f30c1c
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 15:03:20 +08:00
4c6f67fd7e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
web
2015-06-02 10:12:22 +08:00
fdec552ed7
Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader
2015-06-02 10:08:13 +08:00
2aec149316
check for existance of KEY_DOWNLOAD_STATE entry before trying to read its value
2015-05-28 13:33:38 -07:00
7623ee390b
disable CURL and AssetsManager for Windows 10 UWP
2015-05-28 13:32:08 -07:00
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
944b0ef5e7
adds `virtual` to destructor
2015-05-20 17:43:48 -07:00
f2d3ecad48
Removes state from MeshCommand.
...
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
2015-05-20 15:57:26 -07:00
8212b1398f
Update AssetsManager.cpp
...
fix: crash when default constructor params packageUrl, versionFileUrl,.. is NULL
fix: percent
2015-05-16 11:48:34 +08:00
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
88c6eb6887
Merge pull request #326 from songchengjiang/v3
...
fix the bug of particle3d material reading
2015-05-12 12:23:32 +08:00
24d1b23816
fix the bug of particle3d material reading
2015-05-12 10:42:33 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
0f30ad4f16
Fix crash in AssetsManager
2015-05-07 18:59:51 +03:00
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466254a4b05671818b9a994fbd5f4e02199bf1cf177bbca1a95f0287b42fd3e38b425b2b65d5fa3dd54ddbdbc345548a160d7b409f20967f35a09c50c464c45fab648d1f0779d05
2015-05-05 13:07:32 -07:00
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
557f3e86b9
Fix warning in CCPURender.cpp: Comment out unused function 'compareParticle3D' because code that use it was commented.
2015-05-01 12:46:53 +03:00
0aecc15a25
Correct field initialization order in various places (Xcode warnings)
2015-05-01 12:19:30 +03:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
98fcd83d50
Merge pull request #10870 from daiki1003/fix/scroll_view_container
...
Fix container view's anchor point problem.
2015-04-27 11:44:19 +08:00
0198c8707b
Merge pull request #11572 from super626/v3
...
Fix memory leak
2015-04-24 16:42:33 +08:00
2aee4abd66
fix https://github.com/cocos2d/cocos2d-x/issues/11203
...
fix the error of CCBundle3D
2015-04-24 15:31:50 +08:00
ec41965add
Add get header and callback for Downloader
2015-04-23 19:07:07 +08:00
6ef1e7e3d0
Optimize Vec3 use constructor default.
...
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
f8f18cc026
enable users to clone PUParticleSystem3D
2015-04-15 12:44:03 +08:00
ed407e7889
fix the bug of makeParticleLocal function
2015-04-10 17:32:13 +08:00
783b159abc
naming error
2015-04-10 16:09:39 +08:00
6b8d8a4774
fix the bug of PUParticle3DQuadRender
2015-04-10 15:58:16 +08:00
a6e83ca35b
fix the bug of makeParticleLocal function
2015-04-10 11:31:39 +08:00
98211a8c3f
fix the bug of PURibbonTrail
2015-04-09 16:49:03 +08:00
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
a782eb022d
fixes warnings on Xcode 6.3
...
instead of using `abs()` it uses `std::abs()`
2015-04-06 12:08:30 -07:00
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
b9d294f542
Fix container view's anchor point problem.
2015-04-03 16:37:48 +09:00
e4a58d5c35
fix the bug of Particle3DModelRender
2015-04-03 12:43:14 +08:00
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
42cd63fe01
fix group error
2015-03-26 15:47:14 +08:00
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
a9e5f8cc4a
replace static_cast with dynamic_cast
2015-03-17 17:47:58 +08:00
2c80b6ae3a
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-15 00:10:08 +01:00
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
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
1e240e92f9
empty mesh check
2015-03-10 13:31:04 +08:00
e30c473f85
fix the bug of material reading on linux
2015-03-09 17:30:28 +08:00
578053d351
add macro on other platform
2015-03-06 18:03:11 +08:00
27ae60e626
Merge pull request #249 from songchengjiang/particle_merge
...
support win8.1
2015-03-06 17:57:34 +08:00
4ca90341b9
support win8.1
2015-03-06 15:35:02 +08:00
bac5377e8c
format
2015-03-06 10:44:56 +08:00
bec346bf73
add comments
2015-03-06 10:35:42 +08:00
444dbfdf9e
replace .mesh with .c3b
...
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
70c25ecded
modify project using short path
2015-03-05 13:40:52 +08:00
4de96cf1e6
modify pu path
2015-03-05 13:28:42 +08:00
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
590912ba49
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-03-04 15:29:05 +08:00
4783ac4f86
remove setParticleSystemScaleVelocity
2015-03-04 15:18:03 +08:00
9665bb6dd8
add to linux project
2015-03-04 15:17:37 +08:00
d861220993
restore model search path
2015-03-04 14:56:04 +08:00
7c1e8e1a08
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
...
Conflicts:
tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
2015-03-04 14:12:34 +08:00
1b0fc162b0
fix bugs
2015-03-04 13:19:42 +08:00
e466b5d231
fix warning
2015-03-04 10:24:07 +08:00
a92a8ac924
particle to transparent queue
2015-03-04 10:10:33 +08:00
68eaadaffb
merge cocos
2015-03-04 09:57:42 +08:00
8092437463
Merge pull request #245 from songchengjiang/particle_merge
...
add test demo
2015-03-03 17:46:47 +08:00
18a3a23a2e
adjust code style
2015-03-03 15:57:03 +08:00
db5c098ca8
adjust
2015-03-03 15:13:47 +08:00
9bdcdec60a
add test demo
...
use particleSystemScaleVelocity
2015-03-03 15:10:42 +08:00
6023777133
reset modify
2015-03-03 14:12:12 +08:00
e650ef2b4d
check sprite == nullptr
...
remove unneeded namespace
2015-03-03 11:52:55 +08:00
6b046c5236
add log to Render
2015-03-03 11:42:15 +08:00
874f7c7f99
fix transparent render bug
2015-03-03 10:42:47 +08:00
def8da1612
remove unneeded code
2015-03-03 10:33:28 +08:00
6a3e810bc2
code optimization
2015-03-03 10:15:49 +08:00
a3ae37ac7a
optimization
2015-03-02 17:47:26 +08:00
a9eb4dc7f9
support read material files on linux
...
modify the name of getAliveParticleCnt function
2015-03-02 16:28:38 +08:00
79d892bffc
add std::nothrow
...
modify Copyright
2015-03-02 16:05:26 +08:00
5c460ebb2d
add/update particle files
2015-03-02 13:07:32 +08:00
c216984b6f
clear the particle pool when start
2015-02-26 13:57:18 +08:00
22d8917100
add Particle Universe copy right
2015-02-25 18:05:41 +08:00
a50efe998f
fix compile
2015-02-16 11:57:07 +08:00
bdd7da89a1
add header
2015-02-16 11:26:06 +08:00
6c73e22a32
variable name error
2015-02-16 11:18:54 +08:00
5c8fbcedab
load all materials linux routine
2015-02-16 10:03:58 +08:00
f71b432d1d
fix render release bug
2015-02-15 16:52:20 +08:00
d34a9f68f2
check ParticleModelRender to avoid crash
2015-02-15 16:39:58 +08:00
5547d85add
missing file
2015-02-15 11:41:14 +08:00
f9f532ef65
missing file
2015-02-15 11:16:46 +08:00
33a0cc310a
wrong filename
2015-02-15 11:01:11 +08:00
6172302a9b
ref path add extensions
2015-02-13 16:57:00 +08:00
0f27e0c31a
add to ext.h
2015-02-13 16:16:30 +08:00
954fd52493
rename folder and fix warning
2015-02-12 17:54:27 +08:00
2bae6b5351
check created vertex and index buffer
2015-02-12 17:15:48 +08:00
026ce1a288
modify according to minggo
2015-02-12 16:51:02 +08:00
8f290b2d24
modify according to minggo
2015-02-12 16:09:08 +08:00
c114d5d496
add particle to linux project
2015-02-12 11:00:48 +08:00
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
897416eb4e
cocos2d/cocos2d-js#1313 : Remove dangerous code in AssetsManagerEx::setStoragePath
2015-01-30 11:12:35 +08:00
5e8baa4f39
Fix AssetsManagerEx small issues
2015-01-23 12:10:32 +08:00
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
0bddeb88c8
Disable 3D rendering support for commands that needs to execute in order
2015-01-15 14:57:51 -08:00
4a440e66c9
Refactor draw command
2015-01-15 14:00:49 -08:00
412e76a626
add fixme
2015-01-04 15:16:22 +08:00
7328c2eea0
fix linux compile error
2015-01-04 15:16:22 +08:00
60ec08eef4
upgrade libcurl for iOS
2014-12-31 10:18:44 +08:00
5755cc69e9
Fix a small compilation issue
2014-12-30 10:11:30 +08:00
ffd7c30c87
Polish restart implementation
2014-12-30 10:09:56 +08:00
1e32d0fb80
Added getSearchPaths API in Manifest
2014-12-28 11:55:31 +08:00
6db7cfb68b
Merge pull request #9039 from pandamicro/v3_origin
...
#9061 : Polish AssetsManagerEx, bug fixes and feature added
2014-11-27 22:01:03 +08:00
ef76724f19
#9061 : Add check for instantiation
2014-11-26 14:39:56 +08:00
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
1e8aeb7fd2
Minizip
...
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
2014-11-16 22:41:37 +03:00
eb0159b2b7
Unify usage of chipmunk library
...
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
2014-11-15 13:17:23 +03:00
f4e61f5620
Issue #9061 : Add std::nothrow
2014-11-14 10:44:18 +08:00
d8be5a8af4
fix includes so that minizip builds correctly on Mingw-w64
2014-11-13 23:27:04 +00:00
bf45accf8e
Revert "Issue #9061 : Made Manifest::getAssets public for assets process after update finished"
...
This reverts commit 8652864242
2014-11-13 10:53:38 +08:00
68e5132107
Issue #9061 : Fix issue about compare logic
2014-11-10 19:23:41 +08:00
8652864242
Issue #9061 : Made Manifest::getAssets public for assets process after update finished
2014-11-10 16:52:20 +08:00
e167f0889b
Issue #9061 : Fix no success notification for empty download queue issue
2014-11-10 16:51:41 +08:00
ead867559c
Issue #9061 : Fix local manifest more recent than cached manifest issue
2014-11-10 16:51:08 +08:00
aca5930711
Fixed #9038 : parseVersion shouldn't set Manifest loaded flag
2014-11-06 23:08:34 +08:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
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
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
d8d94d214b
added missing file methods for winrt/wp8
2014-10-14 17:49:25 -07:00
a91ae61071
added check for WinRT and WP8
2014-10-14 16:46:23 -07:00
cca5d90cbe
added winrt and wp8 platforms. Cleaned up platform checks
2014-10-14 16:45:43 -07:00
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
4e9e40363f
Feature #4977 : Fix an issue about checkUpdate function
2014-10-09 19:55:11 +08:00
a26e91f839
no message
2014-10-09 18:30:39 +08:00
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
b911c240c9
added support for static and shared builds with extensions
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:19 +01:00
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
efa1c86fc5
Merge pull request #8103 from cpascal/fix_no_physics
...
Fixed compile error when I turned off physics definitions.
2014-09-25 09:56:45 +08:00
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
fe07589141
Fixed my mistakes - preprocessor.
2014-09-22 14:25:47 +09:00
07f5568ae8
Using CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION instead of CC_USE_PHYSICS
2014-09-22 14:19:08 +09:00
c527d7476b
Fixed compile error when I turned off physics definitions.
...
Fixed the following compile error.
cocos2d\extensions\physics-nodes\ccphysicssprite.cpp(305): error C4716:
'cocos2d::extension::PhysicsSprite::getRotation' : must return a value
and more..
Conditions:
CC_USE_PHYSICS = 0
CC_ENABLE_CHIPMUNK_INTEGRATION = 0
CC_ENABLE_BOX2D_INTEGRATION = 0
2014-09-19 01:35:01 +09:00
0cfb8c6469
fix ScrollView bug
...
I Fixed a bug that scroll view hidden picks up the touch events.
2014-09-05 20:49:15 +09:00
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
7493c7bf3e
fxi compile warning
2014-09-03 14:47:04 +08:00
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
a0c28e49ac
remove exteion edtibox
2014-09-02 16:14:07 +08:00
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
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
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
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
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
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
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
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
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
d8eb1b26ef
format code
2014-08-14 14:15:16 +08:00
561945d6cd
format code
2014-08-14 14:14:25 +08:00
42e7e3bbe8
format code
2014-08-14 14:11:00 +08:00
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
c673955d5d
uncompress false means zip wrong, download again
2014-08-12 20:13:52 +08:00
0b93cc40d7
when http code 301,302, can follow rediect
2014-08-12 20:12:23 +08:00
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
38e4ad0fbd
Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview
...
Update : added function for setting min/max scale
2014-08-05 11:52:22 +08:00
1b74bc279a
Fix : remove unused params from header file
2014-08-04 23:20:47 +09:00
6f26a7b983
Fix : remove verbose function
2014-08-04 23:20:13 +09:00
7c0919042f
Fix : small bug
2014-08-04 23:17:09 +09:00
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
358d637e75
Merge pull request #7645 from andyque/testPR7549
...
fix EditBox began/end events not work issue
2014-08-04 15:36:07 +08:00
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
9692dfdc67
Update : added function for setting min/max scale
...
Fix to remove unused params.
2014-08-03 21:25:55 +09:00
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
6dee943352
fix mac EditBox callback issue
2014-08-01 14:56:47 +08:00
630c41e4a3
Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549
2014-08-01 13:37:27 +08:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
aaa65dcae4
Merge branch 'v3' into v3_windowChangeModule
2014-07-29 10:20:23 +08:00
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
2795c10627
rename box2d->libbox2d
2014-07-28 12:05:58 +08:00
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
98943b4517
Merge pull request #7548 from yongkangchen/v3
...
fix Label::setTextColor did not have any effect.
2014-07-25 11:18:10 +08:00
b9d8e84b4d
Merge pull request #7581 from andyque/fixEditBoxCompile
...
fix mac compile error
2014-07-24 21:59:31 +08:00
e9ab6bb5cd
fix EidtBox mac 32bit compile error
2014-07-24 17:56:28 +08:00
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
918da16639
Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError
2014-07-24 10:09:59 +08:00
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
f19acbb6db
[FIX]: make sure parent is visible before handling touch
2014-07-23 03:42:29 +04:00
524d9cb8af
Merge pull request #7552 from andyque/fixScale9Sprite
...
fix scale9Sprite addChild zorder issue
2014-07-22 18:39:04 +08:00
1f4c289db4
fix scale9Sprite addChild zorder issue
2014-07-22 16:26:40 +08:00
318afe2baf
add editbox ended event
2014-07-22 15:12:40 +08:00
73cf18163e
fix font size of editbox for mac when glview scale
2014-07-22 15:06:44 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
27ba8ecd42
[FIX]: make the scrollView delegate methods optional
2014-07-17 02:10:59 +04:00
7e7c3a1e55
Merge branch 'v3' into android-dependencies
2014-07-16 13:49:20 +08:00
14f3d6f230
Adjust the dependencies of extensions & cocostudio on android.
2014-07-16 13:47:57 +08:00
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
04c5800ee8
[FIX]: When getting the string value, check which textfield is in use
...
[FIX]: when setting the string value, change both textfields.
2014-07-13 05:01:13 +04:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
ec62f05b12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-20 10:51:13 +08:00
0019d9a061
Optimize the win32 projects configuration.
2014-06-20 10:50:43 +08:00
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
08453b911d
Merge pull request #7071 from pandamicro/Script_onEnter_fix
...
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-18 13:37:57 +08:00
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
d00c9fe70a
Fixed #5563 : Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
2014-06-16 12:50:35 +08:00
d524ba1013
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-13 17:59:23 +08:00
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
575c5101c7
Merge pull request #6999 from iSevenDays/patch-12
...
fix assertions
2014-06-09 09:46:55 +08:00
7e6fc3b9ac
Merge pull request #7000 from iSevenDays/patch-13
...
Possible use of null pointer.
2014-06-09 09:46:14 +08:00
1a16dd02f8
Possible use of null pointer.
...
Or maybe better to add CCASSERT.
2014-06-09 02:12:17 +03:00
3edef12094
Update CCControlButton.cpp
2014-06-09 02:07:43 +03:00
f5efc49903
fix assertions
...
'label' could be not caught after previous assertions
2014-06-09 02:04:44 +03:00
8962f7fc2e
refactor Scale9Sprite setColor & setOpacity
2014-06-06 16:15:19 +08:00
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
1d5d1f011e
fix scale9Sprite can't culling problem
2014-06-03 17:52:41 +08:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
c0b0ca0e70
Merge pull request #6655 from zifter/FixCascade
...
Fixed bug with cascade opacity and color for control button. #4881
2014-05-19 11:13:29 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
9fa30f2c61
Added Secure input for CCEditBox on Mac
...
[NEW]: Implemented NSSecureTextField when CCEditBox inputFlag is set to Password
[FIX]: Cleanup CCEditBoxMac. CCCustomNSTextField class is not needed.
2014-05-16 11:21:56 +04:00
146c9da102
Fix compilation error using arch i386
...
Adding a member variable to hold the `placeholderAttributes` property fixes a compilation error regarding synthesis when building with ARCH=i386.
2014-05-14 10:29:11 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
fa45f3f4e0
Fixed bug with cascade opacity for control button.
2014-05-10 04:02:24 +03:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
8b5d255296
removed obsolete include files
2014-05-05 13:52:20 -07:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
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
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
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
1966d1f50e
Fixed #4755 : Fix PhysicsSprite transform not updated issue
2014-04-23 17:11:55 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
29af6f6c7e
updated project settings
2014-04-19 10:13:12 -07:00
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
a9a1e7cb2f
Remove hard codes
2014-04-16 16:08:26 +08:00
4c9fb311da
Remove hard codes
2014-04-16 16:04:33 +08:00
mogemimi