pvdk
|
21c406316f
|
Working on the Settings tab: start the importer/wizard
|
2014-04-16 16:54:55 +02:00 |
|
pvdk
|
ef38fae09d
|
Merge remote-tracking branch 'upstream/master' into wizard
|
2014-03-29 11:56:35 +01:00 |
|
Marc Zinnschlag
|
2c2106205d
|
Merge remote-tracking branch 'scrawl/master'
|
2014-03-28 09:56:35 +01:00 |
|
scrawl
|
d7df9cae21
|
Bug #1224: Changed fix to potentially allow for language independent saves
|
2014-03-27 22:32:42 +01:00 |
|
scrawl
|
53ba23e303
|
Fixes #1224: Store class name instead of id in savegame header
|
2014-03-26 19:56:12 +01:00 |
|
Marc Zinnschlag
|
1b6b4e3442
|
Merge remote-tracking branch 'slothlife/weather_save'
|
2014-03-23 08:36:45 +01:00 |
|
scrawl
|
452b522bc3
|
Fix typos
|
2014-03-22 19:01:41 +01:00 |
|
slothlife
|
00eac7d53a
|
Fixed header include guard to match filename
|
2014-03-21 01:22:54 -05:00 |
|
slothlife
|
6eab9c5179
|
Move weather state save/load to a new class
|
2014-03-21 01:19:40 -05:00 |
|
slothlife
|
1acd1bd913
|
Feature #1173: Saved Game: include weather state
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
|
2014-03-20 01:25:52 -05:00 |
|
Marek Kochanowicz
|
6416ae90d2
|
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
|
2014-03-19 10:23:15 +01:00 |
|
scrawl
|
c8c0e5de38
|
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
|
2014-03-16 23:49:06 +01:00 |
|
pvdk
|
8fe837ae6e
|
Merge remote-tracking branch 'upstream/master' into wizard
|
2014-03-16 20:05:12 +01:00 |
|
scrawl
|
b0a1e1198a
|
Yet another terrain fix
|
2014-03-16 16:30:17 +01:00 |
|
scrawl
|
a9dcc90970
|
Another terrain fix
|
2014-03-09 11:59:23 +01:00 |
|
Marc Zinnschlag
|
2de862126a
|
moved resources group creation from Engine to bsa component
|
2014-03-09 11:42:39 +01:00 |
|
scrawl
|
b8ca067730
|
Small fix for terrain
|
2014-03-09 03:21:34 +01:00 |
|
Marc Zinnschlag
|
f1353dc84f
|
Merge branch 'scene'
|
2014-03-06 16:46:44 +01:00 |
|
scrawl
|
d0f98103e4
|
Terrain: re-added "distant land=off" path
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
|
2014-03-06 03:04:23 +01:00 |
|
scrawl
|
1d926816b5
|
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
4328e08162
|
Terrain: get rid of unneeded members
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
6a002d19b3
|
Terrain: destroy no longer used materials
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
97c3efb3ba
|
Terrain: decoupled Chunk from QuadTreeNode.
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
edb5a54092
|
Include some more required Ogre headers explicitely.
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
195071efc7
|
Terrain: geometry is now loaded in background threads.
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
b3fed853ae
|
Terrain: take cell world size into account for LOD selection
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
6c863486e1
|
Terrain: fix an embarrassing copy&paste mistake.
|
2014-03-05 21:46:36 +01:00 |
|
scrawl
|
64c9932597
|
Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)
|
2014-03-05 21:46:36 +01:00 |
|
scrawl
|
c9e349f60f
|
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
|
2014-03-05 21:46:36 +01:00 |
|
Bret Curtis
|
ab224f93c9
|
remove our stdint.h version that uses boost and force usage of system stdint.h
|
2014-03-05 17:08:58 +01:00 |
|
Marc Zinnschlag
|
f9d2fde783
|
Merge branch 'openmw-29'
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
|
2014-03-04 09:34:38 +01:00 |
|
Marc Zinnschlag
|
6e8b9c88b2
|
changed name of default worldspace (should reduce chance of a name conflict)
|
2014-03-02 22:43:15 +01:00 |
|
cc9cii
|
46867ec0cf
|
Fix file handles being left open on windows builds
|
2014-03-01 07:24:20 +11:00 |
|
cc9cii
|
2421f23c2f
|
cleanup the mess...
|
2014-02-27 23:59:23 +11:00 |
|
pvdk
|
3792b301e9
|
Wizard now runs the ini-importer to import settings from Morrowind.ini
|
2014-02-25 15:33:30 +01:00 |
|
pvdk
|
fb59112b74
|
Merge remote-tracking branch 'upstream/master' into wizardhead
|
2014-02-24 13:58:51 +01:00 |
|
Marc Zinnschlag
|
bfcd768078
|
various bits of cleanup
|
2014-02-23 21:39:18 +01:00 |
|
cc9cii
|
1ab5948f19
|
merge upstream changes
|
2014-02-23 19:11:37 +11:00 |
|
Marc Zinnschlag
|
d780364842
|
fixed record size type
|
2014-02-22 17:31:44 +01:00 |
|
Marc Zinnschlag
|
b0ae5b8ab7
|
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
|
2014-02-22 17:16:55 +01:00 |
|
cc9cii
|
fcfc8fcccb
|
Revert "Allow MinGW64 compilation in Windows/msys"
This reverts commit c3f350e3fb .
Conflicts:
libs/platform/string.h
|
2014-02-22 23:45:13 +11:00 |
|
cc9cii
|
c241405d91
|
Fix Windows save & load.
|
2014-02-22 12:15:20 +11:00 |
|
cc9cii
|
c3f350e3fb
|
Allow MinGW64 compilation in Windows/msys
|
2014-02-22 12:06:50 +11:00 |
|
Marc Zinnschlag
|
c5b2c154f8
|
another esm writer fix
|
2014-02-20 12:49:56 +01:00 |
|
Marc Zinnschlag
|
72b29ddb79
|
fix broken esm writer header code
|
2014-02-20 12:35:57 +01:00 |
|
pvdk
|
c54217d008
|
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
|
2014-02-19 19:26:07 +01:00 |
|
scrawl
|
1fba5d1bb9
|
Terrain: change world bounds from AABB to 4 floats
|
2014-02-19 11:23:03 +01:00 |
|
scrawl
|
90f6cda4cc
|
Moved includes to appropriate place
|
2014-02-19 11:23:03 +01:00 |
|
Marc Zinnschlag
|
44f6f79bf5
|
Merge remote-tracking branch 'corristo/osx-ogre-19'
|
2014-02-16 17:12:52 +01:00 |
|
Marc Zinnschlag
|
9788bbcab9
|
partially store creature state in saved game files (only attributes and dynamics for now)
|
2014-02-16 15:56:36 +01:00 |
|