scrawl
c4f17f5596
playercontrols switch now disables activation in general (Chris' suggestion)
2013-02-17 03:03:41 +01:00
Marc Zinnschlag
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
2013-02-16 14:50:42 +01:00
Douglas Mencken
eb09662f1d
Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead.
...
It is boost headers' job to deal with their internals.
2013-02-16 14:49:11 +01:00
Douglas Mencken
a3e421167b
esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel
...
Signed chars, unsigned chars... Just use int for index everywhere.
2013-02-16 14:48:44 +01:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
scrawl
4da11a96a5
Fixed gold ref count always becoming 1 when dropped on the ground
2013-02-15 17:34:55 +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
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
1a079ec8d3
Merge branch 'master' into next
2013-02-11 19:53:51 +01:00
Marc Zinnschlag
1fd7d8ed2a
Merge remote-tracking branch 'graffy76/master' into next
2013-02-11 15:35:59 +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
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
Sergey Shambir
59808c3e10
GUI: Birth and Class dialogs now both select 1st item in list at first
...
time.
2013-02-10 08:59:38 +04:00
Sergey Shambir
725bfe6372
TradeWindow: balance now changes per time if user holds +/- button
...
pressed
2013-02-10 08:50:36 +04:00
Sergey Shambir
bba024d6ad
Right mouse button click now stops Container GuiMode.
2013-02-10 08:37:45 +04: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
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
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
scrawl
596628d339
Fix terrain derived data update (bug 534, bug 544)
2013-02-04 23:13:01 +01:00
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
2013-02-04 22:14:14 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +01:00
Marc Zinnschlag
ba0d13fc12
moved code for creating new base content records into the Document class
2013-02-04 13:50:38 +01:00
Marc Zinnschlag
4c973a0f67
constructing documents from a file list instead of a single name
2013-02-04 13:46:54 +01:00
Marc Zinnschlag
3f0a49a2f6
Merge branch 'master' into startup
...
Conflicts:
apps/opencs/CMakeLists.txt
2013-02-04 10:22:37 +01:00
