Marc Zinnschlag
9a39f32c32
store ID of cell in reference struct
2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
Marc Zinnschlag
94ec05c2c6
Revert "simplifying CSMWorld::CellRef"
...
With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a
2013-06-18 11:27:05 +02:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c
split IdCollection into Collection and IdCollection class
2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d
rewrote IdCollection::load (not using private members of IdCollection anymore)
2013-06-17 13:49:32 +02:00
Marc Zinnschlag
2968b96882
added a bit more documentation
2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
2013-06-17 11:42:02 +02:00
Marc Zinnschlag
97f421df8a
simplifying CSMWorld::CellRef
2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
2013-06-08 12:45:13 +02: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
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
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
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
Marc Zinnschlag
5d4c311de7
Merge remote-tracking branch 'scrawl/master'
2013-05-20 15:01:25 +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
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
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
Marc Zinnschlag
e2b8f9ea6d
Merge remote-tracking branch 'scrawl/master'
2013-05-17 14:37:41 +02:00
scrawl
d096b19307
Fix not being able to equip arrows/bolts
2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac
Don't show weapons in first-person
2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74
Use the PickProbe animation group as appropriate
2013-05-17 01:46:51 -07:00
Marc Zinnschlag
f8c675a638
Merge remote-tracking branch 'graffy76/usersettings'
2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c
Commented out sample editor settings page
2013-05-16 20:43:05 -05:00
Marc Zinnschlag
cc42b1ef48
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 20:07:48 +02:00
riothamus
d89dbde940
Bug 752, spacing fix
2013-05-16 14:05:22 -04:00
Marc Zinnschlag
ef9abda754
Merge remote-tracking branch 'glorf/weather'
2013-05-16 19:53:28 +02:00
Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 19:52:14 +02:00
riothamus
36f1197b51
Bug 752, cleanup
2013-05-16 13:51:54 -04:00
Glorf
19ce233667
Workaround for MOC compiler problem
2013-05-16 19:46:04 +02:00
