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

49 Commits

Author SHA1 Message Date
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
Walzer 356c9cd82a Merge gles20 branch commit '688499b5c032a17dcee8db76aaaa36ec2358facb' into js-bindings 2012-05-24 10:49:40 +08:00
Walzer cb6a8e60df Add *.sdf into .gitignore, which would be generated by visual studio. Remove shell scripts for linux/bada/qnx at root folder. 2012-05-02 11:35:14 +08:00
Rolando Abarca fb63fbda35 first commit 2012-04-17 12:43:08 -07:00
Rolando Abarca 4ea4c4d776 updates gitignore 2012-03-15 11:15:31 -07:00
Didiet Noor 73cb063b2a Modified gitignore to exclude device debug and device release on Blackberry Playbook 2011-12-14 16:27:59 +08:00
dumganhar a3ace6f20d modify some box2d source files for blackberry 2011-12-06 09:51:58 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
minggo d8825594a1 add ignore file types 2011-10-18 23:50:06 -07:00
minggo 866401e5d8 add ignore file types 2011-10-18 23:47:40 -07:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
Walzer 3b7d82eed7 add gitignore for xcode4 2011-06-13 13:47:01 +08:00
yangws 63801db3f6 fixed #440 Commit missing file last commit. 2011-03-31 11:23:58 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
Macarse 10d1844cfb Added .cproject to the .gitignore file 2011-02-05 20:49:12 -03:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo e620bbdfe9 fixed #257 2010-12-13 11:21:58 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00