Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,545 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

20545 Commits

Author SHA1 Message Date
andyque a37a6737ca refactor Text setColor & setOpacity 2014-06-06 16:08:31 +08:00
andyque f0f4d41813 refactor Slider setColor & setOpacity 2014-06-06 16:07:47 +08:00
andyque 3c80fe53d3 refactor LoadingBar setColor & setOpacity 2014-06-06 16:03:59 +08:00
andyque 6193893b2b refactor ImageView setColor & setOpacity 2014-06-06 16:02:44 +08:00
andyque 0805c215b3 refactor UICheckBox setColor & setOpacity 2014-06-06 16:01:55 +08:00
andyque 46ad4edab3 refactor UIButton setColor & setOpacity 2014-06-06 16:00:28 +08:00
minggo 76d9916864 Merge pull request #6990 from Dhilan007/v3-wp8fix 
fixed WP8 project:compile error,missing files,wrong file path.
 2014-06-06 15:43:43 +08:00
Dhilan007 fd4e233432 fixed WP8 project:compile error,missing files,wrong file path. 2014-06-06 15:41:17 +08:00
minggo 716769241a Merge pull request #6938 from CaryZheng/v3 
Simplify BlendFunc operator< judgement
 2014-06-06 15:29:33 +08:00
minggo bd00e17190 [ci skip] 2014-06-06 13:47:38 +08:00
minggo e0238c107e [ci skip] 2014-06-06 13:41:40 +08:00
minggo 6771afb13b Merge pull request #6989 from samuele3hu/v3_fix 
Update cocos2d-console submodule
 2014-06-06 13:38:46 +08:00
minggo 4016c3aa84 Merge pull request #6988 from minggo/add-comment 
[ci skip]add some comment
 2014-06-06 12:11:02 +08:00
minggo bbff18c96f add some comment 2014-06-06 12:09:39 +08:00
samuele3hu 52323b27fa Update cocos2d-console submodule 2014-06-06 12:09:10 +08:00
minggo 49f7b2aec1 Merge pull request #6986 from iSevenDays/patch-11 
Fix CCImage to be compatible with UNIX2003
 2014-06-06 12:05:58 +08:00
minggo ab63569e4a Merge pull request #6987 from samuele3hu/v3_fix 
Update control.lua for lua-tests
 2014-06-06 12:04:07 +08:00
samuele3hu 890bc20475 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-06 11:44:23 +08:00
samuele3hu 5ab8b81205 Update control.lua for lua-tests 2014-06-06 11:42:18 +08:00
minggo 11320a0ef5 [ci skip] 2014-06-06 11:40:32 +08:00
minggo 6cee3fe830 Merge pull request #6979 from visiblelight/TextureOptimize 
Texture Optimize
 2014-06-06 11:38:49 +08:00
vision 39f2669886 remove the new images and use the old ones. 2014-06-06 10:37:45 +08:00
Anton Sokolchenko 770d5e91b7 Update CCImage.cpp 2014-06-05 18:02:45 +03:00
Anton Sokolchenko 5f74b8568d Fix CCImage to be compatible with UNIX2003 
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.

Undefined symbols for architecture i386:
  "_fwrite$UNIX2003", referenced from:
      _unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
      _unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
      _empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
      _term_destination in libcocos2dx iOS.a(jdatadst.o)
      _Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
      _PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
  "_strerror$UNIX2003", referenced from:
      _TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
 2014-06-05 16:54:00 +03:00
Frank.Xu 7ece807a63 Add shadow, outline, glow filter support for UITextField 2014-06-05 19:21:06 +08:00
yangxiao 87c7e2b0e9 worldmat cache in bone 2014-06-05 18:21:25 +08:00
Frank.Xu b74040a2ac Add getStringLength() support for UITextField 2014-06-05 17:59:54 +08:00
yangxiao 32ba5f2873 change comment 2014-06-05 16:47:03 +08:00
yangxiao ed8f8a9cad sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00
vision f7d5d837bf add new tests for different pixel formats 2014-06-05 16:33:42 +08:00
minggo 5cf083fbeb Merge pull request #6982 from CocosRobot/update_lua_bindings_1401951865 
[AUTO]: updating luabinding automatically
 2014-06-05 15:59:19 +08:00
CocosRobot b749d0b5ca [AUTO]: updating luabinding automatically 2014-06-05 07:06:07 +00:00
minggo 88409092ff Merge pull request #6981 from samuele3hu/v3_fix 
Update controller.lua for lua-tests and bindings-generator submoudle
 2014-06-05 15:00:44 +08:00
samuele3hu 373d4dfb1a Replace `log` with `CCLOG` 2014-06-05 14:49:02 +08:00
samuele3hu 919524cf89 Update controller.lua for lua-tests and bindings-generator submoudle 2014-06-05 14:39:09 +08:00
minggo 6a1a3b5a06 Merge pull request #6980 from CocosRobot/update_cocosfiles_1401940273 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-05 11:52:23 +08:00
CocosRobot b218f8ec13 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-05 03:51:15 +00:00
minggo 4c7628f69e [ci skip] 2014-06-05 11:51:02 +08:00
minggo 366beedbb2 Merge pull request #6955 from samuele3hu/v3_fix 
Add xxtea encrypt support for lua and update the console submodule
 2014-06-05 11:49:40 +08:00
minggo a2ee890927 Merge pull request #6978 from CocosRobot/update_lua_bindings_1401937200 
[AUTO]: updating luabinding automatically
 2014-06-05 11:04:41 +08:00
minggo 0c24c639aa [ci skip] 2014-06-05 11:01:43 +08:00
CocosRobot 0010ed2e44 [AUTO]: updating luabinding automatically 2014-06-05 03:01:43 +00:00
vision 860057c307 Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories. 2014-06-05 10:58:27 +08:00
minggo c1360318c1 Merge pull request #6977 from minggo/update-version 
update libcurl.a
 2014-06-05 10:56:06 +08:00
minggo ed40dc9268 update libcurl.a 2014-06-05 10:54:59 +08:00
samuele3hu a4cb0c183a Update Linux CMakeLists for xxtea 2014-06-05 10:54:05 +08:00
vision c90f2b3251 remove unused codes in CCTexture2D 2014-06-05 10:09:36 +08:00
Ricardo Quesada 4fdfc3a7ed Merge pull request #6947 from ricardoquesada/normalized_position 
Adds setNormalizedPosition()
 2014-06-04 10:25:30 -07:00
Ricardo Quesada a11740ff29 ouch, more windows compile issues 2014-06-04 10:11:16 -07:00
Ricardo Quesada 59b966731e Compiles on Windows and Android 2014-06-04 09:48:35 -07:00