scrawl
b158919c4b
Fix uninitialized variable use
2014-06-13 02:26:52 +02:00
mrcheko
df7213185f
warning fixes
2014-06-12 23:42:33 +04:00
mrcheko
b969986cff
Merge remote-tracking branch 'origin/master'
2014-06-12 17:02:22 +04:00
Marc Zinnschlag
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070
Merge remote-tracking branch 'cc9cii/master'
2014-06-12 12:46:04 +02:00
scrawl
029e438c11
Don't check mInterpolationType each iteration
2014-06-11 23:57:39 +02:00
cc9cii
37f0c253f6
For compiling with MSVC 2012
2014-06-12 07:04:57 +10:00
cc9cii
36e380c6be
Merge remote-tracking branch 'upstream/master'
2014-06-11 21:58:10 +01:00
scrawl
68d6b6b2f3
Cell merge fix (reference context position was not saved correctly)
2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
2014-06-11 19:47:42 +02:00
scrawl
013916fca3
Fix for broken physics in exteriors ( Fixes #1446 )
...
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7
Don't play the same music track twice in a row ( Fixes #746 )
2014-06-11 18:11:16 +02:00
scrawl
d60df66811
Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108 )
2014-06-11 16:56:41 +02:00
scrawl
73be457805
Merge ESM::Cell fields by subrecord
...
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +02:00
Marc Zinnschlag
2faeceacfa
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/main.cpp
2014-06-11 08:51:18 +02:00
Marc Zinnschlag
afbcaa0846
Merge remote-tracking branch 'potatoesmaster/log'
2014-06-11 08:36:17 +02:00
scrawl
0f31e31088
Allow opening journal during dialogue ( Fixes #1460 )
2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8
Handle Quadratic and Linear attenuation independently ( Fixes #1456 )
2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e
Write logs in log directory
...
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
2014-06-10 23:46:49 +02:00
scrawl
7eee0855f7
Merge commit 'pull/origin/155'
...
Conflicts:
CMakeLists.txt
2014-06-10 23:24:16 +02:00
mrcheko
d6d9df6cec
split getStartTime
2014-06-11 00:20:46 +04:00
scrawl
07d20c212b
Fix crash activating quick key 1
2014-06-10 21:34:47 +02:00
scrawl
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-10 19:32:49 +02:00
scrawl
47172fb8a2
ContentModel: Don't confuse file path with file name ( Fixes #1352 )
2014-06-10 19:23:42 +02:00
scrawl
7b5482f25b
Fix character selection caption when there is no character in settings.cfg
2014-06-10 19:01:18 +02:00
scrawl
5a955279bb
Fix main menu background showing when resizing window during load
2014-06-10 18:49:42 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
6ba112619a
Fix dropped items ending up inaccessible when standing in objects with no collision ( Fixes #1441 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
a90245147b
Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor ( Fixes #1423 )
2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1
Implement text replacement for journal topic responses ( Fixes #1429 )
2014-06-10 15:42:50 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
Bret Curtis
e28888df39
fix for dejavu location
2014-06-10 14:51:51 +02:00
scrawl
4119038f1d
Remove an old workaround ( Fixes #1458 )
2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5
Combat music; some minor combat fixes
2014-06-10 14:20:29 +04:00
Bret Curtis
8419002393
Task #940 : Move licenses to appropriate place in docs. Additional cleanup.
2014-06-10 11:25:39 +02:00
scrawl
65d5311037
Revert "Don't try to show exceptions in a message box if SDL was not initialized"
...
According to SDL docs, "This function may be called at any time, even before SDL_Init()".
Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.
This reverts commit 39eea24dc3
.
Conflicts:
apps/openmw/main.cpp
2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490
Don't list non-usable items in QuickKeysMenu selection ( Fixes #1427 )
2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc
Savegame dialog: Grey out buttons if no save is selected
2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
2014-06-10 02:27:38 +02:00
scrawl
881ae33b74
Don't allow Creatures with no movement abilities to move ( Fixes #1457 )
2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4
Move video skip detection to WindowManager
...
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
2014-06-10 01:57:54 +02:00
scrawl
7721e54191
Use descriptive names for save files and character folders ( Fixes #1449 )
2014-06-10 00:22:00 +02:00
scrawl
e796fa2313
Add another french morrowind font workaround ( Fixes #1447 )
2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef
old bug + comment fix
2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067
merge openmw master
2014-06-09 22:37:49 +04:00
scrawl
1bab74a98d
Fix punishment for stealing 0 value items ( Fixes #1435 )
2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3
Change npc training skills to prefer skills with lowest ID if skill values are the same ( Fixes #1445 )
2014-06-09 03:40:14 +02:00