James Chen
|
f95d1677df
|
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry
|
2013-01-04 09:52:01 +08:00 |
James Chen
|
437ed36bd6
|
Updated the project configuration for HelloCpp and HelloLua.
|
2013-01-04 09:51:08 +08:00 |
fape
|
94471a06b6
|
rename and add commandline argument to cccopy.py
|
2013-01-03 20:52:22 +01:00 |
fape
|
e34f190f36
|
add SimpleGame Marmalade config files
|
2013-01-03 15:20:58 +01:00 |
fape
|
f3f67f62e1
|
.gitignores moved
|
2013-01-03 15:16:11 +01:00 |
fape
|
3c89bf1d83
|
marmalade TestLua: add postbuild script to copy resources
|
2013-01-03 14:47:57 +01:00 |
James Chen
|
90960cce57
|
Merge pull request #1813 from dumganhar/gles20
Fixed a compilation error for android.
|
2013-01-03 04:00:54 -08:00 |
James Chen
|
b50bf716a2
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-03 19:58:10 +08:00 |
James Chen
|
760a8c1d39
|
fix a compilation error for android.
|
2013-01-03 19:56:34 +08:00 |
James Chen
|
94e779ae63
|
Merge pull request #1806 from fape/marmalade_third_party_cleanup
fixed #1629: Marmalade third party cleanup.
|
2013-01-02 21:24:44 -08:00 |
Dale Ducharme
|
611db78b39
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-02 18:53:31 -05:00 |
James Chen
|
57906b368e
|
Merge pull request #1808 from wanbin/gles20
fixed #1603: The script of creating android project has a wrong file path.
|
2012-12-31 21:36:09 -08:00 |
wanbin
|
986f332b29
|
create android project has a error file path
|
2013-01-01 13:18:10 +08:00 |
fape
|
29a2f273b1
|
reorganize third party libs
|
2012-12-29 23:56:14 +01:00 |
fape
|
4421b6bf7a
|
remove unused libs
|
2012-12-29 23:53:39 +01:00 |
dualface
|
e74e597dba
|
[luabinding] fix CCAssert Lua compatibility
|
2012-12-30 02:27:25 +08:00 |
James Chen
|
0ee9cf027b
|
Merge pull request #1803 from dumganhar/iss1627-vs2012
fixed #1627: VS version check in project file.
|
2012-12-28 22:54:04 -08:00 |
James Chen
|
d2ad820a48
|
fixed #1627: Adding view name for sample applications.
|
2012-12-29 14:50:00 +08:00 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
James Chen
|
b5c08c9e1c
|
Merge pull request #1802 from dualface/lua_add_ccdirector_setdisplaystats
fixed #1626: [luabinding] added CCDirector::setDisplayStats().
|
2012-12-28 19:36:32 -08:00 |
James Chen
|
b120874a87
|
fix compilation errors.
|
2012-12-29 11:23:31 +08:00 |
dualface
|
d1e39a9c00
|
[luabinding] add CCDirector::setDisplayStats()
|
2012-12-29 11:16:07 +08:00 |
Tomoaki Shimizu
|
1293c8a6c2
|
added licence
|
2012-12-29 11:32:27 +09:00 |
James Chen
|
f2f3aa55bf
|
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
|
2012-12-29 09:48:22 +08:00 |
Tomoaki Shimizu
|
b4edd167af
|
The variable name was changed.The check of pRet was added.
|
2012-12-28 12:24:28 +09:00 |
Tomoaki Shimizu
|
87146d82e1
|
Added CCFloat, CCDouble and CCBool
|
2012-12-27 23:15:13 +09:00 |
James Chen
|
771b99a6b7
|
Merge pull request #1798 from dumganhar/gles20
Compilation warning fix for CCAssert macro.
|
2012-12-27 00:49:34 -08:00 |
James Chen
|
f159df2e13
|
Compilation warning fix for CCAssert macro.
|
2012-12-27 16:48:02 +08:00 |
minggo
|
4cdc984b0e
|
Merge pull request #1797 from dumganhar/gles20
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
|
2012-12-27 00:10:53 -08:00 |
James Chen
|
b62d254f63
|
fixed #1597: Added return pointer check.
|
2012-12-27 16:07:48 +08:00 |
James Chen
|
ac7755e68b
|
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest
|
2012-12-27 15:42:55 +08:00 |
minggo
|
0adc6abe30
|
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
[luabinding] make CCAssert compatible Lua
|
2012-12-26 23:28:32 -08:00 |
James Chen
|
7fc07aea2f
|
Merge pull request #1796 from CocosRobot/updategeneratedsubmodule_1356586990
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-12-26 21:45:04 -08:00 |
CocosRobot
|
38e5b67cb5
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-12-27 13:43:19 +08:00 |
James Chen
|
4f859bf133
|
Merge pull request #1795 from dumganhar/bind-more-actions
Binded more actions to js.
|
2012-12-26 21:41:48 -08:00 |
James Chen
|
df5c6aae04
|
Binded more actions to js.
|
2012-12-27 13:38:48 +08:00 |
James Chen
|
f07987418c
|
Merge pull request #1794 from dumganhar/sync
fixed #1625: Added stackable action support. Exchanged the order of parameter for 3d actions.
|
2012-12-26 20:50:32 -08:00 |
James Chen
|
c68884a121
|
issue #1625: Updated EffectsTest.cpp and EffectsTest.lua.
|
2012-12-27 11:48:46 +08:00 |
James Chen
|
023b32a618
|
issue #1625: Updated LuaCocos2d.cpp.
|
2012-12-27 11:48:14 +08:00 |
James Chen
|
d1c33960b2
|
issue #1625: Updated lua pkg files.
|
2012-12-27 11:47:49 +08:00 |
James Chen
|
0e7934a8ce
|
Revert TestCpp/proj.win32/main.cpp.
|
2012-12-27 11:40:32 +08:00 |
James Chen
|
b4211c864e
|
fixed #1625: Updated the submodule reference of cocos2d-js-tests.
|
2012-12-27 11:05:09 +08:00 |
James Chen
|
7d9f06b48c
|
fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
|
2012-12-27 10:55:25 +08:00 |
James Chen
|
bb486af6a7
|
Added stackable action support. Exchanged the order of action.
|
2012-12-26 18:59:31 +08:00 |
dualface
|
09b1d9f520
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
|
2012-12-26 18:37:51 +08:00 |
dualface
|
57bccc7e4a
|
remove CC_LUA_ENGINE_ENABLED macro
|
2012-12-26 18:33:55 +08:00 |
James Chen
|
989832480b
|
Merge pull request #1783 from fape/marm_accelero
marmalade acceleromater improvement
|
2012-12-25 21:51:58 -08:00 |
minggo
|
c5e62206e0
|
Merge pull request #1791 from minggo/gles20
issue #1603:delete space when setting language
|
2012-12-25 18:44:08 -08:00 |
minggo
|
d94e4c30b8
|
issue #1603:delete space when setting language
|
2012-12-26 10:42:35 +08:00 |
minggo
|
8b522c326c
|
Merge pull request #1790 from minggo/gles20
issue #1603:modify android resource path
|
2012-12-24 22:21:31 -08:00 |