Ricardo Quesada
6a12c01427
Merge pull request #6581 from CocosRobot/update_lua_bindings_1399334264
...
[AUTO]: updating luabinding automatically
2014-05-05 17:06:03 -07:00
CocosRobot
5db3fa8df0
[AUTO]: updating luabinding automatically
2014-05-05 23:58:54 +00:00
Ricardo Quesada
666e820a2a
Merge pull request #6580 from ricardoquesada/sprite_new_fixes
...
Revert `new Sprite` change done a few days ago
2014-05-05 16:54:50 -07:00
Ricardo Quesada
e413b86295
Revert `new Sprite` change done a few days ago
...
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
2014-05-05 16:53:37 -07:00
Ricardo Quesada
80ecdc8d2a
Merge pull request #6578 from ricardoquesada/particles_without_texture
...
Particles can be created without texture
2014-05-05 15:51:26 -07:00
Ricardo Quesada
0e6dd9afe5
Particles can be created without texture
...
Needed for complex particles like in EarthWarrior3D
2014-05-05 15:50:08 -07:00
Dale Stammen
8b5d255296
removed obsolete include files
2014-05-05 13:52:20 -07:00
Dale Stammen
12daf49900
added missing Assets folder
2014-05-05 13:48:31 -07:00
Dale Stammen
703c6c2b39
added missing Assets folder
2014-05-05 13:47:43 -07:00
Dale Stammen
9a05e86ab6
updated missing files
2014-05-05 13:26:28 -07:00
Dale Stammen
78204c7c91
removed obsolete headers
2014-05-05 13:25:57 -07:00
Tom Whittock
a587da13fc
Lua template should fail to launch on lua error
...
Without this change, the app continues to run, attempts to access the
badly-initialised scene and issues more error messages. This causes
further errors every frame, covering up the original error in the output
2014-05-05 13:12:42 +01:00
andyque
0d9d2a57dc
issue #3861 . fix a indent problem
2014-05-05 17:54:21 +08:00
andyque
34b3114e55
issue #3861 . add license to CCEventFocus and CCEventListenerFocus
2014-05-05 17:49:31 +08:00
andyque
cb5b2a4f85
issue #4861 , Merge branch 'v3' into focus3861
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
James Chen
e31a75afba
Update README.md, update branch for travis build status
2014-05-05 15:56:51 +08:00
James Chen
3cac26ab53
Merge pull request #6573 from dumganhar/v3
...
Adds submodule for CocoStudio resources (70+MB)
2014-05-05 15:39:17 +08:00
James Chen
67b2fbf14b
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
James Chen
399f5cf721
Adds submodule for CocoStudio resources (70MB)
2014-05-05 15:11:35 +08:00
James Chen
097f99accd
Merge pull request #6572 from CocosRobot/update_cocosfiles_1399268435
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 13:41:08 +08:00
CocosRobot
897b3c61ce
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 05:40:36 +00:00
James Chen
5627f770a1
Merge pull request #6571 from dumganhar/re-add-res
...
'external' folder is a submodule now, re-added resources for cpp-tests and lua-tests except large files
2014-05-05 13:39:11 +08:00
James Chen
b5ee4036f2
Removes download-deps.py, using `git submodule update --init` to get the
...
external libraries. Thanks.
2014-05-05 13:33:20 +08:00
James Chen
d82e03b048
Xcode project fix
2014-05-05 13:31:38 +08:00
James Chen
e16d6fa63f
Re-adds resources in cpp-tests and lua-tests, but removes some large
...
files. We need to reuse some resources when doing some tests.
2014-05-05 13:27:47 +08:00
James Chen
6c1791eae6
Updates travis-script, removed using download-deps.py now, 'external' is
...
a submodule module now. please use `git submodule update --init` to
fetch it.
2014-05-05 13:14:28 +08:00
James Chen
12d77b2f7f
Adds external submodule
2014-05-05 13:14:05 +08:00
James Chen
0f36374d86
Removed external folder
2014-05-05 13:04:53 +08:00
gin0606
dd8d932c0a
Upgrade build_native.py to take variable number of arguments
2014-05-05 12:48:51 +09:00
andyque
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
andyque
afb65bbebd
issue #4861 , fix widget query method
2014-05-05 11:37:39 +08:00
andyque
503be87675
issue #4861 . refactor UILayout to search widget by index
2014-05-05 11:37:39 +08:00
andyque
852191a928
issue #4861 , improve the horizontal layout test
2014-05-05 11:37:39 +08:00
andyque
0dc224a123
issue #4861 . fix android compile error
2014-05-05 11:37:39 +08:00
andyque
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
andyque
9383900123
issue #4861 . cleanup some code of UILayout and UIWidget
2014-05-05 11:37:39 +08:00
andyque
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
andyque
47acbc24e0
issue #4861 , add CCEventFocus and CCEventListener
2014-05-05 11:37:38 +08:00
andyque
b35ddfe5b5
issue #4861 , add focus functionality into Widget class
2014-05-05 11:37:38 +08:00
andyque
1dee81a166
issue #4861 , refactor setFocused into setHilighted
2014-05-05 11:37:38 +08:00
James Chen
aa74717c58
Merge pull request #6569 from dumganhar/download-progress
...
Updates download-deps.py, invalid content header check
2014-05-05 02:07:24 +08:00
James Chen
6b62a39140
Updates download-deps.py, invalid content header check
2014-05-05 02:06:16 +08:00
James Chen
417b8e8e5a
Merge pull request #6568 from CocosRobot/update_cocosfiles_1399225034
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 01:38:25 +08:00
CocosRobot
e32647ec88
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-04 17:37:16 +00:00
James Chen
b624fe5afb
Merge pull request #6567 from dumganhar/v3
...
Adds download progress for download-deps.py and adds some missing files
2014-05-05 01:34:56 +08:00
James Chen
530efbca7e
Reverts files for winrt project
2014-05-05 01:33:22 +08:00
James Chen
daf37b733a
Re-adds missing luajit sources.
2014-05-05 01:31:52 +08:00
James Chen
ca873a1dd1
Adds download progress for download-deps.py
2014-05-05 01:06:33 +08:00
James Chen
363b588c18
Merge pull request #6565 from dumganhar/v3
...
Small bug fix in download-deps.py
2014-05-05 00:18:32 +08:00
James Chen
ac2ff7bd28
Updates .gitignore
2014-05-05 00:16:06 +08:00