Marc Zinnschlag
|
91afef140b
|
Issue #219: moved first batch of integer type functions from DialogueManager to Filter
|
2012-11-08 21:16:49 +01:00 |
|
greye
|
c3f0dc0dfb
|
m prefix for NpcAnimation members
|
2012-11-08 23:11:43 +04:00 |
|
Marc Zinnschlag
|
90e679746b
|
Merge remote-tracking branch 'scrawl/consolefix' into next
|
2012-11-08 19:37:37 +01:00 |
|
scrawl
|
3d7146cd50
|
don't allow opening a window multiple times, primarily the console
|
2012-11-08 19:34:54 +01:00 |
|
scrawl
|
867fb620c3
|
part 2
|
2012-11-08 19:25:06 +01:00 |
|
scrawl
|
00a2de432a
|
fix BulletShapeLoader namespace
|
2012-11-08 18:48:07 +01:00 |
|
Marc Zinnschlag
|
2be60041f3
|
Merge remote-tracking branch 'greye/player-dynamics' into next
|
2012-11-08 18:32:25 +01:00 |
|
Marc Zinnschlag
|
e912b5bed2
|
Merge remote-tracking branch 'greye/next' into dialogue
|
2012-11-08 18:19:52 +01:00 |
|
greye
|
af5fb7916f
|
fix searching in store
|
2012-11-08 21:07:14 +04:00 |
|
Marc Zinnschlag
|
235397dde8
|
Issue #219: added missing implemented for isInverted function
|
2012-11-08 17:29:10 +01:00 |
|
Marc Zinnschlag
|
f5972a3080
|
Issue #219: Support for boolean select structs
|
2012-11-08 17:04:44 +01:00 |
|
Marc Zinnschlag
|
b412ebd0af
|
Issue #219: Supoort for inverted select structs
|
2012-11-08 17:01:26 +01:00 |
|
Marc Zinnschlag
|
4614d2bc8e
|
Issue #219: added basic select struct analysis and type checking
|
2012-11-08 16:49:38 +01:00 |
|
greye
|
b5a59c3a07
|
minor doxygen comments update
|
2012-11-08 19:01:42 +04:00 |
|
greye
|
2a86432887
|
store birthsign in MWWorld::Player
|
2012-11-08 18:50:23 +04:00 |
|
Marc Zinnschlag
|
662054acf4
|
Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter
|
2012-11-08 14:55:31 +01:00 |
|
Marc Zinnschlag
|
1502b3f6f8
|
Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)
|
2012-11-08 14:09:40 +01:00 |
|
Marc Zinnschlag
|
6c6c0dd1e3
|
Merge branch 'next' into dialogue
|
2012-11-08 13:45:20 +01:00 |
|
gugus
|
0a883f4492
|
The player can now barter with merchants
|
2012-11-08 13:38:20 +01:00 |
|
greye
|
83e758ee50
|
clean up interfaces
|
2012-11-08 16:37:57 +04:00 |
|
scrawl
|
fba32e406c
|
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
|
2012-11-08 10:13:53 +01:00 |
|
greye
|
2a06d72e32
|
remove unused custom character classes
|
2012-11-08 02:27:01 +04:00 |
|
greye
|
9dc9098fa7
|
update MWBase::World interface since records contains own id
|
2012-11-08 01:52:34 +04:00 |
|
greye
|
f818fa1ebf
|
minor update since records contains own id
|
2012-11-08 01:39:24 +04:00 |
|
greye
|
5b9621bca5
|
store player record data in ESMStore
|
2012-11-08 01:36:43 +04:00 |
|
greye
|
9ab2c16055
|
store created character classes as dynamic records
|
2012-11-08 01:22:44 +04:00 |
|
greye
|
78740306db
|
non-const access to Store<T> from ESMStore
|
2012-11-08 01:21:54 +04:00 |
|
Marc Zinnschlag
|
c5a6171aab
|
cleanup
|
2012-11-07 19:43:42 +01:00 |
|
Marc Zinnschlag
|
918316168f
|
Merge remote-tracking branch 'greye/store' into next
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
|
2012-11-07 19:34:28 +01:00 |
|
greye
|
11c0e6382f
|
make ESMStore setting up itself after loading
|
2012-11-07 15:41:59 +04:00 |
|
greye
|
bc218759e9
|
forgotten module
|
2012-11-07 15:38:25 +04:00 |
|
Marc Zinnschlag
|
0805301922
|
Merge remote-tracking branch 'bwrsandman/master' into next
|
2012-11-07 10:40:40 +01:00 |
|
Marc Zinnschlag
|
9e8eb0d8d3
|
updated credits.txt
|
2012-11-06 20:28:49 +01:00 |
|
bwrsandman
|
7911f08c53
|
Issue #438: set 0 a.m. to be 12 a.m.
|
2012-11-06 13:19:35 -05:00 |
|
scrawl
|
7b35b82833
|
adding shiny
|
2012-11-06 19:09:44 +01:00 |
|
scrawl
|
fb3ac6ad4a
|
no submodule
|
2012-11-06 19:08:15 +01:00 |
|
Marc Zinnschlag
|
81a2c629d8
|
Merge remote-tracking branch 'scrawl/master' into next
|
2012-11-06 18:21:24 +01:00 |
|
scrawl
|
21e0cde914
|
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
|
2012-11-06 15:26:51 +01:00 |
|
greye
|
58b7927a36
|
move 'player' record to dynamic
|
2012-11-06 18:17:32 +04:00 |
|
greye
|
83f5b1df81
|
change to static --> dynamic search order
|
2012-11-06 17:58:49 +04:00 |
|
greye
|
9f1733a415
|
move record insertion to ESMStore
|
2012-11-06 17:51:38 +04:00 |
|
gugus
|
bf98b95955
|
bugfix
|
2012-11-06 13:10:54 +01:00 |
|
Marc Zinnschlag
|
6d5333be05
|
some code cleanup
|
2012-11-06 13:08:25 +01:00 |
|
Marc Zinnschlag
|
d661d4f6d6
|
Merge remote-tracking branch 'emoose/bug-368' into next
|
2012-11-06 13:04:38 +01:00 |
|
greye
|
dccc157f4c
|
setting up
|
2012-11-06 15:26:55 +04:00 |
|
greye
|
18bb5960e4
|
let's rescue linker
|
2012-11-06 15:10:57 +04:00 |
|
greye
|
620184a009
|
fix typos
|
2012-11-06 14:44:56 +04:00 |
|
greye
|
0fd22ce4b0
|
CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &)
|
2012-11-06 14:23:21 +04:00 |
|
greye
|
242a9b5a59
|
various interface fixes, commented unused code
|
2012-11-06 14:03:36 +04:00 |
|
greye
|
b3ad872845
|
new interface in manualref, fix various typos
|
2012-11-06 13:43:48 +04:00 |
|