mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 01:49:54 +00:00
Code Issues Releases Wiki Activity
2663 commits 38 branches 54 tags 122 MiB
Commit graph

273 commits

Author SHA1 Message Date
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-07 13:29:59 +01:00
Pieter van der Kloet
2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 2012-03-05 23:43:59 +01:00
Nikolay Kasyanov
40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records 
Struct sizes seems correct, but floats is broken
 2012-03-03 18:27:38 +04:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Marc Zinnschlag
a86d2877fc Merge remote branch 'ace/win64-fixes' 2012-03-02 11:00:41 +01:00
Nikolay Kasyanov
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04:00
Alexander "Ace" Olofsson
2c4ef5c670 64-bit install path on windows was easier to fix than expected. 2012-03-01 08:13:40 +01:00
Pieter van der Kloet
11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 2012-02-28 22:45:03 +01:00
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
 2012-02-28 21:49:45 +01:00
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
 2012-02-28 17:19:44 +01:00
Marc Zinnschlag
7505c96fbb Merge remote branch 'lgro/master' 2012-02-26 12:59:11 +01:00
Lukasz Gromanowski
cb5534c608 Updated website URL in CMakeLists file. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-26 12:12:00 +01:00
Nikolay Kasyanov
822f47fbac Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms 2012-02-25 18:05:29 +04:00
Pieter van der Kloet
280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc Merge branch 'config' 2012-02-21 13:55:58 +01:00
scrawl
694a537b57 - removed caelum sources, resources, build scripts 2012-02-21 00:14:20 +01:00
scrawl
f7462f980f added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS 2012-02-20 18:39:12 +01:00
Marc Zinnschlag
db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 2012-02-20 14:54:08 +01:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
Alexander "Ace" Olofsson
6a71cf21b0 Added OpenAL redistributable to OpenMW installer 2012-02-16 08:52:26 +01:00
Marc Zinnschlag
d9c1ed3d5e Merge remote branch 'corristo/osx-packaging' into config 2012-02-15 10:32:16 +01:00
Nikolay Kasyanov
57a4b19880 Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete 2012-02-15 11:27:51 +04:00
Marc Zinnschlag
8277df04b1 bumping version number 2012-02-14 09:26:06 +01:00
Marc Zinnschlag
10d4771550 Merge remote branch 'corristo/osx-packaging' 2012-02-13 16:35:13 +01:00
Nikolay Kasyanov
5a42c6c6f5 Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher 2012-02-13 10:31:43 +04:00
Marc Zinnschlag
facc36fa34 Merge remote branch 'corristo/osx-packaging' into packaging 2012-02-12 13:35:54 +01:00
Nikolay Kasyanov
472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 2012-02-01 20:48:13 +04:00
Alexander "Ace" Olofsson
72c4f75212 Only install redist if it exists 2012-01-29 23:12:40 +01:00
Alexander "Ace" Olofsson
4fe31fbd61 Simple windows packaging with CPack (NSIS) 2012-01-29 23:08:02 +01:00
Nikolay Kasyanov
705b2955a0 Feature #162 - Need to create app bundle using CMake, not by hand. 
In progress, working towards plugins support.
 2012-01-30 00:28:02 +04:00
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) 2012-01-29 23:41:27 +04:00
Jacob Essex
18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 2012-01-21 16:59:08 +00:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Marc Zinnschlag
ad086312b8 testing: cmake script simplification 2011-10-22 13:55:06 +02:00
Brother Brick
a3a1b82929 Updated deb dependancies against Ubuntu 11.10 which is more or less in parity with Debian Sid. 2011-10-12 13:58:59 +02:00
Marc Zinnschlag
5bfd953dd4 Merge remote branch 'gus/journal' 2011-09-30 09:38:16 +02:00
Marc Zinnschlag
22514cbd4c Merge branch 'debfix' 2011-09-30 09:36:21 +02:00
Marc Zinnschlag
9872c89539 packaging fixes for .deb packages 2011-09-30 09:36:06 +02:00
gugus
a6ffa1a82a Allow not to build the launcher 2011-09-29 14:59:20 +02:00
Marc Zinnschlag
7c8853f6fe post-merge fixes 2011-09-27 09:45:28 +02:00
Marc Zinnschlag
84a2053671 increased version number; another version number handling fix releated to deb packages 2011-09-07 09:17:50 +02:00
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
athile
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. 2011-01-10 13:48:16 -07:00
Diggory Hardy
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.
 2011-01-09 10:22:21 +01:00
Yuri Krupenin
e7d853bb3c Corrected subsystem link flags for MinGW. 2011-01-08 23:58:47 +03:00
Yuri Krupenin
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().
 2011-01-04 14:40:28 +03:00
Jan Borsodi
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. 2010-09-24 15:28:14 +02:00
Jan Borsodi
54996684aa Merge branch 'master' into gui-windows 2010-09-19 02:04:36 +02:00
Jan Borsodi
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. 2010-09-19 02:01:01 +02:00
Jan Borsodi
e47568ea2e Merge branch 'master' into gui-windows 2010-09-14 23:27:35 +02:00