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

4523 Commits

Author SHA1 Message Date
James Chen c61da90441 Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 13:40:59 +08:00
James Chen ea10032b24 issue #2170: Adding missing libs for Android. 2013-08-05 11:43:43 +08:00
James Chen 9a9ffaeb4d issue #2170: A typo fix. 2013-08-05 11:33:59 +08:00
James Chen b8a7a4291f Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge 2013-08-05 11:26:34 +08:00
James Chen eaabd93051 issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
James Chen a2fbf0c2b8 issue #2179: Fixing compilation errors on Linux. 2013-08-05 10:29:20 +08:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
minggo 1aadf55b59 Merge pull request #3355 from minggo/iss2434-refactor_androidmk 
closed #2434: simply Android.mk
 2013-08-03 08:33:14 -07:00
carlo morgantini 73286ad76b some more clean up (code review) 2013-08-02 16:11:20 -07:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
James Chen 0db8b2bbf3 closed #2469：LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
James Chen c1d715b778 Adding windows support for New Label. 2013-08-02 15:01:27 +08:00
James Chen 67d710a41c Adding Android support for new label. 2013-08-02 13:46:26 +08:00
minggo 5e03b9b29d Merge pull request #3347 from timothyqiu/docfix 
More documentation fixes
 2013-08-01 18:22:43 -07:00
carlo morgantini 833a45d1af Some more clean up 2013-08-01 17:54:08 -07:00
carlo morgantini 08d8179a0e Clean up (see code review) 2013-08-01 17:49:51 -07:00
carlo morgantini 4904e0f31f Clean up (as requested by code review) 2013-08-01 17:08:57 -07:00
carlo morgantini 6cac521d1b fix some more problems with the new label stuff (as for code review) 2013-08-01 16:29:39 -07:00
carlo morgantini f30ec5f428 (not used) global variables removed form CCFontAtlas.cpp 2013-08-01 15:55:46 -07:00
carlo morgantini 972ae78295 Clean up for the new Label stuff 2013-08-01 11:02:32 -07:00
Timothy Qiu 5ad5cfed7a Yet another documentation fix. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
 2013-08-01 21:40:13 +08:00
Timothy Qiu 5ed8deb9a6 Fixed more documentation errors. 
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
 2013-08-01 20:55:43 +08:00
Timothy Qiu bc10c2a01f Change some doc due to the change of source code. 
Fixed some incorrect use of doxygen command.
 2013-08-01 17:47:37 +08:00
minggo 077acb7814 Merge pull request #3343 from dabingnn/Iss2423-TargetAction-Reverse 
Iss2423 target action reverse
 2013-08-01 02:25:38 -07:00
Timothy Qiu f0ee1e62c0 Fixes tag typos: deprecatd -> deprecated 2013-08-01 17:09:23 +08:00
Timothy Qiu 88e11cab84 Surround code in document with code/endcode tags. 2013-08-01 16:57:42 +08:00
Timothy Qiu 978fc634be Use C++ code in C++ comments. 
Removed Hungarian notation from parts of the code.
 2013-08-01 16:40:56 +08:00
Thomas Perl 6f967fc107 Qt 5: Build fixes for Qt 5 platform 
Recent changes to the develop branch broke Qt 5 support.
 2013-08-01 09:20:17 +02:00
Huabing.Xu 97f6e11f0d issue #2423 : change TargetedAction::reverse() function from just cloning to reversing the internal action 2013-08-01 10:07:40 +08:00
carlo morgantini ba4a48ec7a CCTexture2D interface changed 2013-07-31 13:59:08 -07:00
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 2013-07-31 13:58:25 -07:00
carlo morgantini 95f8fe7690 fix bugs 2013-07-31 12:11:56 -07:00
James Chen f61f4e58fd Merge pull request #3094 from sergey-shambir/linux_sdl 
closed 2458: Linux: added SDL backend as alternative to GLFW.
 2013-07-31 01:55:37 -07:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
minggo d887008bb8 Merge pull request #3336 from minggo/simplify-sample-code 
Simplify sample code
 2013-07-31 00:41:20 -07:00
minggo afc0e4bf8f make Point -> Size & Size -> Point explicit 2013-07-31 14:36:52 +08:00
minggo a8f10c480d Merge pull request #3332 from azmeuk/clang 
Clang support for Linux
 2013-07-30 18:26:12 -07:00
carlo morgantini ff56ad5435 fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
Sergey Shambir d23d486720 Linux: added SDL2 backend as replacement for GLFW. 
Initially planned as alternative, made replacement after discussion with
minggo.

Summary:
GLFW v.3 released in June. New version breaks API without real need:
http://cocos2d-x.org/boards/6/topics/31277
Meanwhile SDL2 is very stable. SDL2 used in Steam Runtime and will be
part of Ubuntu SDK, it's supported by other distributions.

Completed:
- OpenGL initialization and window handling with SDL
- Keyboard, IME emulation, mouse and touches support with SDL
- Window title now contains app name on Linux
- Backspace correctly handled with new backend

Note:
- SDL on X11 have no proper multitouch, but backend handles multitouch
events to support future Linux graphics.
 2013-07-30 23:08:26 +04:00
carlo morgantini 9de1ef3f97 New label TTF. New text alignment sample. 2013-07-30 10:27:22 -07:00
Éloi Rivard 524b6903a5 Added clang support for linux. 2013-07-30 14:49:44 +02:00
minggo ba4e0d8d39 closed #2438:re-add libwebp.a 2013-07-30 18:06:01 +08:00
minggo 1d2b1c79c2 closed #2438:remove mac 32-bit support 2013-07-30 18:02:35 +08:00
Éloi Rivard 14e200e61a Added debugging information in emscripten DEBUG mode 2013-07-30 10:11:30 +02:00
James Chen df33991a38 Merge pull request #3329 from pyrasis/tizen_2.2 
[Tizen] Fix compile error
 2013-07-30 00:34:40 -07:00
Lee, Jae-Hong 4beeda2294 [Tizen] Fix compile error. 2013-07-30 15:43:05 +09:00
boyu0 5225bb2f7f fix the travis ci compile error 2013-07-30 14:16:23 +08:00
boyu0 c4a1bf8986 fix the travis ci compile error 2013-07-30 14:07:31 +08:00
James Chen 3633ebfe0c Merge pull request #3224 from azmeuk/emscripten 
emscripten keyboard support
 2013-07-29 22:50:27 -07:00
boyu0 31da5ebeb7 fix some compile error and pass the linux compile 2013-07-30 13:45:50 +08:00