Marc Zinnschlag
|
51bfa5cde3
|
rewrote global variable storage (using ESM variant type now)
|
2013-12-10 15:09:58 +01:00 |
|
Marc Zinnschlag
|
1fdd43bbb7
|
removed a redundant new
|
2013-12-10 12:31:18 +01:00 |
|
Marc Zinnschlag
|
1c13a9037a
|
save and load dynamic records
|
2013-12-07 13:17:28 +01:00 |
|
Marc Zinnschlag
|
030c733e2d
|
Merge branch 'master' into savedgame
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
|
2013-12-07 12:27:06 +01:00 |
|
Lukasz Gromanowski
|
e01085cac5
|
Fixes #1015: Player status window scroll state resets on status change
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-07 02:57:30 +01:00 |
|
Marc Zinnschlag
|
48b779af80
|
Merge remote-tracking branch 'ace/win-fix'
|
2013-12-06 15:17:34 +01:00 |
|
Marc Zinnschlag
|
674931a851
|
remove terminating 0 from strings read from ESM records
|
2013-12-06 14:24:14 +01:00 |
|
Alexander "Ace" Olofsson
|
baacf91de4
|
Another windows build fix
|
2013-12-06 11:37:29 +01:00 |
|
Marc Zinnschlag
|
14eff87339
|
removed some junk from ESM store
|
2013-12-06 11:34:24 +01:00 |
|
Lukasz Gromanowski
|
bfd79bfbe6
|
Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-06 07:36:16 +01:00 |
|
Marc Zinnschlag
|
07f692bdd2
|
Merge remote-tracking branch 'scrawl/master'
|
2013-12-05 16:04:50 +01:00 |
|
scrawl
|
062ea627b3
|
Add parallax mapping for objects
|
2013-12-05 15:51:07 +01:00 |
|
scrawl
|
845bc5f7eb
|
Show fatal exceptions in a message box instead of cerr when running without a terminal
|
2013-12-05 15:51:07 +01:00 |
|
scrawl
|
afa71bb622
|
Throw an exception if a BSA is not found
|
2013-12-05 15:51:07 +01:00 |
|
scrawl
|
69c0bb1723
|
Add normal, specular & parallax mapping for terrain
|
2013-12-05 15:51:01 +01:00 |
|
scrawl
|
9ab8fe1038
|
Fix bsatool warning
|
2013-12-05 15:46:33 +01:00 |
|
scrawl
|
f695deb29d
|
Remember window positions
|
2013-12-05 15:46:23 +01:00 |
|
Marc Zinnschlag
|
ee6ddc3404
|
block saving while chargen is in progress
|
2013-12-05 14:56:30 +01:00 |
|
Marc Zinnschlag
|
8b7889f8e5
|
setup player after loading a saved game
|
2013-12-05 14:22:08 +01:00 |
|
Marc Zinnschlag
|
a7b42b867b
|
more cleanup
|
2013-12-05 14:18:43 +01:00 |
|
Marc Zinnschlag
|
ce624e024b
|
make sure player record stays in place across cleanups
|
2013-12-05 14:03:25 +01:00 |
|
Marc Zinnschlag
|
e818d43bc3
|
removed an outdated typedef and some dead code
|
2013-12-05 13:21:26 +01:00 |
|
Marc Zinnschlag
|
537b2efe8e
|
first round of cleaning up world cleanup
|
2013-12-05 12:49:25 +01:00 |
|
Alexander "Ace" Olofsson
|
47c60a7037
|
Fix C4716 (Must return a value) error on Windows MSVC
|
2013-12-04 21:48:25 +01:00 |
|
scrawl
|
5f1878eb54
|
Add specular mapping (uses alpha channel of diffuse texture)
|
2013-12-03 18:41:45 +01:00 |
|
scrawl
|
147bc447a5
|
Add specular lighting for directional light to objects shader
|
2013-12-03 16:07:07 +01:00 |
|
scrawl
|
3a82f8c193
|
Fix incorrect log file name for launcherOgre.log
|
2013-12-03 15:56:00 +01:00 |
|
scrawl
|
8f4ffe4ddc
|
Fix new window size not being written to settings when manually resizing window
|
2013-12-03 15:55:31 +01:00 |
|
Marc Zinnschlag
|
63721682f6
|
GUI fix: previous character was selected when saving new character
|
2013-12-03 15:19:13 +01:00 |
|
Marc Zinnschlag
|
34cdd2bb1f
|
deal with dialogue/info records that don't exist anymore
|
2013-12-03 14:39:54 +01:00 |
|
Marc Zinnschlag
|
e269c9e689
|
changed a few sub record names to make them more unique
|
2013-12-03 14:30:18 +01:00 |
|
Marc Zinnschlag
|
2293b92efe
|
storing and loading the journal
|
2013-12-03 14:28:46 +01:00 |
|
Marc Zinnschlag
|
7d8e3ac651
|
fixed QuestState::load/save
|
2013-12-03 13:51:44 +01:00 |
|
Marc Zinnschlag
|
2fe135d85f
|
journals subview was bound to the wrong universal ID type
|
2013-12-02 16:25:26 +01:00 |
|
Marc Zinnschlag
|
0f971163f7
|
use Entry instead of plain string for topic and quest entries
|
2013-12-01 14:50:25 +01:00 |
|
Marc Zinnschlag
|
b273f9e387
|
splitting JournalEntry into Entry and JournalEntry
|
2013-12-01 14:44:27 +01:00 |
|
Marc Zinnschlag
|
16e2d67b1f
|
added overloaded start/endRecord functions to ESMWriter
|
2013-12-01 13:32:11 +01:00 |
|
Marc Zinnschlag
|
c94f006307
|
Merge remote-tracking branch 'scrawl/master'
|
2013-11-30 15:06:09 +01:00 |
|
Marc Zinnschlag
|
aa5369d02c
|
Merge remote-tracking branch 'pvdk/checkboxfix'
|
2013-11-30 15:04:25 +01:00 |
|
Marc Zinnschlag
|
eec9821cd8
|
added records for storing journals in saved game files
|
2013-11-30 14:41:12 +01:00 |
|
scrawl
|
8391891a5b
|
Ignore case for content file extensions
|
2013-11-30 14:25:29 +01:00 |
|
Marc Zinnschlag
|
43f5f16731
|
removed a todo comment
|
2013-11-30 12:54:44 +01:00 |
|
Marc Zinnschlag
|
177aab536d
|
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
|
2013-11-30 12:41:18 +01:00 |
|
pvdk
|
1512ac11ad
|
Fixed the content selector checkboxes appearing as partially checked
|
2013-11-30 12:16:57 +01:00 |
|
pvdk
|
46973e8e82
|
Fix for Bug #982: unchecking addons is now saved to profile
|
2013-11-30 12:08:37 +01:00 |
|
Marc Zinnschlag
|
eed46960fe
|
some spelling fixes
|
2013-11-30 12:02:56 +01:00 |
|
Marc Zinnschlag
|
9d64c92d33
|
store text in journal entries
|
2013-11-30 11:57:33 +01:00 |
|
Marc Zinnschlag
|
8b3e852ffc
|
Merge remote-tracking branch 'scrawl/master'
|
2013-11-30 11:09:38 +01:00 |
|
Marc Zinnschlag
|
aebc2791a5
|
fixed selecting current character based on value stored in settings
|
2013-11-30 11:08:41 +01:00 |
|
Marc Zinnschlag
|
750133c0dd
|
one more fix to SavedGame record saving
|
2013-11-30 11:05:07 +01:00 |
|