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

547 commits

Author SHA1 Message Date
Thoronador
688d556510 remove references to Audiere and MPG123 from top-level CMake file 2014-05-03 21:20:22 +02:00
Sandy
36914b43d7 Remove install of License of no longer used font 2014-05-01 08:19:05 -04:00
scrawl
78d322e6a5 Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test." 
This reverts commit 529d2436b5.
 2014-04-01 11:44:27 +02:00
Lukasz Gromanowski
529d2436b5 Temporary added broken CMakeLists.txt - Travis IRC notification test. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-03-31 22:14:12 +02:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
Alexander "Ace" Olofsson
7ed3effc92 Fix windows packaging issue now that the OFL license doesn't exist 
anymore.
 2014-03-19 12:01:53 +01:00
scrawl
9089df3080 Add unity build option 
Each component and each MW-subsystem will be used as a single compilation unit.
 2014-03-16 23:49:12 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
Marc Zinnschlag
6101916b7d bumped version number 2014-03-04 08:52:48 +01:00
pvdk
56d537e23d Added some sanity checking: compare git version with manual version 2014-02-19 14:37:27 +01:00
pvdk
b43325119a Some changes to the version retrieval: ignore shallow clones 2014-02-19 14:19:08 +01:00
pvdk
85b7240948 Made the git version retrieval more reliable 2014-02-19 13:43:14 +01:00
Nikolay Kasyanov
4a61868521 OS X: fixed Ogre plugin packaging 2014-02-16 19:01:28 +04:00
Nikolay Kasyanov
e4017b8bfe It seems that OctreeSceneManager is not required anymore 2014-02-16 14:16:45 +04:00
Nikolay Kasyanov
3c281c6a62 OS X: specify path to framework binary, not to framework directory 2014-02-16 14:12:45 +04:00
Nikolay Kasyanov
c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676 Merge branch 'master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:34:06 +04:00
scrawl
4e6507248b Fix travis build 2014-02-13 12:19:21 +01:00
pvdk
19bef4fce8 Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
pvdk
43bc223e68 Added version info retrieval from git tags 2014-01-22 17:04:49 +01:00
scrawl
37a59a37c6 Remove cpack (no longer used, according to BrotherBrick) 2014-01-17 15:20:28 +01:00
scrawl
659d790048 uuid is not used 2014-01-17 15:20:28 +01:00
scrawl
d4aeb177f9 Remove unused btKinematicCharacterController 2014-01-15 14:53:29 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +01:00
Dmitriy 'Endorph' Shkurskiy
116f125f05 Windows-specific definition to deny SDL from providing it's own WinMain() 2014-01-04 07:46:30 +02:00
Marc Zinnschlag
0d3e67dafc Merge branch 'master' into openmw-28 2014-01-02 13:39:36 +01:00
scrawl
5b0a4c9424 Get rid of unused file and some other cruft. 2014-01-02 01:44:09 +01:00
Marc Zinnschlag
fe34c9cf1f increased version number 2014-01-01 15:06:31 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Nikolay Kasyanov
892ff93489 OS X: attempt to fix #1045 2013-12-25 00:25:58 +04:00
Nikolay Kasyanov
73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized 
plugin install routine.
 2013-12-12 15:20:04 +04:00
Nikolay Kasyanov
874ecee079 OS X: do not enforce static boost, this can be set externally 
anyway
 2013-12-12 14:20:13 +04:00
Nikolay Kasyanov
89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 2013-12-12 14:19:48 +04:00
Nikolay Kasyanov
87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 2013-12-12 13:53:35 +04:00
Nikolay Kasyanov
99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 2013-12-12 13:53:35 +04:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
eroen
d4b8ac5b49 don't dpkg on windows and macos 
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
 2013-11-15 16:53:05 +01:00
eroen
67284e2f9d Introduce -DBUILD_WITH_DPKG to toggle dpkg based install 
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.

This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
 2013-11-15 15:59:38 +01:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Marc Zinnschlag
ef401a774b Merge remote-tracking branch 'eroen/install-fix' 2013-11-08 09:10:44 +01:00
Marc Zinnschlag
224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 2013-11-08 09:10:26 +01:00
Bret Curtis
5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-08 09:08:56 +01:00
eroen
e885c502a1 Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:37:55 +01:00
eroen
6b931f566d Stop installing "Daedric Font License.txt" 
It was removed in 3a827d9c12
 2013-11-08 04:30:15 +01:00
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
Marc Zinnschlag
f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 2013-11-05 08:19:29 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
Marc Zinnschlag
b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 2013-10-29 14:18:13 +01:00
Alexander "Ace" Olofsson
632a53ead4 Support packing the OpenCS into windows builds 2013-10-29 13:28:43 +01:00
Marc Zinnschlag
29fce6d11f increased version number 2013-10-28 08:45:56 +01:00
Marek Kochanowicz
b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4 This appears to work. 2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 2013-10-20 09:50:16 +02:00
Nikolay Kasyanov
3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 2013-10-14 20:37:55 +04:00
Nikolay Kasyanov
a18e3c9cc1 Fixed packaging when building against Ogre 1.9 2013-09-15 23:10:21 +04:00
Nikolay Kasyanov
36fb89c6cd Cleanup 2013-09-15 23:03:07 +04:00
Marc Zinnschlag
9637e1641b fix for building with system tinyxml 2013-09-14 13:33:49 +02:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
Marc Zinnschlag
4dbacdc6bd increased version number 2013-09-02 10:58:58 +02:00
Marc Zinnschlag
0c8f85f17d Merge remote-tracking branch 'wheybags/master' 2013-08-20 11:05:50 +02:00
scrawl
13afcc9324 Don't link to OgreTerrain 2013-08-19 22:22:14 +02:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Tom Mason
ceb3317807 Integrate unshield with launcher 2013-08-19 20:19:01 +01:00
eroen
8d925b7fd6 cleanup 
-   drop trailing slashes from paths for consistency
-   sort entries that got unsorted
 2013-08-19 20:39:37 +02:00
eroen
0076c558d6 Re-introduce lost functionality 
The branch merged in 5a863589b4 removed fine-grained configure-time control
over install paths. This is necessary to accomodate various linux distros'
policies, eg. Gentoo wants games installed in /usr/games, but with resource
files in /usr/share/games.

DOCDIR and MANDIR appear to be unused, and were not re-introduced.
 2013-08-19 20:39:37 +02:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
bwrsandman
36fb7f3a72 Cleanup 2013-07-31 11:51:33 -04:00
bwrsandman
71a75d2ab8 Small fixes 2013-07-31 11:49:23 -04:00
bwrsandman
9a900908cd Merge deb and non-deb 2013-07-31 11:25:11 -04:00
bwrsandman
e22b7c8fc1 Add use of SYSCONFDIR path for conf files in deb 2013-07-31 11:11:03 -04:00
bwrsandman
799c84b846 Moved deb version checking down with cpack 2013-07-31 10:27:01 -04:00
bwrsandman
3baf44c4b5 Moved non-deb install section up for readability 2013-07-31 10:19:05 -04:00
bwrsandman
0e02d7817e Moved non-deb up for readability 2013-07-31 10:13:04 -04:00
bwrsandman
b6e3b5e834 Add licenses to installed files for non-deb packages. 2013-07-31 09:47:12 -04:00
bwrsandman
98289f051f Set location for all non apple unixes, not just debian. 2013-07-31 04:04:27 -04:00
Marc Zinnschlag
20e92c2cdf increased version number 2013-07-21 14:17:01 +02:00
k1ll
39a12ab9cf CXX Flags aren't definitions 2013-06-27 19:20:14 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
7175c7cfe0 Updated OpenMW project CMakeLists.txt to include opencs.cfg file 
installation.
 2013-06-23 21:17:52 -05:00
Bret Curtis
84a8ea4ef7 static sdl2 compilation option for Unixes that are not Apple 2013-06-18 14:31:47 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
Nikolay Kasyanov
6abb7a18b0 SDL2 input: seems to work on OS X, has some input issues though 2013-06-15 14:40:18 +04:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
Nikolay Kasyanov
d13430e2b8 Fix for CMake > 2.8.9 on OS X 2013-06-09 20:59:31 +04:00
eroen
886bc7e2f6 libc++ fixes: don't rely on tr1 
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.

Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
 2013-05-26 12:44:30 +02:00
Marc Zinnschlag
3ae02547d2 increased version number 2013-05-23 22:42:36 +02:00
scrawl
a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 2013-05-22 21:01:05 +02:00
bwrsandman
8cdef343ef take default prefix into account 2013-05-10 05:21:10 -04:00
bwrsandman
642ac15721 moved openmw resources to /usr/share/games and added missing files 2013-05-09 23:24:46 -04:00
bwrsandman
a5db557e22 fixed /share to be /usr/share 2013-05-09 22:32:43 -04:00
Marc Zinnschlag
3b3a052f4f increased version number 2013-04-18 22:36:48 +02:00