d0ac87898d
Update GLES version notes in README.mdown
...
Also, remove trailing whitespace and improve formatting.
2013-03-08 08:08:14 -08:00
3b6e2e7f41
Fix package installation in make-all-linux-project
...
There was a bug where missing packages would cause the script
to exit.
This change also makes several improvements:
- script can now be run from anywhere (not only the cocos root)
- apt-get is called only once to install all missing packages
(this makes output much more informative on first use)
- added comment/docs to the top of the script
2013-03-08 08:03:06 -08:00
93f7ed1b6e
Merge pull request #2121 from dumganhar/master
...
fixed #1812 : A warning of getStringWithEllipsisJni function when compiling it with clang.
2013-03-08 00:51:57 -08:00
439fa3028a
Merge pull request #2122 from dumganhar/iss1811
...
fixed #1811 : getStringWithContentsOfFile ~> getStringFromFile .
2013-03-08 00:51:27 -08:00
a91d308070
fixed #1811 : getStringWithContentsOfFile ~> getStringFromFile .
2013-03-08 16:50:16 +08:00
2c7b178d7f
fixed #1812 : Minor fix.
2013-03-08 16:00:14 +08:00
3d5ceaedf5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-03-08 15:56:56 +08:00
aa53211f86
fixed #1812 : A warning of getStringWithEllipsisJni function when compiling it with clang.
2013-03-08 15:56:17 +08:00
f98d4518d0
Merge pull request #2120 from dumganhar/master
...
fixed #1811 : Fixing complication error on win32 after this pull request (https://github.com/cocos2d/cocos2d-x/pull/2119
2013-03-07 23:18:53 -08:00
91e3570ec4
fixed #1811 : Fixing complication error on win32 after this pull request ( https://github.com/cocos2d/cocos2d-x/pull/2119 ).
2013-03-08 15:15:08 +08:00
40fdcf82fa
Merge pull request #2119 from dumganhar/iss1811-getfiledata-jsb
...
fixed #1811 : Adding a method to get file data for JSB. Reverting the implementation of JSStringWrapper.
2013-03-07 22:38:39 -08:00
f7e60e290f
fixed #1811 : Adding a method to get file data for JSB. Updating the way of encoding cpp string to jsval or jsval to cpp string.
2013-03-08 14:34:59 +08:00
73c168239c
Update AUTHORS
2013-03-08 12:52:21 +08:00
ee256e0e0d
Merge pull request #2091 from jsambuo/linux-audio-twice-fix
...
fix for SimpleAudioEngine::playEffect() and playBackgroundMusic() playing twice on linux
2013-03-07 20:50:26 -08:00
3ab63dcc96
Merge pull request #2118 from minggo/refactor-ccuserdefault
...
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-07 19:19:49 -08:00
e8d4b17a23
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-08 11:18:34 +08:00
d730c9749d
Merge pull request #2117 from vipsbpig/master
...
fixed CCControl::registerWithTouchDispatcher()
2013-03-07 18:56:01 -08:00
ce14169f4d
Update CCControl.cpp
2013-03-08 10:26:16 +08:00
76e247fb9a
fix CCControl::registerWithTouchDispatcher()
2013-03-08 10:25:09 +08:00
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
360519dad5
Removing /bin/bash for executing build command, and keep only bash
2013-03-07 12:09:17 -08:00
4d8a735463
Merge pull request #2115 from CocosRobot/updategeneratedsubmodule_1362643478
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-07 00:39:13 -08:00
da5d1dcce8
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-07 16:04:48 +08:00
6fa2e4d054
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-03-07 15:50:21 +08:00
d60ba89b36
Added compatible functions for HTML5 multi resources preloading.
2013-03-07 15:49:05 +08:00
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
a691df2251
Merge pull request #2100 from fins/master
...
getStartLocationInView() and getStartLocation() methods in CCTouch
2013-03-06 22:40:12 -08:00
b06380432b
Merge pull request #2109 from youknowone/include
...
Add missing <UIKit/UIKit.h> for UITextField
2013-03-06 22:35:38 -08:00
8b86d95e2f
Merge pull request #2111 from yuezang/feature_1802
...
feature #1802:add touches lua test
2013-03-06 22:33:52 -08:00
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
ee156bd898
Update AUTHORS
2013-03-07 11:12:49 +08:00
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
3cb4ab8f31
issue #1529:update xcode template
2013-03-07 10:41:45 +08:00
2842719e35
issue #1529:add user_default into vs2010 project
2013-03-07 10:31:01 +08:00
e85989f76e
issue #1529:modify marmalade and native client project configuration
2013-03-07 09:51:26 +08:00
61dcf588ca
Merge pull request #2104 from yuezang/iss1425-lua
...
issue #1425:exist lua test case is ok!
2013-03-06 17:35:53 -08:00
ce247a6304
[NaCl] Fix warnings in ARM build
2013-03-06 13:02:55 -08:00
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
bd9656bb08
Add missing <UIKit/UIKit.h> for UITextField
2013-03-06 21:22:43 +09:00
56ab904e0a
Use shared NodeLoaderLibrary in CCBReader bindings
2013-03-06 14:09:01 +02:00
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
7969224bf3
Merge pull request #2106 from waiter/master
...
Update unload effect function (android normal)
2013-03-05 22:45:10 -08:00
21722da7c4
Update AUTHORS
2013-03-06 14:43:46 +08:00
43dff78f4b
Merge pull request #2102 from DarraghCoy/ios_custom_font_loading_fix
...
Fix for loading custom fonts on iOS when referenced from a CCB file
2013-03-05 22:42:13 -08:00
e2119e1323
Merge pull request #1 from cocos2d/master
...
update cocos2d/cocos2d-x
2013-03-05 18:43:21 -08:00
3ce5a99c8d
Merge pull request #2092 from sbc100/fix_all_warnings
...
Fix all compiler warnings produced by gcc.
2013-03-05 17:59:35 -08:00
7699c83bd8
update Cocos2dxSound.java for unload effect
...
when unload effect, sounID maybe null so the app will creash because of NPE.
2013-03-06 09:21:49 +08:00
Sam Clegg