Commit Graph

284 Commits (62908c9ef58502a2153544b8387739b6f1cef39a)

Author SHA1 Message Date
Alexander "Ace" Olofsson 477525ee48 Minor modification and spelling correction 13 years ago
Alexander "Ace" Olofsson ac0ba0c273 A little bit more commenting and sorting out the "normally not enabled" warnings 13 years ago
Alexander "Ace" Olofsson e7c3ddfe40 Final warning changes 13 years ago
Alexander "Ace" Olofsson 2f11bfc984 I think I've added all the warnings now 13 years ago
Alexander "Ace" Olofsson cecc823cd0 Commented list of disabled warnings to start with 13 years ago
scrawl d22678faab fixed wrong merge 13 years ago
scrawl 4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
13 years ago
Nikolay Kasyanov 6325697bfe Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name 13 years ago
Nikolay Kasyanov 387c84e606 small fix in CMakeLists, thx ace13 13 years ago
Nikolay Kasyanov 5328853445 Feature #37 (In Progress) Render Path Grid
added "togglepathgrid" script command
13 years ago
Alexander "Ace" Olofsson 5beee8598d Giving the windows installer a more personal look. 13 years ago
scrawl 8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
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
Nikolay Kasyanov 40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records
Struct sizes seems correct, but floats is broken
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
scrawl 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
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
Jacob Essex 18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 13 years ago
Jason Hooks 8798f7dd40 Bringing in some of Azathoth's work 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
athile 231be8f381 Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file). 14 years ago
Pieter van der Kloet 7c1f00884d Merge remote-tracking branch 'upstream/master' into newlauncher 14 years ago
Marc Zinnschlag d260e5c1bd added file collection class 14 years ago
Pieter van der Kloet 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
Marc Zinnschlag d8fa2f201a improved description of openmw.cfg related cmake-variable 14 years ago
Marc Zinnschlag d47abff25d create local openmw.cfg file for uninstalled version 14 years ago
Pieter van der Kloet 94f3bc115f Added missing resource file 14 years ago
Nikolay Kasyanov fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
Nikolay Kasyanov 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
Nikolay Kasyanov 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
Marc Zinnschlag 7131c08ca4 moved path.hpp/path.cpp to a new component 14 years ago
Marc Zinnschlag 042c179ce7 fixed the openmw.cfg install problem (I hope) 14 years ago
Jan-Peter Nilsson 73f2fdfa72 Update default version and add libbullet2.77 as a dependency 14 years ago
Marc Zinnschlag 573090a07f improved description of openmw.cfg related cmake-variable 14 years ago
Marc Zinnschlag 0c4e9d9207 create local openmw.cfg file for uninstalled version 14 years ago
Marc Zinnschlag 7c506301b7 Merge remote branch 'corristo/header-refactoring' into header-refactoring
Conflicts:
	CMakeLists.txt
14 years ago
Nikolay Kasyanov 1e5768170f Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
Nikolay Kasyanov 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
Jan-Peter Nilsson 08784470bc Update default version and add libbullet2.77 as a dependency 14 years ago
Pieter van der Kloet 91fa147146 Modified CMake to include the launcher directory 14 years ago
Marc Zinnschlag 74d036a26a getting rid of a cmake warning 14 years ago
Pieter van der Kloet 6e1e3b797c Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux. 14 years ago
Nikolay Kasyanov 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
Marc Zinnschlag 647e88003e build and activation fix 14 years ago
gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
14 years ago
Nikolay Kasyanov edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 14 years ago
Nikolay Kasyanov 768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 14 years ago
Nikolay Kasyanov 943eea8104 .app bundle finally works 14 years ago
Nikolay Kasyanov 527ac956a7 More correct MacOS X bundle generation 14 years ago
Nikolay Kasyanov 4028600768 Builds on OS X now 14 years ago
Jan-Peter Nilsson e290f2f82f Get physic fix in openengine and build nifbullet 14 years ago
Marc Zinnschlag 1e9dc4b435 de-Windownizing and some build-fixes 14 years ago
gugus ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 14 years ago
Marc Zinnschlag 8b2252e7a1 first attempt at building with bullet 14 years ago
gugus a6c5bd0c41 correction of a spelling error 14 years ago
gugus d1bcfcb94d Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions 14 years ago