Ricardo Quesada
|
77c03fcf11
|
ShaderCache -> GLProgramCache
|
2014-05-09 18:39:25 -07:00 |
Ricardo Quesada
|
62d9c24518
|
moves shaders files from 2d/ to renderer/
|
2014-05-08 18:01:48 -07:00 |
Ricardo Quesada
|
51f498fc94
|
fixed deprecation warnings
|
2014-05-08 16:42:36 -07:00 |
Ricardo Quesada
|
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 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
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 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
andyque
|
f5795c25b6
|
remove warnings under win32
|
2014-03-24 10:12:40 +08:00 |
James Chen
|
177bf4df9d
|
Some warning fixes.
|
2014-03-14 15:38:43 +08:00 |
Ricardo Quesada
|
78fdabe926
|
more cleanup in TMX code
|
2014-02-07 18:33:30 -08:00 |
Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
0cbbfdba8c
|
closed #2050: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
cocos/2d/CCTMXLayer.cpp
|
2013-12-23 15:40:33 +08:00 |
boyu0
|
baf8cb06c5
|
issue #2050: delete max/minGID, fix firstGID bug
|
2013-12-23 10:37:46 +08:00 |
boyu0
|
19e1609c27
|
issue #2050: unsigned int to int
|
2013-12-20 09:50:53 +08:00 |
Ricardo Quesada
|
59fee6b8d2
|
replaces std::for_each with for()
replaces `std::for_each` with C++11 `for( : )`
|
2013-12-19 13:34:41 -08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
James Chen
|
d16fa07661
|
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
|
2013-12-17 17:45:29 +08:00 |
James Chen
|
189cf1a076
|
Some fixes for XXX:getDescription.
|
2013-12-13 16:51:57 +08:00 |
James Chen
|
bb5ef615dd
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
Conflicts:
cocos/2d/CCSpriteBatchNode.h
|
2013-12-13 16:44:22 +08:00 |
James Chen
|
7a8f2ae235
|
size_t —> ssize_t in CCTMXLayer.cpp
|
2013-12-13 16:41:03 +08:00 |
Ricardo Quesada
|
a8c317bd83
|
getDescription() works as expected
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
|
2013-12-12 14:30:22 -08:00 |
minggo
|
1e9c763b40
|
use ssize_t for index and capacity
|
2013-12-12 14:48:26 +08:00 |
minggo
|
fa7c97171b
|
fix some warnings
|
2013-12-06 16:32:06 +08:00 |
James Chen
|
499a0404d4
|
issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector.
|
2013-12-05 10:35:10 +08:00 |
James Chen
|
76896d70d0
|
issue #2790: Android build was ok, fixes some warnings.
|
2013-12-04 16:02:54 +08:00 |
James Chen
|
4ec6e50cc4
|
issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
|
2013-12-04 16:02:52 +08:00 |
James Chen
|
1d5984b29a
|
issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach
|
2013-12-04 16:01:02 +08:00 |
James Chen
|
90062b656d
|
issue #2790: Node::_children is Vector<Node*> now.
|
2013-12-04 16:00:17 +08:00 |
Ricardo Quesada
|
d590986e73
|
Constructors are protected
|
2013-11-13 15:55:36 -08:00 |
Huabing.Xu
|
99bcca0532
|
issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
|
2013-11-07 19:11:09 +08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |