Commit graph

181 commits

Author SHA1 Message Date
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-08-19 21:06:09 +02:00
Marc Zinnschlag
7c023a9973 fixed version number 2011-07-31 20:20:52 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
2011-07-31 19:28:12 +02:00
Marc Zinnschlag
46e93eda40 Merge branch 'newlauncher' 2011-07-31 19:24:59 +02:00
Nikolay Kasyanov
9921e86790 Forcing to build with 10.6 sdk on OS X. 2011-07-27 14:15:28 +04:00
Pieter van der Kloet
24a07eef05 Merge remote-tracking branch 'upstream/master' into newlauncher 2011-07-23 23:25:05 +02:00
Marc Zinnschlag
6ddf9e4cc5 minor correction 2011-07-08 14:53:01 +02:00
Marc Zinnschlag
d5e4635198 state OpenMW version on doxygen main page 2011-07-08 14:52:34 +02:00
Marc Zinnschlag
f07f363a21 declare OpenMW version in CMakeLists.txt 2011-07-08 14:24:09 +02:00
Nikolay Kasyanov
e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 2011-06-26 20:15:42 +04:00
Pieter van der Kloet
d7a3b84b3d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-06-06 15:45:17 +02:00
athile
231be8f381 Add BULLET_ROOT for the prebuilt binaries. Fix a minor VS2010 compile issue (missing header file). 2011-05-31 21:55:08 -06:00
Pieter van der Kloet
7c1f00884d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-05-08 20:21:57 +02:00
Marc Zinnschlag
d260e5c1bd added file collection class 2011-05-05 19:00:00 +02:00
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
2011-04-28 22:05:53 +02:00
Marc Zinnschlag
d8fa2f201a improved description of openmw.cfg related cmake-variable 2011-04-28 21:55:09 +02:00
Marc Zinnschlag
d47abff25d create local openmw.cfg file for uninstalled version 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
94f3bc115f Added missing resource file 2011-04-28 21:55:06 +02:00
Nikolay Kasyanov
fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
2011-04-28 21:55:05 +02:00
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
2011-04-28 21:55:05 +02:00
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.
2011-04-28 21:55:05 +02:00
Marc Zinnschlag
7131c08ca4 moved path.hpp/path.cpp to a new component 2011-04-28 09:39:40 +02:00
Marc Zinnschlag
042c179ce7 fixed the openmw.cfg install problem (I hope) 2011-04-28 09:30:45 +02:00
Jan-Peter Nilsson
73f2fdfa72 Update default version and add libbullet2.77 as a dependency 2011-04-27 12:34:52 +02:00
Marc Zinnschlag
573090a07f improved description of openmw.cfg related cmake-variable 2011-04-24 12:41:55 +02:00
Marc Zinnschlag
0c4e9d9207 create local openmw.cfg file for uninstalled version 2011-04-24 12:39:50 +02:00
Marc Zinnschlag
7c506301b7 Merge remote branch 'corristo/header-refactoring' into header-refactoring
Conflicts:
	CMakeLists.txt
2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
2011-04-08 17:58:21 +04:00
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
2011-04-06 20:11:08 +04:00
Jan-Peter Nilsson
08784470bc Update default version and add libbullet2.77 as a dependency 2011-04-03 13:20:18 +02:00
Pieter van der Kloet
91fa147146 Modified CMake to include the launcher directory 2011-03-29 01:31:42 +02:00
Marc Zinnschlag
74d036a26a getting rid of a cmake warning 2011-03-29 00:34:35 +02:00
Pieter van der Kloet
6e1e3b797c Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux. 2011-03-28 20:25:55 +02:00
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.
2011-03-27 23:28:46 +04:00
Marc Zinnschlag
647e88003e build and activation fix 2011-03-19 19:54:37 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Nikolay Kasyanov
edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Nikolay Kasyanov
768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7 More correct MacOS X bundle generation 2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
e290f2f82f Get physic fix in openengine and build nifbullet 2011-02-27 00:47:56 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 2011-02-19 15:54:00 +01:00
Marc Zinnschlag
8b2252e7a1 first attempt at building with bullet 2011-01-30 13:19:41 +01:00
gugus
a6c5bd0c41 correction of a spelling error 2011-01-25 18:29:04 +01:00
gugus
d1bcfcb94d Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions 2011-01-23 21:42:04 +01:00
gugus
a8ade56c80 Add a bullet Shape Loader 2011-01-13 17:51:50 +01:00
Jan-Peter Nilsson
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
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 2011-01-12 18:18:06 +01:00