minggo
|
d95d8d98e3
|
Merge pull request #9672 from CocosRobot/update_lua_bindings_1419817593
[AUTO]: updating luabinding automatically
|
2014-12-29 10:03:00 +08:00 |
minggo
|
212684fcd4
|
Merge pull request #9665 from andyque/fixLibpngWarning
Fix libpng warning
|
2014-12-29 10:00:43 +08:00 |
minggo
|
06cd28f524
|
Merge pull request #9618 from yinjimmy/bindAddress
support bind address for console
|
2014-12-29 09:52:01 +08:00 |
CocosRobot
|
4172e7ad7f
|
[AUTO]: updating luabinding automatically
|
2014-12-29 01:49:00 +00:00 |
minggo
|
9c5df0a5cf
|
Merge pull request #9671 from CocosRobot/update_cocosfiles_1419817500
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-29 09:48:46 +08:00 |
minggo
|
206aa94ff2
|
Merge pull request #9667 from SunLightJuly/fix_crash_when_display_FPS
fixed bug which caused crash when display FPS
|
2014-12-29 09:45:30 +08:00 |
CocosRobot
|
0a4785d6fc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-29 01:45:01 +00:00 |
minggo
|
b01b25e17e
|
Merge pull request #9558 from super626/frustum
Frustum Culling
|
2014-12-29 09:43:14 +08:00 |
minggo
|
ae416decd4
|
Merge pull request #9659 from misoclub/v3
README typo
|
2014-12-29 09:42:33 +08:00 |
minggo
|
a8ac3df48c
|
Merge pull request #9651 from CocosRobot/update_lua_bindings_1419581293
[AUTO]: updating luabinding automatically
|
2014-12-29 09:17:15 +08:00 |
minggo
|
2b0e287b5f
|
Merge pull request #9656 from geron-cn/v3_actionline_animationlist
fix: auto add search path for armaturenodereader
|
2014-12-29 09:17:01 +08:00 |
yinjimmy
|
e75d283455
|
1. do not setFrameSize when resetDesignResolution
2. read config.json when ConfigParser init
|
2014-12-29 09:16:07 +08:00 |
dualface
|
a4d17998d3
|
update lua-template-runtime
|
2014-12-29 05:55:56 +08:00 |
dualface
|
2ba25a473f
|
update lua-default-template
|
2014-12-29 05:51:49 +08:00 |
dualface
|
8d99d8a78e
|
fix typo
|
2014-12-29 05:47:37 +08:00 |
dualface
|
9684d6e164
|
update corelib
|
2014-12-29 05:41:13 +08:00 |
dualface
|
74daae1c39
|
update framework
|
2014-12-29 01:58:16 +08:00 |
pandamicro
|
1e32d0fb80
|
Added getSearchPaths API in Manifest
|
2014-12-28 11:55:31 +08:00 |
pandamicro
|
e3795c0223
|
Added restart game feature
|
2014-12-28 11:55:06 +08:00 |
SunLightJuly
|
4d08128e89
|
fixed bug which caused crash when display FPS: the value of "_secondsPerFrame" of Director was not be Initialized
|
2014-12-27 22:05:29 +08:00 |
andyque
|
13032be21d
|
fix hd png file warning
|
2014-12-27 20:59:37 +08:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
dualface
|
cc3021467f
|
add more usable functions
|
2014-12-27 15:31:31 +08:00 |
dualface
|
46a0ad11ac
|
update lua corelib
|
2014-12-27 11:59:14 +08:00 |
naito
|
8b5e06b5a0
|
README typo
|
2014-12-27 10:17:26 +09:00 |
yinjimmy
|
4280ffcf58
|
add new lua runtime
|
2014-12-27 02:21:55 +08:00 |
yinjimmy
|
4567cf1c40
|
Fix: Address family not supported by protocol
|
2014-12-26 21:04:49 +08:00 |
geron-cn
|
b25e307dee
|
fix add search path for armaturenodereader
|
2014-12-26 18:27:47 +08:00 |
XiaoYang
|
8b95c591b1
|
Merge pull request #189 from songchengjiang/v3
read AABB from file(v0.6+)
|
2014-12-26 16:15:56 +07:00 |
lite3
|
b102587590
|
fix incorrect font path
|
2014-12-26 16:20:04 +08:00 |
yangxiao
|
afb01dcd9a
|
config linux
|
2014-12-26 16:19:02 +08:00 |
CocosRobot
|
f8b1b34025
|
[AUTO]: updating luabinding automatically
|
2014-12-26 08:10:13 +00:00 |
minggo
|
f01cc596a3
|
Merge pull request #9637 from geron-cn/v3_actionline_animationlist
V3 actiontimeline animationlist
|
2014-12-26 16:05:49 +08:00 |
yinjimmy
|
5bcd3d9a00
|
bind address is available for all platform
|
2014-12-26 16:02:24 +08:00 |
yangxiao
|
b0a6720cb2
|
reset auto lua, fix #9515
|
2014-12-26 15:52:27 +08:00 |
yangxiao
|
25ce54b43b
|
reset
|
2014-12-26 15:46:45 +08:00 |
minggo
|
275de89746
|
Merge pull request #9650 from pipu/update_checkboxreader
Update that parse plist for CheckBoxReader.
|
2014-12-26 15:43:30 +08:00 |
minggo
|
84a88f4f76
|
Merge pull request #9649 from minggo/fileutil-extend
make FileUtils extendable
|
2014-12-26 15:37:51 +08:00 |
sifenzhu
|
cd2dc03d87
|
Merge pull request #2 from super626/v3
get
|
2014-12-26 14:47:40 +08:00 |
minggo
|
42e6232113
|
fix typo and memory leak
|
2014-12-26 14:25:55 +08:00 |
pipu
|
bc18bafaa7
|
Update that parse plist for CheckBoxReader.
|
2014-12-26 14:18:28 +08:00 |
XiaoYang
|
1a5b2690db
|
Merge pull request #194 from lvlonggame/frustum
merge cocos2d-x
|
2014-12-26 13:13:53 +07:00 |
minggo
|
9212520363
|
Merge pull request #9648 from CocosRobot/update_lua_bindings_1419561514
[AUTO]: updating luabinding automatically
|
2014-12-26 13:57:24 +08:00 |
lvlong
|
f592671df6
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
|
2014-12-26 13:42:13 +08:00 |
lvlong
|
fdb498a8d2
|
camera test
|
2014-12-26 13:37:02 +08:00 |
minggo
|
94d70358b7
|
make FileUtils extendable
|
2014-12-26 11:34:31 +08:00 |
CocosRobot
|
a30d606fe6
|
[AUTO]: updating luabinding automatically
|
2014-12-26 02:40:22 +00:00 |
minggo
|
9e8582e01a
|
Merge pull request #9643 from CocosRobot/update_lua_bindings_1419557440
[AUTO]: updating luabinding automatically
|
2014-12-26 10:35:53 +08:00 |
minggo
|
564b9f0aef
|
Merge pull request #9635 from super626/sync_load
ReleaseNote for Sprite3D::createAsync
|
2014-12-26 09:37:19 +08:00 |
minggo
|
696e2ffad8
|
[ci skip] Update CHANGELOG
|
2014-12-26 09:33:41 +08:00 |