Commit graph

9275 commits

Author SHA1 Message Date
Lukasz Gromanowski
18a9878bdd Fixes #1042: TES3 header data wrong encoding
Changed loading of HEDR structure from all-in-once to field-by-field
so author and descryption could be converted to UTF-8.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-21 09:33:05 +01:00
Lukasz Gromanowski
900bc06d2c Fixes #845: NPCs hold torches during the day
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.

Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.

Since this commit autoEquip() method doesn't automatically equip lights.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 22:38:23 +01:00
Marek Kochanowicz
f69465d7e0 Added aditional checks for books. Activator check. 2013-12-20 22:31:17 +01:00
mrcheko
7aca2be540 Merge remote-tracking branch 'upstream/master' 2013-12-20 22:40:11 +02:00
mrcheko
b98cfe2d1b Revert "bug fix http://bugs.openmw.org/issues/428"
This reverts commit 8dd930cf97.
2013-12-20 22:39:02 +02:00
mrcheko
e480e31d1e Revert "improvement to bug fix http://bugs.openmw.org/issues/428"
This reverts commit c0d07fbdc9.
2013-12-20 22:37:18 +02:00
Marek Kochanowicz
8085fcc792 Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
Currently only books are checked, and only if name is present.
2013-12-20 20:02:42 +01:00
Marc Zinnschlag
18e7e83585 Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c using gmst string 2013-12-20 14:04:59 +02:00
Lukasz Gromanowski
abc126e2af Fixes #845: NPCs hold torches during the day
Added check for Player character so it won't be affected by showing,
or hidding torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5 Fixes #845: NPCs hold torches during the day
Added equipping/unequipping torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b Fixes #845: NPCs hold torches during the day
Simplified a bit code which shows and hides light.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-19 21:11:07 +01:00
mrcheko
3816a09c6f bug 428 ask to load recent saved game 2013-12-19 22:08:34 +02:00
Marek Kochanowicz
230bbf06ba Merge pull request #6 from zinnschlag/master
updating fork
2013-12-19 06:42:29 -08:00
Marc Zinnschlag
16b3927f17 Merge remote-tracking branch 'scrawl/master' 2013-12-19 14:26:41 +01:00
scrawl
5fd98d7c3a Add an assertion 2013-12-19 01:41:36 +01:00
scrawl
18c002a21d Fix an awful typo. 2013-12-19 01:31:42 +01:00
scrawl
6a3eb3b355 Better way of reversing layer UV. 2013-12-19 01:31:12 +01:00
scrawl
9afdf71af3 Fix crash with player->position command 2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63 Fix highlighted topics being selectable when in a choice 2013-12-19 00:26:08 +01:00
scrawl
876fb9a899 Addition to bb4bd999ba : adjust position for objects placed from inventory 2013-12-19 00:11:14 +01:00
Marc Zinnschlag
082a4678e1 Merge remote-tracking branch 'sirherrbatka/csmanual' 2013-12-18 14:35:23 +01:00
Marc Zinnschlag
c22e38f825 removing 255 content file limitation 2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-17 19:33:32 +01:00
pvdk
da9b67b6d2 Fix for Bug #922: Launcher writing merged openmw.cfg files 2013-12-16 20:40:58 +01:00
mrcheko
a854eb73db StateRunning check returns 2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2 Remove more unused code 2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 2013-12-16 15:40:47 +02:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
56893a097d Don't stack used torches 2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39 Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips. 2013-12-16 13:22:27 +01:00
Marc Zinnschlag
1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 2013-12-15 18:50:25 +02:00
Marc Zinnschlag
bf4ffe94dc fixed a memory leak in the script record 2013-12-15 16:19:45 +01:00
Marc Zinnschlag
3590fa40bd store global script state in saved game files 2013-12-15 16:16:50 +01:00
scrawl
4bc4af6bf0 Enable microcode caching for Ogre 1.9+ 2013-12-14 22:01:24 +01:00
Nikolay Kasyanov
fc21dd1f3a Music playback on OS X >= 10.9 works again. Fixes bug #1041. 2013-12-14 17:26:09 +04:00
mrcheko
c0d07fbdc9 improvement to bug fix http://bugs.openmw.org/issues/428 2013-12-14 15:07:00 +02:00
scrawl
530d06ab54 Remove unused code 2013-12-14 05:07:08 +01:00
mrcheko
8dd930cf97 bug fix http://bugs.openmw.org/issues/428 2013-12-13 22:43:58 +02:00
Marc Zinnschlag
0890fa66b0 Merge remote-tracking branch 'mrcheko/master' 2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b bug fix at http://bugs.openmw.org/issues/985 2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a Revert "bug fix http://bugs.openmw.org/issues/985"
This reverts commit 7a9b64c6f4.
2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3 Don't try to show exceptions in a message box if SDL was not initialized 2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4 bug fix http://bugs.openmw.org/issues/985 2013-12-12 16:09:38 +02:00
Marc Zinnschlag
2a35c7d33a fixed running global scripts a second time after they have been stopped 2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f globals script cleanup; fixed potential case folding bug 2013-12-12 13:15:38 +01:00
Nikolay Kasyanov
73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
plugin install routine.
2013-12-12 15:20:04 +04:00
Marc Zinnschlag
fc37c77a91 store global variables in saved game files 2013-12-12 12:19:25 +01:00
Nikolay Kasyanov
874ecee079 OS X: do not enforce static boost, this can be set externally
anyway
2013-12-12 14:20:13 +04:00