sandstranger
7db307e028
delete unused variables
2015-12-03 22:37:42 +03:00
sandstranger
7d374b36fd
change cmake variables
2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516
addd forgotten line
2015-12-03 19:56:38 +03:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
2015-12-02 17:33:55 +01:00
scrawl
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
2015-12-02 16:14:04 +01:00
Dmitry Marakasov
84305a1297
Reuse DATADIR in data paths
2015-12-02 04:17:54 +03:00
scrawl
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-24 03:30:57 +01:00
Nikolay Kasyanov
2108e96c15
OS X: use TGA, PNG & JPEG plugins instead of ImageIO
...
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
2015-11-22 19:32:13 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Nikolay Kasyanov
63c47a78d6
OS X: fixup Qt plugin during packaging
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f
OS X: use less ambiguous variable names in packaging code
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
2015-11-14 13:50:01 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
Marc Zinnschlag
cdf17f415e
updated version number
2015-11-09 12:03:27 +01:00
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
Marc Zinnschlag
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
2015-08-11 11:49:20 +02:00
Nikolay Kasyanov
34d601360f
OS X: setup OSG plugins packaging
2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
2015-08-10 23:15:32 +02:00
Alexander "Ace" Olofsson
46ce04a65b
Don't package duplicate version for Windows
...
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
2015-08-05 17:10:35 +02:00
Alexandre Moine
581ea26605
Add appdata file for openmw and install it
2015-08-04 13:06:43 +02:00
Arthur Moore
2a653e45fd
(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.
2015-07-28 06:51:47 -04:00
Marc Zinnschlag
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
2015-07-18 12:47:05 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02: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
slothlife
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
2015-07-17 00:56:15 -05:00
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
2015-06-28 05:53:03 +02:00
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
Alexander "Ace" Olofsson
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
2015-06-08 15:41:39 +02:00
scrawl
d9a00288f8
Make install fix
2015-06-08 01:58:12 +02:00
scrawl
58917bcca6
Minor cleanup
2015-06-04 01:24:29 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
b0b55e2037
Delete niftest as it's currently broken
2015-06-01 02:48:15 +02:00
Marc Zinnschlag
d05d7f51d9
increased version number
2015-05-31 14:20:13 +02:00
scrawl
62ce2cc123
Minor cleanup
2015-05-30 20:44:19 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
f2809ab63b
Delete nifosgtest again
2015-05-23 06:53:26 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
