Pieter van der Kloet
ee27e3bb58
Merge remote-tracking branch 'upstream/next' into settingsnext
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
apps/launcher/datafilespage.hpp
apps/launcher/graphicspage.cpp
components/fileorderlist/utils/filedialog.cpp
components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
Pieter van der Kloet
0e143b1926
Merge remote-tracking branch 'upstream/master' into settingsparser
2013-02-15 14:45:19 +01:00
Pieter van der Kloet
43e9ad8733
The text color of the profiles dialog now turns red on invalid names
2013-02-15 14:26:09 +01:00
Pieter van der Kloet
990895fd2b
Mainwindow size and position now gets saved/restored
2013-02-15 14:12:25 +01:00
Pieter van der Kloet
1b9cf8c23f
More work on integrating the settings parser, profiles are handled correctly
2013-02-15 01:20:48 +01:00
Pieter van der Kloet
5d1bede9e5
Forgot to add two files
2013-02-14 11:20:47 +01:00
Marc Zinnschlag
5e3529783d
Merge remote-tracking branch 'ace/win-fixes' into next
2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
bbb845824d
Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__
2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson
0ae01794f1
Fixed build errors in OpenCS
2013-02-12 13:57:16 +01:00
Alexander "Ace" Olofsson
f9a0a19ee1
Fix a small issue in the windows installer, also added the OpenMW version to the installed package name
2013-02-12 13:23:25 +01:00
Sergey Shambir
7d7a1119da
Fixed book text misalignment, at least in some cases
...
https://bugs.openmw.org/issues/284
2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5
BookTextParser: moved to Ogre::UTFString
...
Font height and unicode characters glyph width now accounted correctly.
2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668
BookTextParser: fixed infinitive loop
2013-02-12 11:14:30 +04:00
Marc Zinnschlag
ba97c8f7d6
updated credits file
2013-02-11 19:54:32 +01:00
Marc Zinnschlag
1a079ec8d3
Merge branch 'master' into next
2013-02-11 19:53:51 +01:00
Marc Zinnschlag
04001717e7
Merge remote-tracking branch 'scrawl/master'
2013-02-11 19:43:50 +01:00
Marc Zinnschlag
1fd7d8ed2a
Merge remote-tracking branch 'graffy76/master' into next
2013-02-11 15:35:59 +01:00
Pieter van der Kloet
aa25471517
WIP: working on improving the config file handling
2013-02-11 15:01:00 +01:00
graffy76
55dd17c27c
Added setBarColor() function to CSVDoc::Operation. Created four color
...
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
2013-02-11 04:30:16 -06:00
scrawl
62c711d709
Small change to delete microcode cache more aggressively.
2013-02-11 02:28:02 +01:00
Marc Zinnschlag
64d9d9e2ce
Merge remote-tracking branch 'wheybags/master' into next
2013-02-10 17:29:28 +01:00
Tom Mason
c32c31f6d6
break after activating button
2013-02-10 15:41:02 +00:00
Tom Mason
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
2013-02-10 14:58:46 +00:00
Marc Zinnschlag
959accc4d5
Merge remote-tracking branch 'corristo/osx-ffmpeg-sound-fix'
2013-02-10 12:58:36 +01:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Marc Zinnschlag
2d937cd9e2
Merge branch 'gmst' into next
2013-02-09 15:26:25 +01:00
Marc Zinnschlag
d40ee06897
fixed base/modified logic
2013-02-09 15:25:50 +01:00
Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Marc Zinnschlag
828695f295
added value column to gmst table
2013-02-08 14:48:38 +01:00
Marc Zinnschlag
cce2d63433
added type column to gmst table
2013-02-08 12:20:03 +01:00
Marc Zinnschlag
d5dd0640c7
basic gmst support
2013-02-08 09:58:19 +01:00
Nikolay Kasyanov
0d4b0bfd93
Trying to resolve sound issues on OS X with ffmpeg backend
2013-02-07 23:40:20 +04:00
Marc Zinnschlag
dd2b7d5c63
handle deleted records
2013-02-07 13:26:00 +01:00
Marc Zinnschlag
c1cd8305bc
a bit of cleanup for the previous commit
2013-02-07 13:13:06 +01:00
Marc Zinnschlag
21733e8181
hide startup dialogue when opening open dialogue
2013-02-07 13:11:41 +01:00
Marc Zinnschlag
adcaea464b
basic globals record loading
2013-02-07 12:52:01 +01:00
Marc Zinnschlag
7d112e4d5c
rewrote logic of content file loading
2013-02-07 11:33:08 +01:00
scrawl
814969dcae
Cache integrity check uses relative paths, so that changing the build folder works without reset
2013-02-07 02:23:41 +01:00
Marc Zinnschlag
43912f927a
Merge remote-tracking branch 'potatoesmaster/importer' into next
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-06 10:12:40 +01:00
Emanuel Guevel
a4f051e85a
Fix game files import
2013-02-06 00:51:05 +01:00
Emanuel Guevel
6e3c016351
Add archives to settings imported by mwiniimporter
...
Add Morrowind.bsa by default.
2013-02-06 00:51:05 +01:00
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
2013-02-05 21:23:49 +01:00
Marc Zinnschlag
c409f1184e
cleaned up object movement and fixed a bug regarding local scripts
2013-02-05 12:19:06 +01:00
Marc Zinnschlag
86fb3574a0
Merge remote-tracking branch 'wheybags/master' into next
2013-02-05 11:55:47 +01:00
Marc Zinnschlag
cfceb45009
adjusted gcc settings again to avoid problems with older compiler versions
2013-02-05 11:53:48 +01:00
Marc Zinnschlag
3fe5757770
updated changelog for 0.21.0 again
2013-02-05 10:28:49 +01:00
scrawl
09180666b2
Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix
2013-02-05 00:21:42 +01:00
scrawl
58cf182db2
better place for syncing
2013-02-05 00:21:29 +01:00
