Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,125 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

492 Commits

Author SHA1 Message Date
James Chen 36611f9770 Update CHANGELOG [ci skip] 2014-02-20 19:35:05 +08:00
James Chen 6e07af03ae Update CHANGELOG [ci skip] 2014-02-20 15:58:55 +08:00
James Chen c0a075ee11 Update CHANGELOG [ci skip] 2014-02-20 15:48:22 +08:00
James Chen 47fd9aed26 Update CHANGELOG [ci skip] 2014-02-20 15:46:46 +08:00
James Chen 609b937b39 Update CHANGELOG [ci skip] 2014-02-18 15:59:56 +08:00
James Chen cae938bd4e Update CHANGELOG [ci skip] 2014-02-17 12:56:28 +08:00
James Chen 5ba38b1320 Update CHANGELOG [ci skip] 2014-02-14 11:20:34 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
James Chen 130c326811 Update CHANGELOG [ci skip] 2014-02-12 17:42:45 +08:00
James Chen 3028d75600 Update CHANGELOG [ci skip] 2014-02-11 14:32:22 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
James Chen a1aa4b9b8a Update CHANGELOG [ci skip] 2014-02-10 11:05:09 +08:00
James Chen 092784d7c5 Update CHANGELOG [ci skip] 2014-02-10 09:55:54 +08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 2014-01-28 11:32:25 -08:00
James Chen 1c0eb3198d Update CHANGELOG [ci skip] 2014-01-28 17:36:07 +08:00
James Chen 41e261509b Update CHANGELOG [ci skip] 2014-01-28 16:33:01 +08:00
Ricardo Quesada 1f4ca2f0ad Works on Android 2014-01-27 13:05:58 -08:00
James Chen 09197b65b0 Update CHANGELOG [ci skip] 2014-01-27 16:39:52 +08:00
James Chen bbe156fe37 Update CHANGELOG [ci skip] 2014-01-27 16:12:31 +08:00
James Chen 0cc8050b73 Update CHANGELOG [ci skip] 2014-01-27 10:34:57 +08:00
minggo c8bd7bc3a8 update changelog 2014-01-27 10:28:11 +08:00
James Chen 208939ab2a Update CHANGELOG [ci skip] 2014-01-26 23:06:48 +08:00
James Chen bd10afab60 Update CHANGELOG [ci skip] 2014-01-26 22:07:55 +08:00
James Chen 2934a09a2e Update CHANGELOG [ci skip] 2014-01-26 14:47:34 +08:00
James Chen 243a995dc1 Update CHANGELOG [ci skip] 2014-01-26 14:43:29 +08:00
James Chen cb7e2b5ece Update CHANGELOG [ci skip] 2014-01-26 13:58:37 +08:00
James Chen aa8cfb5f04 Update CHANGELOG [ci skip] 2014-01-24 11:58:09 +08:00
James Chen 3d113e1709 Update CHANGELOG [ci skip] 2014-01-24 11:42:23 +08:00
James Chen afd11b43a4 Update CHANGELOG [ci skip] 2014-01-24 11:37:46 +08:00
James Chen dfbb68a9e1 Update CHANGELOG [ci skip] 2014-01-24 11:37:23 +08:00
James Chen 38ae628dea Update CHANGELOG [ci skip] 2014-01-23 18:03:31 +08:00
James Chen 1e39b59c8d Update CHANGELOG [ci skip] 2014-01-23 11:56:59 +08:00
James Chen 5ede8088c8 Update CHANGELOG [ci skip] 2014-01-23 11:26:24 +08:00
James Chen b4c2871496 Update CHANGELOG [ci skip] 2014-01-22 12:03:23 +08:00
James Chen d87bbdd7bb Update CHANGELOG [ci skip] 2014-01-22 11:41:57 +08:00
James Chen 7712ab7406 Update CHANGELOG [ci skip] 2014-01-21 17:56:24 +08:00
James Chen 87c3f533ea Update CHANGELOG [ci skip] 2014-01-20 12:05:06 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
Ricardo Quesada 069a4fb170 Renderer: Don't sort z=0 Commands 
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
 2014-01-17 23:10:04 -08:00
James Chen 08bb3b1060 Update CHANGELOG [ci skip] 2014-01-18 10:55:15 +08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key 
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
 2014-01-17 16:08:29 -08:00
James Chen 54d587153b Update CHANGELOG [ci skip] 2014-01-17 11:55:20 +08:00
Ricardo Quesada cb9761125b Renderer: When not using VAOs, call... 
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
 2014-01-16 15:02:39 -08:00
Ricardo Quesada ce633b44ab Adds GL::activeTexture() 
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
 2014-01-16 13:44:18 -08:00
James Chen 74870aaf92 Update CHANGELOG [ci skip] 2014-01-16 17:21:07 +08:00
James Chen 191fc763f6 Update CHANGELOG [ci skip] 2014-01-16 16:12:15 +08:00
James Chen 93beb44150 Update CHANGELOG [ci skip] 2014-01-16 15:35:46 +08:00
James Chen 778292738f Update CHANGELOG [ci skip] 2014-01-16 12:03:42 +08:00
James Chen f5c93fc9e6 Update CHANGELOG [ci skip] 2014-01-16 11:55:42 +08:00
James Chen c6445b0640 Update CHANGELOG [ci skip] 2014-01-16 10:41:04 +08:00
Ricardo Quesada 9b490a9124 Sprite: removed _hasChildren 
_hasChildren has been replaced with !_children.empty()
 2014-01-15 18:37:07 -08:00
Ricardo Quesada ae84650713 Updates CHANGELOG 2014-01-15 16:09:38 -08:00
Ricardo Quesada f8dc8f0b38 Renderer performance fixes 
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
 2014-01-15 14:35:26 -08:00
Ricardo Quesada 4278f024b8 Console::log(format, va_args) is private 
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
 2014-01-15 11:17:21 -08:00
Ricardo Quesada c267c479db Performance Test fixes 
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
 2014-01-14 17:22:45 -08:00
James Chen 428afae8e9 Update CHANGELOG [ci skip] 2014-01-14 21:52:04 +08:00
James Chen 245fa2efe0 Update CHANGELOG [ci skip] 2014-01-10 15:19:32 +08:00
James Chen ffdfcfbefb Update CHANGELOG [ci skip] 2014-01-09 17:13:34 +08:00
James Chen 43a9c84cc2 Update CHANGELOG [ci skip] 2014-01-09 15:26:54 +08:00
James Chen 29cbd2bcc8 Update CHANGELOG [ci skip] 2014-01-09 11:29:36 +08:00
James Chen 8f12490df6 Update CHANGELOG [ci skip] 2014-01-09 10:52:19 +08:00
James Chen df18e86d86 Updates CHANGELOG [ci skip] 2014-01-08 10:57:27 +08:00
minggo e0b2d16a54 update changelog 2014-01-07 12:48:55 +08:00
Ricardo Quesada 11ad6cd974 Adds release date to CHANGELOG 2014-01-06 14:24:24 -08:00
James Chen 83028deca6 Update CHANGELOG [ci skip] 2014-01-04 12:02:11 +08:00
James Chen 233e0ab457 Update CHANGELOG [ci skip] 2014-01-04 11:50:35 +08:00
minggo 1caae52140 [ci skip] 2014-01-03 12:58:57 +08:00
minggo 93d724f408 [ci skip] 2014-01-03 10:41:26 +08:00
James Chen 1beb992157 Update CHANGELOG [ci skip] 2014-01-02 20:09:43 +08:00
James Chen 5bd580c175 Update CHANGELOG [ci skip] 2014-01-02 16:25:06 +08:00
James Chen 13cf67747a Update CHANGELOG [ci skip] 2014-01-02 09:58:05 +08:00
James Chen aff08adc66 Update CHANGELOG [ci skip] 2014-01-01 21:55:58 +08:00
James Chen e0af959cb4 Update CHANGELOG [ci skip] 2013-12-30 13:37:52 +08:00
James Chen b534442cf1 Update CHANGELOG [ci skip] 2013-12-30 10:15:10 +08:00
James Chen 6562608855 Update CHANGELOG [ci skip] 2013-12-27 20:12:52 +08:00
James Chen 2db35c5126 Update CHANGELOG [ci skip] 2013-12-27 16:32:24 +08:00
James Chen 48d3e8e334 Update CHANGELOG [ci skip] 2013-12-27 10:09:49 +08:00
James Chen dafaff0d83 Update CHANGELOG [ci skip] 2013-12-26 10:52:01 +08:00
James Chen d08cb63a82 Update CHANGELOG [ci skip] 2013-12-24 18:19:32 +08:00
James Chen 91ef6ea1e5 Update CHANGELOG [ci skip] 2013-12-24 15:57:39 +08:00
James Chen f573f1092c Update CHANGELOG [ci skip] 2013-12-24 14:27:25 +08:00
James Chen 5a6275f3cc Update CHANGELOG [ci skip] 2013-12-24 14:04:55 +08:00
James Chen e8f946c973 Update CHANGELOG [ci skip] 2013-12-20 21:06:05 +08:00
James Chen 8b6a6489fe Update CHANGELOG [ci skip] 2013-12-20 20:11:14 +08:00
James Chen 4fe74c84bc Update CHANGELOG [ci skip] 2013-12-20 16:15:02 +08:00
James Chen a40e47d227 Update CHANGELOG [ci skip] 2013-12-19 20:57:57 +08:00
James Chen 3a1ffca890 Update CHANGELOG [ci skip] 2013-12-16 17:46:38 +08:00
minggo d2ded2d780 [ci skip] 2013-12-16 15:28:47 +08:00
James Chen 229aa5433c Update CHANGELOG [ci skip] 2013-12-02 17:27:28 +08:00
minggo e4883fb105 [ci skip] 2013-12-02 10:19:39 +08:00
minggo d3076a1415 [ci skip] 2013-11-28 16:09:21 +08:00
James Chen 749fc5d95b Update CHANGELOG [ci skip] 2013-11-27 14:31:05 +08:00
James Chen c63698b488 Update CHANGELOG [ci skip] 2013-11-27 14:23:24 +08:00
James Chen 94c41ea51e Update CHANGELOG [ci skip] 2013-11-27 11:03:16 +08:00
minggo ba101809de [ci skip] 2013-11-26 17:49:50 +08:00
James Chen 95cda661f2 Update CHANGELOG [ci skip] 2013-11-20 10:02:54 +08:00
minggo 8fd0806716 [ci skip] 2013-11-19 10:28:08 +08:00
minggo c5d5f3dd64 update change log 2013-11-18 18:29:48 +08:00
James Chen 1d0e42deac Update CHANGELOG[ci skip] 2013-11-14 12:30:38 +08:00
minggo 063bc6b833 [ci skip] 2013-11-14 11:54:54 +08:00
minggo a2bfc31ea0 [ci skip] 2013-11-14 11:27:26 +08:00
minggo c1ccfc5cea [ci skip] 2013-11-14 10:41:09 +08:00
minggo 9b2da3b09f [ci skip] 2013-11-14 10:11:18 +08:00
minggo 71ca09d041 [ci skip] 2013-11-14 10:09:32 +08:00
minggo 39ec684ac8 [ci skip] 2013-11-13 15:32:22 +08:00
James Chen 0358eae8f0 Update CHANGELOG [ci skip] 2013-11-12 10:33:18 +08:00
James Chen 412712c5e4 Update CHANGELOG[ci skip] 2013-11-12 09:45:07 +08:00
minggo 00b477e756 [ci skip] 2013-11-11 15:11:28 +08:00
minggo d4f890a6ee [ci skip] 2013-11-08 11:01:16 +08:00
minggo 61970934a2 [ci skip] 2013-11-08 10:55:49 +08:00
minggo 21f8050a4d [ci skip] 2013-11-08 10:50:28 +08:00
minggo 6d0be761eb [ci skip] 2013-11-08 10:47:12 +08:00
minggo 3deb3b4231 [ci skip] 2013-11-06 17:52:03 +08:00
minggo c32628e930 [ci skip] 2013-11-06 14:19:08 +08:00
James Chen f2f7e61b07 Update CHNAGELOG[ci skip] 2013-11-05 16:04:06 +08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
James Chen 44bc52cf65 Update CHANGELOG [ci skip] 2013-11-03 15:36:05 +08:00
James Chen 23faae22ee UPDATE CHANGELOG[ci skip] 2013-11-02 22:16:07 +08:00
James Chen c0683410b3 update CHANGELOG [ci skip] 2013-11-02 22:13:01 +08:00
James Chen 01b6e972a0 Update CHANGELOG [ci skip] 2013-11-01 20:58:25 +08:00
James Chen eabb611093 Update CHANGELOG [ci skip] 2013-11-01 17:49:01 +08:00
minggo 5d931dab64 Update CHANGELOG 2013-10-30 18:31:59 +08:00
minggo df3ebf8451 Update CHANGELOG 2013-10-29 10:07:43 +08:00
minggo f2c229c722 Update CHANGELOG 2013-10-29 09:05:04 +08:00
James Chen f2584f9730 Update CHANGELOG 2013-10-24 18:04:13 +08:00
James Chen 7a1b6f2972 Update CHANGELOG 2013-10-22 16:33:41 +08:00
James Chen b56a9962a6 Update CHANGELOG 2013-10-22 15:32:44 +08:00
James Chen 7d588fbaa3 Update CHANGELOG 2013-10-18 11:15:02 +08:00
James Chen 28c627fcfa Update CHANGELOG 2013-10-17 15:38:24 +08:00
James Chen 7890efb24f Update CHANGELOG [ci skip] 2013-10-11 18:23:16 +08:00
James Chen eb9f009c73 Update CHANGELOG [ci skip] 2013-10-11 15:16:30 +08:00
James Chen fa51236dee Update CHANGELOG[ci skip] 2013-10-10 14:40:30 +08:00
James Chen a02b2b6834 Update CHANGELOG [ci skip] 2013-10-10 13:55:22 +08:00
James Chen 78e3624b0b Update CHANGELOG[ci skip] 2013-10-10 11:15:22 +08:00
James Chen e3b30b221b Update CHNAGELOG [ci skip] 2013-10-09 17:06:55 +08:00
James Chen e03dd0714e Update CHANGELOG [ci skip] 2013-10-09 16:59:36 +08:00
minggo cd9689da1a [ci skip] 2013-10-09 11:27:12 +08:00
minggo 3548d46b38 [ci skip] 2013-10-09 10:17:17 +08:00
Ricardo Quesada 06ff62662c Updates CHANGELOG with the new misc changes 2013-09-25 13:05:17 -07:00
minggo 84a8160554 [ci skip] 2013-09-24 10:10:05 +08:00
minggo f941cee694 [ci skip] 2013-09-24 10:03:39 +08:00
Ricardo Quesada 769a7ea1ed Logs when software decoder is being used 
Logs when software decoder is being used in `Image`
 2013-09-23 17:03:28 -07:00
Ricardo Quesada f4df2b5aa0 Improved changelog 2013-09-19 19:15:49 -07:00
minggo d31a81cb15 update changelog 2013-09-16 22:08:38 +08:00
minggo 600d647851 update CHANGELOG 2013-07-30 09:28:39 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
minggo 31e7456af5 update changelog [ti ignore] 2013-06-10 23:58:21 +08:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed 
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
 2013-06-05 17:51:40 -07:00
minggo 0bc13fc088 fix some typos 2013-04-28 23:22:51 +08:00
minggo 660509277b update changelog 2013-04-28 15:25:05 +08:00
minggo 46c318185e update changelog 2013-03-20 17:57:11 +08:00
minggo d5523be808 fix some repo 2013-01-28 19:44:07 +08:00
minggo 846f054694 update changelog 2013-01-28 15:22:48 +08:00
minggo b961f2a439 update CHANGELOG 2012-12-04 14:44:11 +08:00
minggo d064947c16 Update CHANGELOG 2012-11-02 16:16:12 +08:00
minggo 6f6345d3a6 update CHANGELOG 2012-11-02 11:23:50 +08:00
minggo 19d29287b9 update changelog 2012-11-01 17:40:00 +08:00
minggo 25d3f4215f update AUTHORS and CHANGELOG 2012-09-26 16:04:22 +08:00
minggo 1e950ed445 update CHANGELOG 2012-09-26 15:31:32 +08:00
minggo d5565eeceb update AUTHORS and CHANGELOG 2012-08-28 14:03:00 +08:00
minggo 7348fa12c3 update CHANGELOG and delete some unneeded files 2012-06-28 11:47:54 +08:00
minggo 30fedb78d5 update changelog 2012-05-31 11:07:08 +08:00
minggo 9dc10741b2 add a message to changelog and fix some typo error 2012-03-05 10:52:11 +08:00
minggo e3bc4471ff update authors, changelog 2012-03-02 15:39:03 +08:00
minggo fc44e1b778 update CHANGELOG 2012-01-12 19:29:08 +08:00
Walzer e14a3f52ad changelog of 0.10.0 2011-12-02 10:36:58 +08:00
Walzer 8179d79061 update ChangeLog & Authors for v0.9.2 2011-10-20 17:49:43 +08:00
Walzer 82afec843b changelog & authors for 0.9.1 2011-08-17 20:12:46 +08:00
Walzer b3538884ea fix typo in authors & changelog 2011-07-13 22:36:37 +08:00
Walzer 3348698b6c changelog of 1.0.0-x-0.9.0 2011-07-13 18:10:05 +08:00
Walzer b72641608c update changelog for 0.8.5 2011-06-28 14:45:32 +08:00
Walzer 7761ab374c changelog for 0.8.5 2011-06-28 14:04:05 +08:00
Walzer 409260c002 fix typo in changelog 2011-06-09 17:08:20 +08:00
Walzer 608e6961c8 changelog for 0.8.4 2011-05-30 14:22:49 +08:00
Walzer 56a1849e9f changelog for 0.8.3 2011-05-12 23:52:51 +08:00
walzer 4c528108c9 changelog for 0.8.2 2011-04-08 14:08:59 +08:00
walzer d4cfe30df8 CHANGELOG of 0.8.2 2011-04-07 16:08:10 +08:00
walzer 8b780aaac9 0.8.1 changlog, text alignment 2011-03-21 18:19:36 +08:00
walzer 95c1e98ff3 0.8.1 changelog, add bug 419 2011-03-21 17:35:25 +08:00
walzer d6594e7548 0.8.1 changelog 2011-03-21 15:59:37 +08:00
walzer 15e8ab9782 CHANGELOG for 0.8.0 2011-03-15 16:48:25 +08:00
walzer fddbfd85b3 0.8.0 changelog 2011-03-15 16:18:32 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
walzer e92ae19482 changelog for 0.99.5-x-0.7.2 2011-01-26 17:56:06 +08:00
Walzer ca7e4aa296 add WARNING into changelog, cocos2d-android-ndk isn't ready for game development. 2010-12-20 23:27:18 +08:00
Walzer 8f7650c2fc add changelog for version 0.7.1 2010-12-20 23:07:09 +08:00
Walzer 42c2acc6ba CHANGELOG for cocos2d-0.99.4-x-0.7.0 2010-11-29 15:36:18 +08:00
Walzer 6afe5752f2 rename directories 2010-11-18 12:32:01 +00:00
Walzer b50f19e56b issue #155, template code on vs2008 & license declaration 2010-09-30 23:35:28 +00:00