graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
graffy76
5a40594b0d
Merge
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-05-26 23:21:08 -05:00
Marek Kochanowicz
792f3aaa86
Rastered status icons. ingredients, light, and book icon without emblem.
2013-05-26 17:31:29 +02:00
Marek Kochanowicz
b31f0dfe1f
Raster status icons.
2013-05-26 17:28:27 +02:00
graffy76
089a1d48c1
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-25 08:06:56 -05:00
riothamus
d9350be8da
Console Object Selection Fix
2013-05-24 09:31:56 -04:00
Marc Zinnschlag
b1a8dc35e0
minor adjustments
2013-05-24 15:03:46 +02:00
Marc Zinnschlag
62479cd885
Merge remote-tracking branch 'torben/aiwanderrepeat'
2013-05-24 14:58:10 +02:00
Torben Carrington
1cfe037d6b
AIWander - Added support for the Repeat parameter to mimic vanilla.
2013-05-24 04:49:20 -07:00
Marc Zinnschlag
2d894fde57
Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24
2013-05-23 16:08:58 +02:00
riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04:00
Marc Zinnschlag
681345dd15
Merge remote-tracking branch 'riothamus/riothamus-b787-B'
2013-05-23 09:13:39 +02:00
riothamus
885d12e867
updated hud layout
2013-05-22 22:06:22 -04:00
Marc Zinnschlag
9d67cd6251
Merge remote-tracking branch 'pakanek/esmtool_plain_script'
2013-05-22 23:48:26 +02:00
scrawl
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
2013-05-22 21:01:05 +02:00
Miroslav Puda
00866ef246
Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script
2013-05-22 20:25:47 +02:00
Miroslav Puda
8a9ddcaa32
Plain output moved at the end of records output.
2013-05-22 20:24:23 +02:00
Miroslav Puda
d3d5cb4edf
New command line option --plain to print contents of scripts, books, dialogs.
2013-05-22 20:09:11 +02:00
Marc Zinnschlag
c40e753ea9
Merge remote-tracking branch 'pakanek/master'
2013-05-22 14:07:49 +02:00
Miroslav Puda
7149439ace
Replacement of empty() method by assertion.
2013-05-22 13:23:49 +02:00
Marc Zinnschlag
6d0b8f7bc8
added missing include
2013-05-22 10:14:12 +02:00
Miroslav Puda
3cebb41459
missing break
2013-05-21 21:04:15 +02:00
Miroslav Puda
48ac6e799b
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-21 17:04:17 +02:00
Marc Zinnschlag
adc41c4502
Merge remote-tracking branch 'edmondo/master'
2013-05-21 09:47:14 +02:00
Marc Zinnschlag
69d4861e4d
Merge remote-tracking branch 'riothamus/riothamus-b787'
2013-05-21 09:46:08 +02:00
graffy76
935049b187
Added #include for QListWidgetItem to usersettingsdialog.hpp
2013-05-20 20:40:53 -05:00
Edmondo Tommasina
f0482dd796
dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘"
...
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
2013-05-20 23:51:01 +02:00
riothamus
39bd8894a9
Bug 787
2013-05-20 16:39:24 -04:00
Miroslav Puda
51414e2051
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 22:34:48 +02:00
Marc Zinnschlag
5d4c311de7
Merge remote-tracking branch 'scrawl/master'
2013-05-20 15:01:25 +02:00
Miroslav Puda
cd57523601
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 14:01:47 +02:00
scrawl
d3effdf34c
Fix exception when trying to equip a shield while a lockpick is equipped
2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610
Security fixes
2013-05-20 12:42:11 +02:00
Marc Zinnschlag
c1ceb32b28
Merge remote-tracking branch 'scrawl/master'
2013-05-20 12:10:51 +02:00
scrawl
2715520d6f
Cleanup Security class
2013-05-19 23:19:48 +02:00
scrawl
5173779f4b
Add sounds for security skill
2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5
added missing columns for NPC records
2013-05-19 13:53:47 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00
Miroslav Puda
d5689730eb
Removal of unnecessary variable.
...
empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.
2013-05-18 22:57:27 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
Miroslav Puda
eb8afa5d35
Ignoring Eclipse project files.
2013-05-18 21:38:09 +02:00
Marc Zinnschlag
8d78bea4aa
added missing column for misc record
2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b
added missing columns for Light record
2013-05-18 18:46:41 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
2013-05-17 06:21:59 -07:00
Marc Zinnschlag
749fd418b5
added missing columns for door record
2013-05-17 15:10:41 +02:00
