Commit Graph

67 Commits

Author SHA1 Message Date
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
Nite Luo 6143c512fa Add AppCode project files to ignorelist 2013-10-03 15:41:22 -07:00
pktangyue 4c1864daa3 add *.xccheckout to gitignore 2013-09-27 17:22:55 +08:00
James Chen 935222f27c issue #2732: Adding 'tools/tolua/userconf.ini' to ignore list. 2013-08-27 17:20:40 +08:00
James Chen be98d53264 issue #2371: Reverting .gitignore file. We need to add .xcworkspacedata to ignore list. 2013-07-04 17:22:07 +08:00
Ricardo Quesada 9e13cb91a5 Adds xcworspace data 2013-07-01 16:33:17 -07:00
growingdever 6b826bba69 Update .gitignore
it didn't work normally. (grammar mistake.)
2013-06-20 15:41:34 +09:00
growingdever f05a375d4e Update .gitignore
tools/project-creator/create_project.py is generating multi-platform project on COCOS2DX_DIR/prjoects
2013-06-20 12:06:09 +09:00
Rene Klacan 915a4be6e5 added vim .swo file 2013-05-31 14:30:14 +02:00
James Gregory 420f2cba68 Ignore ctags file. 2013-05-14 15:39:11 -07:00
zhangbin 8e4567a784 Add custom ignore file for plugin directory 2013-04-08 14:10:46 +08:00
zhangbin e0c60b87f7 Remove the environment config for plugin. 2013-04-07 18:42:38 +08:00
zhangbin d012d5513a Add plugin code into cocos2d-x engine. 2013-04-07 16:58:26 +08:00
James Chen 831f001f54 Adding ._.XXX files to ignore file. 2013-03-17 14:36:11 +08:00
Sam Clegg 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
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
Neo Kim cbebbd8207 Ignore 'DerivedData' directory 2013-02-20 16:50:32 +09:00
fape ec72d16276 ignore marmalade vs10 project directories 2012-12-02 15:10:38 +01:00
folecr c8d108d350 Ignore userconf.ini when running from jenkins 2012-09-26 10:49:02 -07:00
folecr e6275f5f27 Update gitignore for tojs 2012-09-18 17:02:21 -07:00
Rolando Abarca e6dbbceacd updates gitignore 2012-08-27 05:45:11 -07:00
Donald Alan Morrison 7ebcf82a2e Added *.opensdf to (dot)gitignore file for Visual Studio. 2012-08-23 22:57:07 -07:00
Donald Alan Morrison 5612e35487 Added ipch/ to (dot)gitignore for Visual Studio generated pre-compiled headers. 2012-08-23 21:27:20 -07:00
James Chen cc572ab8e7 fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them. 2012-06-15 18:15:43 +08:00
folecr 6aa1879f84 Add gen/ and local.properties to gitignore 2012-06-14 19:21:02 -07:00
Walzer 1e732930b7 fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
Walzer 6c0fdf7421 Merge funkaster/test.js repo commit 'bed6efa3cd0d8822b7f132f52660b1d76d4851c1' into js-bindings 2012-05-24 17:34:21 +08:00