18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
f8e325792b
V3.15 ( #17752 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
2017-04-27 09:25:20 +08:00
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
a4c06670b1
make menu item don't overlap with other label ( #17590 )
2017-03-27 10:50:41 +08:00
8a327c77fa
Fix various minor typos ( #17570 )
2017-03-23 09:30:42 +08:00
d160d79d5b
Fix typos in comments and strings ( #17333 )
2017-02-10 10:35:52 +08:00
84a3f73ecb
Particle set display frame ( #17163 )
...
* Fix CCParticleSystemQuad::setDisplayFrame()
* Added tests
2017-01-12 11:48:30 +08:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
a68874d3cb
Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 11:00:23 +08:00
4d97d5075b
Add test case for issue12310.
2015-06-12 15:39:57 +08:00
51374eb822
tests compiles on xcode 6.3
...
no more USING_NS in the header files.
it creates conflict with xcode 6.3
2015-04-08 17:37:30 -07:00
0d51c13743
Make all test cases work fine with new test framework.
2015-04-03 14:31:03 +08: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
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
1b6cda488a
add ParticleResetTotalParticles test.
2014-07-29 11:21:11 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
ad230bb412
fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 10:39:18 +08: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
168ff78e18
add test case for y flipped coord
2014-05-09 11:49:51 -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
08d975268d
Fix for issue http://www.cocos2d-x.org/issues/4880 .
2014-04-17 03:15:43 +03:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
9fbb45136a
closed #4573 : add ParticleVisibleTest.
2014-03-27 17:06:26 +08:00
289e632a40
closed #4513 : change 1.0 to 1.0f to avoid the warning.
2014-03-25 11:36:35 +08:00
1520f85b32
closed #4513 : fix titles.
2014-03-24 18:20:11 +08:00
759ec61639
closed #4513 : Particle doesn't animate when readd it.
2014-03-24 18:08:55 +08:00
7ab639ec0f
fix lots compile warnings
2014-03-20 16:24:55 +08:00
b88de91a15
Renames 'samples' folder to 'tests', ouch....
2014-03-11 19:10:34 +08:00
leeda