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

93 Commits

Author SHA1 Message Date
j-jorge c616d6d9ff Compilation fix (#17209) 
* Fix various compilation issues.

Mostly errors on field initialization order but also missing files
in CMakeLists and missing include directives.

* Fix compilations issues with GCC 6.2

* Fix gitignore libs/ entry to not ignore the Android external libraries.
 2017-02-04 09:46:32 +08:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
Dale Stammen acb38c9f16 ignore VS 2015 .VC.db files 2016-04-12 16:19:03 -07:00
Dale Stammen 6a06f6c3ad ignore VS2015 .opendb files 2015-12-09 17:25:16 -08:00
Dale Stammen 7e252d2c3b added BundleArtifacts 2015-10-14 16:47:39 -07:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
Bin Zhang 53ca264eff Solve the error in the scripts of modify templates for framework. 2015-06-19 17:43:06 +08:00
Bin Zhang cd159bd12c Add a config file for generating prebuilt libs. 2015-06-19 13:42:48 +08:00
子龙山人 9deaa9bcc9 Merge pull request #12374 from natural-law/framework 
Optimize framework-compile.
 2015-06-17 14:49:43 +08:00
Bin Zhang 13e8cbf6d7 Add ignore for files generated by framework-compile. 2015-06-17 09:53:32 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
Dale Stammen e5dc64f819 ignore .vs dir of VS2015 2015-06-15 19:26:38 -07:00
Bin Zhang fb920acccf Add scripts for framework compiling. 2015-06-15 16:33:24 +08:00
andyque ebf6859161 add framework build scripts to gitignore 2015-05-29 13:34:59 +08:00
Bin Zhang 41792caa6b Add files & configuration for android studio support in console. 2015-05-21 16:34:03 +08:00
WenhaiLin 45294782bb [ci skip]Update ignore. 2015-05-20 13:40:35 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
pandamicro 51f949540c Add ignore for v*-console-*.zip 2015-04-23 19:06:25 +08:00
WenhaiLin 76db62c1e9 Fixed CocosRobot may commit unnecessary files 2015-04-09 10:06:21 +08:00
andyque cf2062ac64 ignore certain folders 2015-03-04 10:29:24 +08:00
Dhilan007 d78b1b8ff0 Add FlatBuffer to ignore list 2014-11-27 20:31:10 +08:00
Dale Stammen b927ad97bf added AppPackages 2014-10-23 07:27:18 -07:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
minggo 30d09bef04 Merge pull request #8701 from joshuastray/v3 
ignore CMakeLists.txt.user generated by QtCreator
 2014-10-15 10:33:39 +08:00
joshuastray 256e505dc7 ignore CMakeLists.txt.user generated by QtCreator 2014-10-15 10:26:19 +08:00
Dale Stammen c3cd7f6fc2 ignore wp8 and winrt specific dirs 2014-10-14 18:15:12 -07:00
andyque 2d4761966a fix jenkins linux compile error and add protobuf to ignore list 2014-10-14 15:11:50 +08:00
andyque 972c5f8ab2 adjust config 2014-09-24 12:03:17 +08:00
andyque 182a76a0f5 add chipmunk config for iOS & mac 2014-09-10 10:08:38 +08:00
andyque 3743f02c7e finish ios/mac/android 2014-09-05 11:39:11 +08:00
minggo 60922ae604 igmore fbx-conv 2014-07-21 16:40:34 +08:00
James Chen 9265a56f43 Updates .gitignore. 2014-05-12 17:58:27 +08:00
James Chen 357b07d532 Updates comments in download-deps.py and updates .gitignore 2014-05-07 21:36:51 +08:00
James Chen 87d8653343 Updates .gitignore, ignore version.json 2014-05-07 15:05:59 +08:00
James Chen 59051d2393 Updates .gitignore. 2014-05-07 13:48:35 +08:00
James Chen e16d6fa63f Re-adds resources in cpp-tests and lua-tests, but removes some large 
files. We need to reuse some resources when doing some tests.
 2014-05-05 13:27:47 +08:00
James Chen ac2ff7bd28 Updates .gitignore 2014-05-05 00:16:06 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 1caca8670f project.properties in .gitignore 2014-04-30 13:19:39 -07:00
zhangbin 29615f7e26 closed #4727, Support run sample projects with console. 2014-04-11 11:36:23 +08:00
Dale Stammen 0999df368f added .user to Visual Studio ignores 2014-03-28 15:32:23 -07:00
James Chen 0c58064bee Merge pull request #5306 from azmeuk/gitignore 
Ignore files generated by cmake
 2014-02-10 21:52:40 +08:00
Éloi Rivard baecd2faa6 Ignore files generated by cmake 2014-02-08 19:56:36 +01:00
heliclei 1ef549ab4e update .gitignore 2014-02-07 14:55:26 +08:00
Oleg Loginov 998b798646 ignore output files from script make-all-linux-project.sh 2013-11-07 01:43:26 +04:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
samuelhu c08a09a7e0 #3049:Add LICENSE_JSON4LUA and some constant values. 2013-10-30 10:52:04 +08:00
James Chen 7de6646213 Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder. 2013-10-12 14:56:40 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00