Commit Graph

185 Commits

Author SHA1 Message Date
É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