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

640 commits

Author SHA1 Message Date
scrawl
e6cf959134 Revert "Delete nifosgtest" 
This reverts commit ba3075dc11.
 2015-04-11 14:46:52 +02:00
scrawl
ba3075dc11 Delete nifosgtest 2015-04-02 16:28:16 +02:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
12f27123f2 Billboard scaling fix and culling bug fix 2015-03-30 17:11:27 +02:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
Scott Howard
d7baf92353 tell include_directories which libraries are system libs 2015-03-09 16:49:40 -04:00
Scott Howard
88f746574d fix compiler detection and adding build flags in CMakeLists.txt 2015-03-09 14:37:43 -04:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
Marc Zinnschlag
cdf53c17e7 updated version number 2015-03-03 11:54:35 +01:00
scrawl
1eaa64c49c CMake: remove lines for MinGW, no one is maintaining those 2015-03-02 15:45:44 +01:00
scrawl
c6aa374934 CMake: set windows warning levels globally instead of per target 2015-03-02 15:45:29 +01:00
scrawl
c57f9ad5dc CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None 2015-03-02 15:44:27 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
8d64f2081e Add particle system state loading 2015-02-24 01:25:31 +01:00
scrawl
8e01d8cb19 Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
scrawl
8c10d4badb NIF reader compiles without Ogre 2015-02-17 17:08:55 +01:00
scrawl
d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 2015-02-17 16:19:21 +01:00
scrawl
1124343e0d Add BUILD_OPENMW switch, build will be broken in next commit 2015-02-17 16:05:28 +01:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
Marc Zinnschlag
6cc9fa2b3f Merge remote-tracking branch 'slothlife/cmake-release-build-fix' 2015-02-15 09:52:13 +01:00
slothlife
f1fd27aeaf Select CMAKE_BUILD_TYPE if not specified 
A suggestion by kcat to ensure CMake selects a reasonable default for
the build type if users don't set it themselves.
 2015-02-14 23:34:43 -06:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
Marc Zinnschlag
003d0610f4 Merge remote-tracking branch 'ace/link-time-optimzation' 2015-02-10 10:50:45 +01:00
Alexander "Ace" Olofsson
9da0a9f8c4 Enable link-time optimization on MSVC 2015-02-10 00:55:31 +01:00
scrawl
399c24c646 CMake cleanup: remove redundant setting of Permissions to default values 2015-02-09 20:16:29 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
c63ab673e1 Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 
This reverts commit 94002b0758.

Conflicts:
	CMakeLists.txt
 2015-02-07 23:24:27 +01:00
Rosanne DiMesio
28eb766bba Respect LIB_SUFFIX 2015-02-06 14:27:12 -06:00
Nikolay Kasyanov
5534306eb3 Few rename fixes 2015-02-06 08:59:00 +02:00
Alexander "Ace" Olofsson
abb334bc1e Missing change for the tool rename 2015-02-03 22:43:15 +01:00
Marc Zinnschlag
c02537c3b1 incremented version number 2015-02-03 13:42:47 +01:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
8e5c8aa562 Add support for passing in Ogre plugin directory via CMake 2015-01-23 23:57:00 +01:00
Marc Zinnschlag
f4bf2aa412 Merge remote-tracking branch 'origin/master' 2015-01-20 16:07:17 +01:00
Alexander "Ace" Olofsson
ebe2e1491a Fix broken windows builds due to README change 2015-01-20 15:24:33 +01:00
scrawl
031eec4550 Starting ESS importer for Morrowind save files 2015-01-17 00:16:49 +01:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 2015-01-09 20:53:43 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files 
This allows us to launch OpenMW when the user opens a save game file through the file manager.
 2015-01-07 15:08:57 +01:00