mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 12:49:54 +00:00
Code Issues Releases Wiki Activity
25928 commits 38 branches 54 tags 122 MiB
Commit graph

71 commits

Author SHA1 Message Date
David Cernat
36a2308acd Add OpenMW commits up to 30 May 2020 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwscript/interpretercontext.cpp
 2020-06-09 17:50:26 +03:00
AnyOldName3
087d12589a Ignore VS Code files 2020-05-18 16:37:18 +01:00
David Cernat
25a632c650 Add OpenMW commits up to 13 Apr 2020 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
 2020-04-13 19:53:42 +03:00
AnyOldName3
f1b2ab9d67 Add .vs to gitignore 
Apparently Visual Studio puts stuff in a .vs directory now.
 2020-04-10 15:47:33 +01:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-10-29 23:49:31 +02:00
elsid
224144f2b8
Add ignored recastnavigation files to .gitigore 2019-10-20 17:20:35 +02:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
Bret Curtis
fc10adb608 makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml 2018-12-11 21:30:37 +01:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 2018-01-10 03:49:53 +02:00
Thunderforge
096e734df6 Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore 2018-01-01 22:42:45 -06:00
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
 2017-10-16 07:37:29 +03:00
glbwsk
83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 2017-10-13 20:32:52 +02:00
glbwsk
a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 2017-10-13 14:39:44 +02:00
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
 2017-08-31 15:14:13 +03:00
AnyOldName3
91597af051 Add VS2017 aps files to gitignore 2017-08-19 18:48:29 +01:00
David Cernat
7647715dac Merge pull request #190 from OpenMW/master 
Add OpenMW commits up to 27 Mar 2017
 2017-03-28 08:05:23 +03:00
Lennart Bernhardt
e56089aff4 Ignore /MSVC* (Feature #3795) 2017-03-25 15:26:14 +01:00
Lennart Bernhardt
76548a5e4c Ignore /deps (Feature #3795) 
Implements https://bugs.openmw.org/issues/3795
 2017-03-24 15:37:26 +01:00
Koncord
75061e2504 Update gitignore for new version of the CLion 2016-12-03 15:50:36 +08:00
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
 2016-07-29 18:14:54 +02:00
Alexander Kjäll
c7cc170cbf
Added all generated artifacts from the build process to the .gitignore file 2016-04-26 19:40:16 +02:00
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.
 2016-02-06 11:04:36 +01:00
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.
 2015-11-11 17:08:14 +01:00
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.
 2015-07-18 03:09:04 +02:00
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.
 2014-08-24 12:09:39 -04:00
Bret Curtis
8419002393 Task #940: Move licenses to appropriate place in docs. Additional cleanup. 2014-06-10 11:25:39 +02:00
scrawl
73c9efc5e3 Add generated version.hpp to gitignore 2014-02-05 08:48:15 +01:00
scrawl
c7c3ba0ac6 Tweak .gitignore 2013-12-31 18:37:55 +01:00
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
 2013-10-16 14:44:18 -07:00
Marc Zinnschlag
fb7273e14a Merge remote-tracking branch 'sirherrbatka/icons-svg' 
Conflicts:
	.gitignore
 2013-08-26 14:52:26 +02:00
Marek Kochanowicz
abd03245d7 Adding .directory to gitignore. 2013-08-24 19:17:44 +02:00
Miroslav Puda
eb8afa5d35 Ignoring Eclipse project files. 2013-05-18 21:38:09 +02:00
Marc Zinnschlag
5346508471 added kate junk to .gitignore 2013-03-21 10:16:32 +01:00
Tom Mason
bbac63bff7 Ignore vim swap files 2013-01-20 14:25:44 +00:00
scrawl
00a2de432a fix BulletShapeLoader namespace 2012-11-08 18:48:07 +01:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
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
 2012-02-03 11:24:28 +01:00
Cris Mihalache
4b758376be Created a class for char gen, and starting moving code to it 2012-01-30 16:38:43 +02:00
Cris Mihalache
daa8fb15ce Removed all physics-related code from Engine 2012-01-29 20:51:20 +02:00
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>
 2012-01-21 01:09:06 +01:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Marc Zinnschlag
d5e4635198 state OpenMW version on doxygen main page 2011-07-08 14:52:34 +02:00
Marc Zinnschlag
27cba6c624 created config.hpp file for appps/openmw 2011-07-08 14:39:23 +02:00
athile
d955a0efc4 WIP Windows build 2010-08-30 02:12:54 +01:00
Marc Zinnschlag
cb6996a90e doxygen setup fix 2010-08-23 18:25:50 +02:00
Nicolay Korslund
9c839e220e Moved GUI stuff into components 2010-07-08 22:34:35 +02:00
Nicolay Korslund
29522f57d3 Cleaned up some old D files 2010-07-08 18:43:22 +02:00
Nicolay Korslund
b2d54a619e Implemented all MW window layouts 2010-07-08 15:23:35 +02:00
Nicolay Korslund
3896fd218a Added stand-alone GUI test, compiles and runs 2010-07-08 11:53:59 +02:00