Commit Graph

20870 Commits

Author SHA1 Message Date
minggo f1ea2e9332 [ci skip] 2014-06-19 22:13:27 +08:00
minggo 9f0a566b8a Merge pull request from John-He-928/mingw-build
Fix MinGW build
2014-06-19 22:08:28 +08:00
minggo 079e612ef2 [ci skip] 2014-06-19 22:07:25 +08:00
minggo 44e8df0ec6 [ci skip] 2014-06-19 22:05:52 +08:00
minggo e374bd67c7 Merge pull request from hanjukim/skip-utf8-bom
Skip UTF8 BOM if it exists and bug fix for unterminated string
2014-06-19 22:02:38 +08:00
minggo 7d05249490 Merge pull request from CocosRobot/update_cocosfiles_1403186228
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 21:57:57 +08:00
CocosRobot ffb96092fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:57:10 +00:00
minggo 4fa86ae6ce Merge pull request from CocosRobot/update_lua_bindings_1403185113
[AUTO]: updating luabinding automatically
2014-06-19 21:42:33 +08:00
CocosRobot 62e2580e48 [AUTO]: updating luabinding automatically 2014-06-19 13:40:08 +00:00
minggo 36e5b579fc Merge pull request from CocosRobot/update_lua_bindings_1403184170
[AUTO]: updating luabinding automatically
2014-06-19 21:25:58 +08:00
minggo a8328f1254 Merge pull request from CocosRobot/update_cocosfiles_1403184246
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 21:25:45 +08:00
CocosRobot a3bee308f6 [AUTO]: updating luabinding automatically 2014-06-19 13:24:36 +00:00
CocosRobot 54b2a15886 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-19 13:24:14 +00:00
minggo af88cf053b Merge pull request from samuele3hu/v3_fix
Add bytecode and encrypted files test cases for Lua
2014-06-19 21:20:05 +08:00
minggo c28c050c79 Merge pull request from CocosRobot/update_lua_bindings_1403182654
[AUTO]: updating luabinding automatically
2014-06-19 21:05:34 +08:00
minggo 0d07e19cd1 Merge pull request from 2youyouo2/v3
add TimelineAction
2014-06-19 21:05:15 +08:00
CocosRobot d97401cdb1 [AUTO]: updating luabinding automatically 2014-06-19 13:00:05 +00:00
minggo 190d6d4859 Merge pull request from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
2014-06-19 20:56:10 +08:00
minggo cdbd3508d4 Merge pull request from zawasp/uniform_struct
fix warning Uniform is struct, not class.
2014-06-19 20:55:37 +08:00
minggo 87a89bfaa2 Merge pull request from minggo/v3
revert binding-generators to correct commit
2014-06-19 20:53:41 +08:00
minggo 2f959a3f87 [ci skip] 2014-06-19 20:48:45 +08:00
minggo 7553060ba7 Merge pull request from gin0606/addNewLineAtTheEndOfFileCpp
[ci skip]Add new line at the end of a file to *.[cpp|h]
2014-06-19 20:47:17 +08:00
minggo 72465a362e Merge pull request from gin0606/addNewLineAtTheEndOfFile
add new line at the end of a file to *.mk
2014-06-19 20:45:57 +08:00
gin0606 79f82b00bc Add new line at the end of a file to *.mm 2014-06-19 20:48:50 +09:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
gin0606 2c837b0960 add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
minggo bfed48f0ff revert binding-generators to correct commit 2014-06-19 17:42:50 +08:00
minggo 6d80de181a revert binding-generators to correct commit 2014-06-19 17:39:14 +08:00
Mircea Rila 69f1bb6193 fix warning Uniform is struct, not class. 2014-06-19 11:46:00 +03:00
minggo b042f28ccd Merge pull request from minggo/v3
revert bindings-generator submodule
2014-06-19 16:04:13 +08:00
minggo 07d86d40ef revert bindings-generator submodule 2014-06-19 16:03:19 +08:00
minggo a549fdccdc Merge pull request from samuele3hu/v3_keypad_fix
Update bindings-generator
2014-06-19 15:28:43 +08:00
CocosRobot c638cb8816 [AUTO]: updating luabinding automatically 2014-06-19 07:22:49 +00:00
minggo 1a241ca350 Merge pull request from minggo/orrderOfArrival
not set _orderOfArrival to 0 after visit
2014-06-19 15:17:55 +08:00
minggo 136033c282 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
minggo cecd96105e Merge pull request from natural-law/v3
Update the reference of submodule cocos2d-console.
2014-06-19 14:49:20 +08:00
zhangbin bd6aed8a7b Update the reference of submodule cocos2d-console. 2014-06-19 14:47:16 +08:00
samuele3hu 477816e883 update bindings-generator submodule 2014-06-19 14:42:09 +08:00
samuele3hu 46ce1c917d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-19 14:37:00 +08:00
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
minggo dff3feeeb7 Merge pull request from natural-law/v3
Modify the lua runtime template for prebuilt engine.
2014-06-19 11:49:04 +08:00
zhangbin 3b19b07915 Modify the lua runtime template for prebuilt engine. 2014-06-19 11:33:39 +08:00
minggo 56777e6d61 [ci skip] 2014-06-19 09:47:01 +08:00
minggo e60e3c217d Merge pull request from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
2014-06-19 09:44:51 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
minggo 719c8995cf Merge pull request from natural-law/v3
Remove the debug symbols for release mode in xcode projects.
2014-06-18 17:10:34 +08:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
2014-06-18 17:06:56 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
minggo a587931ce3 Merge pull request from minggo/windows-fix
fix compiling error on windows
2014-06-18 14:14:39 +08:00