6449f68d61
Merge branch 'master' into sdl_input
12 years ago
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
35f4d09288
swscale handled better (cmake)
12 years ago
dcfa902525
fixed error in cmake when disabling esmtool
12 years ago
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
334588bf1c
Merge branch 'editor2'
12 years ago
3829bbfeca
Look for all available sound input libs as needed, and warn if not found
12 years ago
8cde6db665
We no longer need SDL
12 years ago
e4ac7a4df4
remove libboost1-xxx from deb depends since we can compile statically
12 years ago
c49966dd29
started over
12 years ago
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
4114e823ac
Allow the ability to choose to compile against boost libs statically.
12 years ago
d97d4b8ef0
updated version number
12 years ago
d432420a32
fix FindFFmpeg.cmake
12 years ago
c3cd6e8a8a
new attempt at the editor
12 years ago
37a42c7dbc
increased version number; updated changelog
12 years ago
648b53ef93
removed unused launcher.cfg file
12 years ago
35d099a638
disabling gcc extensions
12 years ago
4b5706d652
Fixed packaging on OS X
12 years ago
747a4e1123
increased version number and updated readme
12 years ago
256dff0a29
Disable warning 4800 for Visual Studio
...
Visual Studio 2010 complains about constructs such as:
int myInt = 1;
bool myBool = myInt;
Which are fine with most compilers. It would instead like:
int myInt = 1;
bool myBool = (myInt != 0);
Warning 4800 is just an optimization warning and is therefore safe to
disable. This patch disables warning 4800.
12 years ago
6ac2a12296
item selection working on the preview
12 years ago
4076c19cc6
silencing a cmake warning
12 years ago
3c2efbe966
Disable "make install" for Debian based linux distributions.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
a61edb60fd
Fixed an issue with windows CPack failing due to trying to install linux binaries
12 years ago
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
65678b95f0
Added support for make install.
...
Added support for make install based on patch from Hasufells
repository:
https://github.com/hasufell/hasufell-overlay/tree/master/games-engines/openmw/files
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
13 years ago
7952d38e6c
Use debug dlls when debugging in vs2010 (try 2)
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
It also defines DEBUG to make it easier turn things on and off when
debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
13 years ago
3112bfb54f
incremented version number
13 years ago
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
13 years ago
ebe131b326
Use debug dlls when debugging in vs2010
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
13 years ago
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
86d6f190bf
Input system rewrite
13 years ago
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
e7a1ab9fa6
Define OGRE_PLUGIN_DEBUG_SUFFIX in all cases.
13 years ago
7161361b52
cleanup
13 years ago
23e44a86c6
another attempt to fix
13 years ago
a0a086f69d
fixed redefining macro
13 years ago
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
13 years ago
0f40e6fc65
find boost without components so we can use Boost_VERSION
13 years ago
94ce95c679
bug #348 : works again on OS X
13 years ago
ac5bd38df9
some cmake fixes
13 years ago
b2dcf5adcd
support system install for boost wave
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
e9b95d55cd
Revert "Proper way to find and use libtbb"
...
This reverts commit d6bf2b7d29
13 years ago
d6bf2b7d29
Proper way to find and use libtbb
13 years ago
e862b6b5a5
Fix comparison in cmake
13 years ago
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
2a3ce5ee6d
Remove Mangle::Stream
...
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
13 years ago
9ed2f1df67
boost wave not needed anymore
13 years ago
94c3fb81d1
check if CMAKE_BUILD_TYPE is defined instead of defining it by default
13 years ago
32e14907a2
add a default value for CMAKE_BUILD_TYPE, resolves error when it is not set
13 years ago
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
fb109ec7e2
use debug versions of ogre plugins in debug mode
13 years ago
de9b7a51de
change glsl #version, remove CG from required libraries
13 years ago
a1e48b0feb
builds now
13 years ago
24399a45c1
add submodule with current code
13 years ago
68459441f2
adjusting version number
13 years ago
82fba53771
Removed the license screen and changed so all licenses are instead installed to the game folder.
13 years ago
3673cd2531
increased version number
13 years ago
a4d6d1baff
added a utility for creating texture atlas at runtime
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
f7a03b39c4
Some improvments for windows builds and installer
13 years ago
1ce759af06
Merging in master
13 years ago
0c739825f2
another fix
13 years ago
582d7ab213
building & packaging improvements for OS X
13 years ago
b76fd249c7
updated changelog; bumped version number
13 years ago
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
8156e9e5c4
Fixed install search path for openmw.desktop. It's directly in the binary dir.
13 years ago
2d6cd16296
Now Debian Packages install the configured openmw.desktop file.
13 years ago
dc2751f4ec
Moved Build options to the top. I need this for my tar.gz packages but i think this is a good idea in general.
13 years ago
226f312163
Set the version in the openmw.desktop file via CMake
13 years ago
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
13 years ago
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
944654f263
image rotating function
13 years ago
74deb5588d
Post merge
13 years ago
ebab98a8a0
Restructuring things
13 years ago
bf5a009299
Some improvements to the windows installer
13 years ago
f2c4e513a4
Add support for building with a static build of the MyGui Libraries.
13 years ago
2b4b941192
Merge branch 'master' into gamesettings
13 years ago
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
13 years ago
07d0203a3c
Merge remote-tracking branch 'upstream/master'
13 years ago
63e0e82049
Implement an Audiere-based decoder
13 years ago
c2a82c3d89
Merge branch 'master' into gamesettings
13 years ago
f4bbcb48a6
settings-default.cfg
13 years ago
ed58e9e553
Merge remote-tracking branch 'upstream/master'
13 years ago
0021ccf862
Merge remote-tracking branch 'upstream/master'
13 years ago
35f787c4bf
Merge remote-tracking branch 'upstream/master'
13 years ago
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
fbd626baf6
mwiniimporter
13 years ago
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
13 years ago
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
13 years ago
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
ef2f7e841a
Merge branch 'master' of github.com:Kromgart/openmw
13 years ago
f2075c7f4f
temporarily silence warnigns in OGRE headers
13 years ago
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
6bea08157e
Merge branch 'master' into terrain18
13 years ago
2b2eb34f8f
Merge remote branch 'corristo/master' into next
13 years ago
362e6cb9ed
Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer
13 years ago
35c3a0a3f9
Add Boost_USE_STATIC_LIBS parameter for Windows
...
If this parameter is not set in windows, cmake expects
boost libraries to be named "boost_*.lib", while they are
actually "libboost_*.lib"
In findBoost.cmake (728):
# Setting some more suffixes for the library
set (Boost_LIB_PREFIX "")
if (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN)
set(Boost_LIB_PREFIX "lib")
endif()
13 years ago
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
8e76451cda
Fix launcher style installation on OS X again
13 years ago
dcdc759719
Adding readme to windows builds
13 years ago
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
13 years ago
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
13 years ago
250fcab7c2
moved the mygui resources to a more suitable location
13 years ago
9a48002025
Fix compilation of the FFmpeg decoder
13 years ago
66baf9ec81
Merge branch 'master' into mygui
13 years ago
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
13 years ago
50b79de10b
Merge remote branch 'psi29a/master'
13 years ago
b6b972b73b
Removed libbullet and libogre dependencies and added nvidia-toolkit.
...
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
13 years ago
42584b013f
Updated dependency to match our PPA
13 years ago
ed7cb1dc67
restarting
13 years ago
fc95917253
Fix for not visible pthreads function with glibc 2.15
...
Linking error will appear:
Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
51fb9e67cd
Merge
13 years ago
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
cab869824a
bumping version number
13 years ago
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
655f9fe920
Merge remote branch 'k1ll/staticogre'
13 years ago
b83b7d0650
Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.
13 years ago
246b0266fb
Remove references to Audiere. It's not supported for now.
13 years ago
45b612ab3b
Add a skeleton output classs using OpenAL
13 years ago
42b445383f
Remove Mangle- and OpenEngine-related sound code
...
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
5b08baf5bf
a little fix for CMake to be able not to build the launcher
13 years ago
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
5b378e820d
warning level adjustments and some related fixes
13 years ago
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
13 years ago
311c0b04e2
Merge remote branch 'ace/win-warning'
13 years ago
04494893c8
Added some release mode warnings
13 years ago
ff866269ec
Merge remote branch 'corristo/pgrd'
...
Removed a warning
Conflicts:
CMakeLists.txt
13 years ago
477525ee48
Minor modification and spelling correction
13 years ago
ac0ba0c273
A little bit more commenting and sorting out the "normally not enabled" warnings
13 years ago
e7c3ddfe40
Final warning changes
13 years ago
2f11bfc984
I think I've added all the warnings now
13 years ago
cecc823cd0
Commented list of disabled warnings to start with
13 years ago
d22678faab
fixed wrong merge
13 years ago
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
13 years ago
6325697bfe
Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name
13 years ago
387c84e606
small fix in CMakeLists, thx ace13
13 years ago
5328853445
Feature #37 (In Progress) Render Path Grid
...
added "togglepathgrid" script command
13 years ago
5beee8598d
Giving the windows installer a more personal look.
13 years ago
8be661c802
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
13 years ago
2429f3960f
Merge remote-tracking branch 'upstream/master' into launcher
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
13 years ago
40e07bbd2a
Feature #161 (In Progress) Load REC_PGRD records
...
Struct sizes seems correct, but floats is broken
13 years ago
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
13 years ago
a86d2877fc
Merge remote branch 'ace/win64-fixes'
13 years ago
b283ad86fb
revert to old launcher stylesheet location on OS X
13 years ago
2c4ef5c670
64-bit install path on windows was easier to fix than expected.
13 years ago
11ec5cf2e2
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
13 years ago
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
13 years ago
5b54a658d8
Launcher improvements: ask for data dir and write it to cfg if none is found
...
and prevent removal of the default profile
13 years ago
7505c96fbb
Merge remote branch 'lgro/master'
13 years ago
cb5534c608
Updated website URL in CMakeLists file.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
822f47fbac
Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms
13 years ago
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
13 years ago
b2b09320fc
Merge branch 'config'
13 years ago
694a537b57
- removed caelum sources, resources, build scripts
13 years ago
f7462f980f
added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS
13 years ago
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
13 years ago
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
13 years ago
6a71cf21b0
Added OpenAL redistributable to OpenMW installer
13 years ago
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
13 years ago
57a4b19880
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
13 years ago
8277df04b1
bumping version number
13 years ago
10d4771550
Merge remote branch 'corristo/osx-packaging'
13 years ago
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
13 years ago
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
13 years ago
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
13 years ago
72c4f75212
Only install redist if it exists
13 years ago
4fe31fbd61
Simple windows packaging with CPack (NSIS)
13 years ago
705b2955a0
Feature #162 - Need to create app bundle using CMake, not by hand.
...
In progress, working towards plugins support.
13 years ago
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
13 years ago
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
13 years ago
8798f7dd40
Bringing in some of Azathoth's work
13 years ago
cb1373a4c7
rewrote cmake scripts for components
13 years ago
ad086312b8
testing: cmake script simplification
13 years ago
a3a1b82929
Updated deb dependancies against Ubuntu 11.10 which is more or less in parity with Debian Sid.
13 years ago
5bfd953dd4
Merge remote branch 'gus/journal'
13 years ago
22514cbd4c
Merge branch 'debfix'
13 years ago
9872c89539
packaging fixes for .deb packages
13 years ago
a6ffa1a82a
Allow not to build the launcher
13 years ago
7c8853f6fe
post-merge fixes
13 years ago
84a2053671
increased version number; another version number handling fix releated to deb packages
14 years ago
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
7c023a9973
fixed version number
14 years ago
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
14 years ago
46e93eda40
Merge branch 'newlauncher'
14 years ago
9921e86790
Forcing to build with 10.6 sdk on OS X.
14 years ago
24a07eef05
Merge remote-tracking branch 'upstream/master' into newlauncher
14 years ago
6ddf9e4cc5
minor correction
14 years ago
d5e4635198
state OpenMW version on doxygen main page
14 years ago
f07f363a21
declare OpenMW version in CMakeLists.txt
14 years ago
e48d265b5d
Mac fix: added local config dir support, app root dir is dir where bundle located
14 years ago
d7a3b84b3d
Merge remote-tracking branch 'upstream/master' into newlauncher
14 years ago
231be8f381
Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file).
14 years ago
7c1f00884d
Merge remote-tracking branch 'upstream/master' into newlauncher
14 years ago
d260e5c1bd
added file collection class
14 years ago
7b554897e7
Merge remote-tracking branch 'upstream/master' into newlauncher
...
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
components/esm/defs.hpp
components/esm/loadappa.hpp
components/esm/loadbody.hpp
components/esm/loadclas.hpp
components/esm/loadcrea.hpp
components/esm/loadsndg.hpp
components/interpreter/installopcodes.cpp
14 years ago
d8fa2f201a
improved description of openmw.cfg related cmake-variable
14 years ago
d47abff25d
create local openmw.cfg file for uninstalled version
14 years ago
94f3bc115f
Added missing resource file
14 years ago
fcfe267fc9
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
14 years ago
7168795ae6
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
14 years ago
eaea48011d
Now working mac app bundle generated during build
...
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
14 years ago
7131c08ca4
moved path.hpp/path.cpp to a new component
14 years ago
042c179ce7
fixed the openmw.cfg install problem (I hope)
14 years ago
73f2fdfa72
Update default version and add libbullet2.77 as a dependency
14 years ago
573090a07f
improved description of openmw.cfg related cmake-variable
14 years ago
0c4e9d9207
create local openmw.cfg file for uninstalled version
14 years ago
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
14 years ago
1e5768170f
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
14 years ago
a2c42ab5a2
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
14 years ago
08784470bc
Update default version and add libbullet2.77 as a dependency
14 years ago
91fa147146
Modified CMake to include the launcher directory
14 years ago
74d036a26a
getting rid of a cmake warning
14 years ago
6e1e3b797c
Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux.
14 years ago
4e7a056e9e
Now working mac app bundle generated during build
...
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
14 years ago
647e88003e
build and activation fix
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
14 years ago
768c9bdf07
On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root
14 years ago
943eea8104
.app bundle finally works
14 years ago
527ac956a7
More correct MacOS X bundle generation
14 years ago
4028600768
Builds on OS X now
14 years ago
e290f2f82f
Get physic fix in openengine and build nifbullet
14 years ago
1e9dc4b435
de-Windownizing and some build-fixes
14 years ago
ee0d73e142
Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions
14 years ago
8b2252e7a1
first attempt at building with bullet
14 years ago
a6c5bd0c41
correction of a spelling error
14 years ago
d1bcfcb94d
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
14 years ago
a8ade56c80
Add a bullet Shape Loader
14 years ago
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
14 years ago
d1b482d64a
Update plugins.cfg based on where cmake found ogre libraries
14 years ago
c459eb7c55
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
14 years ago
39614c6813
CMake configuration tweaks
...
Make the PkgConfig search for OGRE libraries and headers happy when custom paths are set.
Check the uuid/uuid.h header is found.
14 years ago
e7d853bb3c
Corrected subsystem link flags for MinGW.
14 years ago
15a7cc0674
That should solve link-time problems when building with mingw.
...
Not supplying "SUBSYSTEM:" flags to mingw linker.
Linking mygui with libwinmm - should resolve reference to timeGetTime().
14 years ago
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
14 years ago
54996684aa
Merge branch 'master' into gui-windows
14 years ago
64fce8d321
Added an option (USE_DEBUG_CONSOLE) to cmake file to disable the console for debug builds on windows. If set to false all debug output is redirect to the debug output of Visual Studio.
14 years ago
e47568ea2e
Merge branch 'master' into gui-windows
14 years ago
e34b86e5c2
Added new define CAELUM_STATIC which will disable all dllexport for the caelum project. Made sure the define is set for both openmw and caelum.
14 years ago
4416e71a0a
Fix for linker warnings on windows, this makes sure headers of MyGUI does not use dllexport for windows as we are supposed to link statically to the library.
14 years ago
1c79a62957
Added a static list of skill names to ESM::Skill.
14 years ago
0eae9d1504
Removed -Werror again
15 years ago
Jordan Milne
scrawl
Nathan Jeffords
Marc Zinnschlag
Chris Robinson
psi29a
Nikolay Kasyanov
Michael Mc Donnell
Lukasz Gromanowski
Alexander "Ace" Olofsson
Sebastian Wick
Dmitry Marakasov
Jason Hooks
k1ll
Roman Melnik
Brother Brick
gugus
Pieter van der Kloet
Jacob Essex
athile
Jan-Peter Nilsson
athile
Diggory Hardy
Yuri Krupenin
Jan Borsodi
Nicolay Korslund