Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,674 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

53 Commits

Author SHA1 Message Date
leeda 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
minggo 10acb5a045 update version (#18367) 2017-10-12 22:58:43 -05:00
minggo a6a5426986 [ci skip]update version and readme (#18169) 2017-08-17 14:34:22 +08:00
minggo 4ca29ac1cf Merge v3.15.1 (#17897) 
* 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.

* The optimization for huawei. (#17832)

* The optimization for huawei.

* setAnimationInterval fix for all platforms.

* disable debug

* include fix.

* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840)

* update release not and version (#17845)

* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861)

* Updates jar to resolve warning while packaging APK file. (#17863)

* update release date (#17870)

* fix compiling error
 2017-06-05 13:37:50 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates (#17495) 
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
 2017-03-14 13:41:28 +08:00
CocosRobot d07794052f Update license to 2017 (#17362) 
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
 2017-02-14 14:36:57 +08:00
minggo 690db56f44 Merge v3.14.1 (#17231) 
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145)

* fix crash if physics3d camera is not set (#17139) (#17144)

* fix linking error with vs2015 (#17146)

* fix issue #17116 & #17119 for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info (#17161)

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue (#17166)

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref (#17169)

* update version and release note (#17170)

* issue ##17119 improved v3.14.1 (#17189)

* update version (#17230)
 2017-01-20 09:59:30 +08:00
minggo fdb94d59d2 update engine version (#16929) 2016-11-30 11:53:53 +08:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
minggo c233a5bdf7 [ci skip]V3.13.1 doc (#16528) 
* update release note and changelog

* update engine version
 2016-09-06 17:01:23 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
minggo 55d80413f2 update version 2016-07-31 22:52:59 +08:00
minggo ed955cbe1d update version 2016-06-17 18:09:27 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
lunhao.guo b2e5e480fe update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
XiaoFeng 18b7b533ce Update 3.9 beta0 change log & version info 2015-10-20 16:46:31 +08:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00
Ricardo Quesada 76982dac89 updates cocos2d version 2015-07-24 15:53:18 -07:00
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
pandamicro 15c763d84a Update engine version 2015-06-29 18:21:06 +08:00
pandamicro 276ce3a0a7 Update versions 2015-06-19 09:56:19 +08:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
Ricardo Quesada fe59b093b5 adds love to header files 2015-05-05 21:48:05 -07:00
minggo ee29888d8e [ci skip] update version 2015-04-27 16:46:03 +08:00
minggo 2b66bb7082 [ci skip] update version 2015-04-14 10:46:20 +08:00
minggo 1646278be2 [ci skip] update version 2015-04-07 10:36:38 +08:00
Huabing.Xu edf785cec3 [ci skip]update version 2015-03-18 13:52:52 +08:00
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
minggo e6ce627632 [ci skip]update version 2015-02-26 10:39:37 +08:00
Huabing.Xu d1c0c0eeb6 [ci skip] update version 2015-01-19 09:50:19 +08:00
minggo e9dbe4adc6 [ci skip]update version 2015-01-13 16:34:59 +08:00
minggo fe63a1a46c [ci skip]update version 2015-01-12 11:31:09 +08:00
minggo 0b7572f3ee [ci skip] 2014-12-24 15:35:58 +08:00
minggo 93561fcb8e [ci skip]update version 2014-12-11 18:14:28 +08:00
minggo fcfd33947f [ci skip] 2014-12-04 15:36:09 +08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
minggo 04839b0e8f [ci skip]update version 2014-10-16 15:41:43 +08:00
minggo c2bac086a7 [ci skip]update version info 2014-09-19 21:54:01 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
minggo 7fd1521bbf update version 2014-08-22 11:48:14 +08:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
Huabing.Xu 5086758063 add missed CC_DLL for cocos2dVersion function 2014-08-11 15:50:48 +08:00
minggo b282970833 [ci skip] 2014-07-15 15:11:17 +08:00
minggo 3f262568a2 [ci skip: update version] 2014-07-07 17:24:14 +08:00
minggo 552c3cbb2f [ci skip] 2014-06-17 18:42:10 +08:00
minggo 6539b558bd update version 2014-05-23 14:30:08 +08:00