Marc Zinnschlag
681345dd15
Merge remote-tracking branch 'riothamus/riothamus-b787-B'
12 years ago
riothamus
885d12e867
updated hud layout
12 years ago
Marc Zinnschlag
9d67cd6251
Merge remote-tracking branch 'pakanek/esmtool_plain_script'
12 years ago
scrawl
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
12 years ago
Miroslav Puda
00866ef246
Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script
12 years ago
Miroslav Puda
8a9ddcaa32
Plain output moved at the end of records output.
12 years ago
Miroslav Puda
d3d5cb4edf
New command line option --plain to print contents of scripts, books, dialogs.
12 years ago
Marc Zinnschlag
c40e753ea9
Merge remote-tracking branch 'pakanek/master'
12 years ago
Miroslav Puda
7149439ace
Replacement of empty() method by assertion.
12 years ago
Marc Zinnschlag
6d0b8f7bc8
added missing include
12 years ago
Miroslav Puda
3cebb41459
missing break
12 years ago
Miroslav Puda
48ac6e799b
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
Marc Zinnschlag
adc41c4502
Merge remote-tracking branch 'edmondo/master'
12 years ago
Marc Zinnschlag
69d4861e4d
Merge remote-tracking branch 'riothamus/riothamus-b787'
12 years ago
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’
12 years ago
riothamus
39bd8894a9
Bug 787
12 years ago
Miroslav Puda
51414e2051
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
Marc Zinnschlag
5d4c311de7
Merge remote-tracking branch 'scrawl/master'
12 years ago
Miroslav Puda
cd57523601
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
scrawl
d3effdf34c
Fix exception when trying to equip a shield while a lockpick is equipped
12 years ago
scrawl
d9dd02c610
Security fixes
12 years ago
Marc Zinnschlag
c1ceb32b28
Merge remote-tracking branch 'scrawl/master'
12 years ago
scrawl
2715520d6f
Cleanup Security class
12 years ago
scrawl
5173779f4b
Add sounds for security skill
12 years ago
scrawl
7a2d1cd8ce
Security skill
12 years ago
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
12 years ago
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
12 years ago
Marc Zinnschlag
2123900db5
added missing columns for NPC records
12 years ago
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
12 years ago
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.
12 years ago
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)
12 years ago
Miroslav Puda
eb8afa5d35
Ignoring Eclipse project files.
12 years ago
Marc Zinnschlag
8d78bea4aa
added missing column for misc record
12 years ago
Marc Zinnschlag
862e568f9b
added missing columns for Light record
12 years ago
scrawl
60563afc10
Fix a new game crash, reset camera
12 years ago
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
12 years ago
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
12 years ago
Marc Zinnschlag
749fd418b5
added missing columns for door record
12 years ago
Marc Zinnschlag
e2b8f9ea6d
Merge remote-tracking branch 'scrawl/master'
12 years ago
scrawl
d096b19307
Fix not being able to equip arrows/bolts
12 years ago
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
12 years ago
Chris Robinson
ee585046ac
Don't show weapons in first-person
12 years ago
Chris Robinson
4b9a888d74
Use the PickProbe animation group as appropriate
12 years ago
Marc Zinnschlag
f8c675a638
Merge remote-tracking branch 'graffy76/usersettings'
12 years ago
graffy76
3ce35e691c
Commented out sample editor settings page
12 years ago
scrawl
ca81335319
Fix bug loading attribute values
12 years ago
Marc Zinnschlag
cc42b1ef48
Merge remote-tracking branch 'riothamus/riothamus-b752'
12 years ago
riothamus
d89dbde940
Bug 752, spacing fix
12 years ago
Marc Zinnschlag
ef9abda754
Merge remote-tracking branch 'glorf/weather'
12 years ago
Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
12 years ago