lvlonggame
|
23df00b0b9
|
Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3
|
2015-02-01 21:17:12 +08:00 |
lvlonggame
|
4c65332550
|
add project function to camera
|
2015-02-01 21:14:37 +08:00 |
lvlong
|
57970da398
|
Do some optimize
|
2015-01-27 15:50:05 +08:00 |
lvlong
|
bb419719aa
|
fix bug: about caching uniform.
|
2015-01-26 18:40:00 +08:00 |
lvlong
|
662117e878
|
mtlPath
|
2015-01-22 17:33:24 +08:00 |
lvlong
|
c5f955466a
|
fixbug: load obj file's material.
|
2015-01-22 17:28:35 +08:00 |
XiaoYang
|
15904fda0a
|
Merge pull request #219 from lvlonggame/v3
modify function description.
|
2015-01-20 15:18:46 +08:00 |
lvlong
|
7934d36e24
|
modify function description.
|
2015-01-20 10:46:00 +08:00 |
XiaoYang
|
f84c58c4ea
|
Merge pull request #215 from lvlonggame/v3
fix bug: animate3D & sequence
|
2015-01-19 11:01:24 +08:00 |
lvlong
|
fc0c4bae7a
|
modify by colleague for cocostudio.
|
2015-01-16 13:23:03 +08:00 |
XiaoYang
|
1eb4a06f14
|
Merge pull request #217 from songmiao/626_v3
change camera position
|
2015-01-16 09:51:29 +08:00 |
songmiao
|
147506f662
|
change camera position
|
2015-01-15 15:53:19 +08:00 |
lvlong
|
6d7b530ea1
|
fix bug: add animate3D to sequence problem.
|
2015-01-15 11:32:28 +08:00 |
lvlong
|
9abc5b7e82
|
fix bug: sequence action speed
|
2015-01-14 10:40:47 +08:00 |
yangxiao
|
772813e810
|
modify wrong word
|
2015-01-14 09:36:22 +08:00 |
XiaoYang
|
ab7eb694c0
|
Merge pull request #209 from lvlonggame/v3
wrong words
|
2015-01-14 09:17:47 +08:00 |
lvlonggame
|
5c424194b9
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
|
2015-01-13 20:59:46 +08:00 |
lvlong
|
8f16728514
|
wrong words
|
2015-01-13 18:00:20 +08:00 |
XiaoYang
|
1fb89c3aff
|
Merge pull request #206 from songmiao/626_v3
add fog test and arcball camera test
|
2015-01-09 15:35:23 +08:00 |
songmiao
|
9de5371202
|
fix bug and add notes
|
2015-01-09 10:23:40 +08:00 |
songmiao
|
71820e6db1
|
add notes, deal with opengl shader in windows device, fix bug
|
2015-01-08 15:16:47 +08:00 |
lvlonggame
|
9647307823
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
|
2015-01-07 21:49:08 +08:00 |
songmiao
|
dfa6137ce9
|
modify arcball and fog shader
|
2015-01-07 17:58:10 +08:00 |
songmiao
|
41cd946e27
|
modify fog shader format and notes
|
2015-01-07 15:47:27 +08:00 |
songmiao
|
c522a72f66
|
modify fog shader for ios device
|
2015-01-07 14:56:34 +08:00 |
songmiao
|
d1845f89fe
|
add fog test and arcball camera test
|
2015-01-07 11:47:34 +08:00 |
XiaoYang
|
f6065586b9
|
Merge pull request #205 from lvlonggame/v3
fix bug
|
2015-01-07 11:39:12 +08:00 |
lvlong
|
f9b0c9bc92
|
fix bug.
|
2015-01-07 11:09:09 +08:00 |
yangxiao
|
c320bd46dd
|
add node quaternion to changelog
|
2015-01-05 17:42:36 +08:00 |
minggo
|
c7508bb1c6
|
Merge pull request #9783 from doomsdayer/v3
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
|
2015-01-05 15:11:22 +08:00 |
minggo
|
82db989432
|
[ci skip] Update CHANGELOG
|
2015-01-05 14:30:58 +08:00 |
minggo
|
4b2375e28c
|
Merge pull request #9794 from htlxyz/v3_origin
modify event register function name
|
2015-01-05 14:22:53 +08:00 |
minggo
|
ef5076983d
|
Merge pull request #9792 from minggo/memory-leak
fix memory leak
|
2015-01-05 14:20:49 +08:00 |
htl
|
c4cc6b5c34
|
modify event register function name
|
2015-01-05 14:19:27 +08:00 |
minggo
|
bc639acbf6
|
Merge pull request #9793 from htlxyz/v3_origin
modify node register event interface
|
2015-01-05 14:19:10 +08:00 |
htl
|
d754900b28
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin
|
2015-01-05 14:07:37 +08:00 |
htl
|
f82404f9c9
|
modify node register event interface
|
2015-01-05 14:02:29 +08:00 |
minggo
|
ab2b1976a0
|
[ci skip] Update CHANGELOG
|
2015-01-05 13:57:38 +08:00 |
minggo
|
1f271a3668
|
Merge pull request #9786 from dabingnn/v3_fixGLProgramLogCrash
fix GLProgram log crash on windows
|
2015-01-05 13:56:05 +08:00 |
Huabing.Xu
|
8dde42b66a
|
code adjust, delay deprecated flag specification
|
2015-01-05 13:52:22 +08:00 |
minggo
|
f155386f05
|
fix memory leak
|
2015-01-05 13:49:47 +08:00 |
minggo
|
7407105f24
|
Merge pull request #9791 from yinjimmy/runtime
update google analytics tid
|
2015-01-05 13:37:29 +08:00 |
yusheng.lu
|
ec540fcaa2
|
Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader
|
2015-01-05 13:26:46 +08:00 |
yinjimmy
|
d4681c1150
|
update google analytics tid
|
2015-01-05 12:15:52 +08:00 |
yusheng.lu
|
8415f10498
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-01-05 11:57:18 +08:00 |
minggo
|
acffd1ca65
|
Merge pull request #9771 from andyque/fixLinuxCompile
fix linux compile error
|
2015-01-05 11:28:35 +08:00 |
Huabing.Xu
|
63e6557165
|
fix GLProgram log crash on windows
|
2015-01-04 21:51:22 +08:00 |
yusheng.lu
|
7e8d1bb74c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-01-04 19:13:20 +08:00 |
yusheng.lu
|
a7fb75dc7d
|
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
|
2015-01-04 19:12:19 +08:00 |
andyque
|
412e76a626
|
add fixme
|
2015-01-04 15:16:22 +08:00 |