Commit Graph

63 Commits (0.7.0)

Author SHA1 Message Date
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
6 years ago
Thunderforge 096e734df6 Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore 6 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
glbwsk 83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 7 years ago
glbwsk a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
AnyOldName3 91597af051 Add VS2017 aps files to gitignore 7 years ago
David Cernat 7647715dac Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
7 years ago
Lennart Bernhardt e56089aff4 Ignore /MSVC* (Feature #3795) 7 years ago
Lennart Bernhardt 76548a5e4c Ignore /deps (Feature #3795)
Implements https://bugs.openmw.org/issues/3795
7 years ago
Koncord 75061e2504 Update gitignore for new version of the CLion 8 years ago
Bret Curtis 7f0d5bde2d make conf.py independant from cmake macros
merged openmw-cs in, using per directory statics

add requirements.txt for sphinx docs

it is breath

update gitignore and openmw-cs
8 years ago
Alexander Kjäll c7cc170cbf
Added all generated artifacts from the build process to the .gitignore file 8 years ago
HiPhish c4658a0ef7 Add OpenMW CS manual to the repository.
The manual depends on Sphinx to build. A makefile and a Windows batch
script are included for building, both were automatically generated by
Sphinx. I have left all settings at their default and I have tested that
HTML and PDF output build properly.
8 years ago
scrawl 9c503cbd8c Add build* to the gitignore
Allows one to have multiple build folders, e.g. a separate build for a different OSG versions, or for different OpenMW versions, or when you often switch between branches.
9 years ago
scrawl f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
9 years ago
Arthur Moore cdfa24e15d (Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
Just give it a set of files, one file per argument, and it will make sure openmw can read them.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
10 years ago
Bret Curtis 8419002393 Task #940: Move licenses to appropriate place in docs. Additional cleanup. 10 years ago
scrawl 73c9efc5e3 Add generated version.hpp to gitignore 10 years ago
scrawl c7c3ba0ac6 Tweak .gitignore 10 years ago
jeaye 04735a6734 Extend .gitignore
Organize .gitignore to make it easier to add to

Ignore only binaries, not directories

Removed some invalid ignores (.cfg, .desktop, etc)

Better globbing
11 years ago
Marc Zinnschlag fb7273e14a Merge remote-tracking branch 'sirherrbatka/icons-svg'
Conflicts:
	.gitignore
11 years ago
Marek Kochanowicz abd03245d7 Adding .directory to gitignore. 11 years ago
Miroslav Puda eb8afa5d35 Ignoring Eclipse project files. 11 years ago
Marc Zinnschlag 5346508471 added kate junk to .gitignore 11 years ago
Tom Mason bbac63bff7 Ignore vim swap files 11 years ago
scrawl 00a2de432a fix BulletShapeLoader namespace 12 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 12 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
12 years ago
Marc Zinnschlag 52a6605f10 Merge remote branch 'mirc/refactor_wm' into refactor_wm
- changed the way dynamics stats are passed to the character creation object
- some more clean up

Conflicts:
	.gitignore
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
12 years ago
Cris Mihalache 4b758376be Created a class for char gen, and starting moving code to it 12 years ago
Cris Mihalache daa8fb15ce Removed all physics-related code from Engine 12 years ago
Lukasz Gromanowski 6b3242f514 Updated .gitignore file
Updated .gitignore file - added ignore rules for:
*.a, *.o, cmake_install.cmake, moc_*.cxx files.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
Lukasz Gromanowski ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Marc Zinnschlag d5e4635198 state OpenMW version on doxygen main page 13 years ago
Marc Zinnschlag 27cba6c624 created config.hpp file for appps/openmw 13 years ago
athile d955a0efc4 WIP Windows build 14 years ago
Marc Zinnschlag cb6996a90e doxygen setup fix 14 years ago
Nicolay Korslund 9c839e220e Moved GUI stuff into components 14 years ago
Nicolay Korslund 29522f57d3 Cleaned up some old D files 14 years ago
Nicolay Korslund b2d54a619e Implemented all MW window layouts 14 years ago
Nicolay Korslund 3896fd218a Added stand-alone GUI test, compiles and runs 14 years ago
Nicolay Korslund 2ec96ed7de Merge branch 'master' of http://github.com/ardekantur/openmw 14 years ago
Nicolay Korslund 359f2903d7 Merged athile and zinnschlag 14 years ago
Ardekantur ee6c933156 Merge branch 'master' of git://github.com/korslund/openmw
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	game/engine.cpp
14 years ago
Ardekantur fc6009ebb3 ignore directories like build_<platform> too 14 years ago
Nicolay Korslund 4a3f6b0ff1 Various fixes to get openmw to compile and run properly 14 years ago
Nicolay Korslund d03a4c2c7c Fixed a couple more line endings 14 years ago
Nicolay Korslund cd1e17239c Reverted moving caelum resources 14 years ago
Nicolay Korslund 5005f5eb06 Fixed platform/strings.h to work again on Linux 14 years ago