Nikolay Kasyanov
|
6325697bfe
|
Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name
|
13 years ago |
Alexander "Ace" Olofsson
|
5beee8598d
|
Giving the windows installer a more personal look.
|
13 years ago |
Pieter van der Kloet
|
2429f3960f
|
Merge remote-tracking branch 'upstream/master' into launcher
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
|
13 years ago |
Marc Zinnschlag
|
be70d197e5
|
Merge branch 'next'
Conflicts:
.gitignore
cmake/FindOGRE.cmake
|
13 years ago |
|
Marc Zinnschlag
|
a86d2877fc
|
Merge remote branch 'ace/win64-fixes'
|
13 years ago |
|
Nikolay Kasyanov
|
b283ad86fb
|
revert to old launcher stylesheet location on OS X
|
13 years ago |
|
Alexander "Ace" Olofsson
|
2c4ef5c670
|
64-bit install path on windows was easier to fix than expected.
|
13 years ago |
|
Pieter van der Kloet
|
11ec5cf2e2
|
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
|
13 years ago |
|
Pieter van der Kloet
|
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 |
|
Marc Zinnschlag
|
7505c96fbb
|
Merge remote branch 'lgro/master'
|
13 years ago |
Lukasz Gromanowski
|
cb5534c608
|
Updated website URL in CMakeLists file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
13 years ago |
|
Nikolay Kasyanov
|
822f47fbac
|
Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms
|
13 years ago |
|
Pieter van der Kloet
|
280babc719
|
Fixed stylesheet and configuration problems with the launcher and code cleanup
|
13 years ago |
|
Marc Zinnschlag
|
b2b09320fc
|
Merge branch 'config'
|
13 years ago |
scrawl
|
694a537b57
|
- removed caelum sources, resources, build scripts
|
13 years ago |
|
scrawl
|
f7462f980f
|
added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS
|
13 years ago |
|
Marc Zinnschlag
|
db205cf8aa
|
Merge remote branch 'scrawl/next' into test
Conflicts:
libs/openengine
|
13 years ago |
|
scrawl
|
f81b615976
|
implemented script functions FadeIn, FadeOut, FadeTo
|
13 years ago |
|
Alexander "Ace" Olofsson
|
6a71cf21b0
|
Added OpenAL redistributable to OpenMW installer
|
13 years ago |
|
Marc Zinnschlag
|
d9c1ed3d5e
|
Merge remote branch 'corristo/osx-packaging' into config
|
13 years ago |
|
Nikolay Kasyanov
|
57a4b19880
|
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
|
13 years ago |
|
Marc Zinnschlag
|
8277df04b1
|
bumping version number
|
13 years ago |
|
Marc Zinnschlag
|
10d4771550
|
Merge remote branch 'corristo/osx-packaging'
|
13 years ago |
|
Nikolay Kasyanov
|
5a42c6c6f5
|
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
|
13 years ago |
|
Marc Zinnschlag
|
facc36fa34
|
Merge remote branch 'corristo/osx-packaging' into packaging
|
13 years ago |
|
Nikolay Kasyanov
|
472d88e2c5
|
Feature #162 - Need to create app bundle using CMake, not by hand WIP
|
13 years ago |
|
Alexander "Ace" Olofsson
|
72c4f75212
|
Only install redist if it exists
|
13 years ago |
|
Alexander "Ace" Olofsson
|
4fe31fbd61
|
Simple windows packaging with CPack (NSIS)
|
13 years ago |
|
Nikolay Kasyanov
|
705b2955a0
|
Feature #162 - Need to create app bundle using CMake, not by hand.
In progress, working towards plugins support.
|
13 years ago |
|
Nikolay Kasyanov
|
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 |
|
Marc Zinnschlag
|
cb1373a4c7
|
rewrote cmake scripts for components
|
13 years ago |
|
Marc Zinnschlag
|
ad086312b8
|
testing: cmake script simplification
|
13 years ago |
Brother Brick
|
a3a1b82929
|
Updated deb dependancies against Ubuntu 11.10 which is more or less in parity with Debian Sid.
|
13 years ago |
|
Marc Zinnschlag
|
5bfd953dd4
|
Merge remote branch 'gus/journal'
|
13 years ago |
|
Marc Zinnschlag
|
22514cbd4c
|
Merge branch 'debfix'
|
13 years ago |
|
Marc Zinnschlag
|
9872c89539
|
packaging fixes for .deb packages
|
13 years ago |
gugus
|
a6ffa1a82a
|
Allow not to build the launcher
|
13 years ago |
|
Marc Zinnschlag
|
7c8853f6fe
|
post-merge fixes
|
13 years ago |
|
Marc Zinnschlag
|
84a2053671
|
increased version number; another version number handling fix releated to deb packages
|
14 years ago |
|
Lukasz Gromanowski
|
ea7eb7a62d
|
fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
14 years ago |
|
Marc Zinnschlag
|
7c023a9973
|
fixed version number
|
14 years ago |
|
Marc Zinnschlag
|
b157273cd9
|
Merge branch 'next'
Conflicts:
apps/openmw/main.cpp
|
14 years ago |
|
Marc Zinnschlag
|
46e93eda40
|
Merge branch 'newlauncher'
|
14 years ago |
|
Nikolay Kasyanov
|
9921e86790
|
Forcing to build with 10.6 sdk on OS X.
|
14 years ago |
|
Pieter van der Kloet
|
24a07eef05
|
Merge remote-tracking branch 'upstream/master' into newlauncher
|
14 years ago |
|
Marc Zinnschlag
|
6ddf9e4cc5
|
minor correction
|
14 years ago |
|
Marc Zinnschlag
|
d5e4635198
|
state OpenMW version on doxygen main page
|
14 years ago |
|
Marc Zinnschlag
|
f07f363a21
|
declare OpenMW version in CMakeLists.txt
|
14 years ago |
|
Nikolay Kasyanov
|
e48d265b5d
|
Mac fix: added local config dir support, app root dir is dir where bundle located
|
14 years ago |
|
Pieter van der Kloet
|
d7a3b84b3d
|
Merge remote-tracking branch 'upstream/master' into newlauncher
|
14 years ago |