scrawl
|
b2afb1fd5c
|
Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/spellbuyingwindow.cpp
apps/openmw/mwgui/trainingwindow.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
|
12 years ago |
|
scrawl
|
322faf13e4
|
cleanup
|
12 years ago |
|
scrawl
|
bf4e855260
|
fixed creatures
|
12 years ago |
Marc Zinnschlag
|
e6021a3fe3
|
Issue #219: moved checks for local and global variables from DialogueManager to Filter
|
12 years ago |
gugus
|
4634227f1c
|
notify the user when the merchant doesn't accept the offer
|
12 years ago |
|
Marc Zinnschlag
|
e68bb3481e
|
Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time)
|
12 years ago |
|
Marc Zinnschlag
|
91afef140b
|
Issue #219: moved first batch of integer type functions from DialogueManager to Filter
|
12 years ago |
greye
|
c3f0dc0dfb
|
m prefix for NpcAnimation members
|
12 years ago |
|
Marc Zinnschlag
|
90e679746b
|
Merge remote-tracking branch 'scrawl/consolefix' into next
|
12 years ago |
|
scrawl
|
3d7146cd50
|
don't allow opening a window multiple times, primarily the console
|
12 years ago |
|
scrawl
|
867fb620c3
|
part 2
|
12 years ago |
|
scrawl
|
00a2de432a
|
fix BulletShapeLoader namespace
|
12 years ago |
|
Marc Zinnschlag
|
2be60041f3
|
Merge remote-tracking branch 'greye/player-dynamics' into next
|
12 years ago |
|
Marc Zinnschlag
|
e912b5bed2
|
Merge remote-tracking branch 'greye/next' into dialogue
|
12 years ago |
|
greye
|
af5fb7916f
|
fix searching in store
|
12 years ago |
|
Marc Zinnschlag
|
235397dde8
|
Issue #219: added missing implemented for isInverted function
|
12 years ago |
|
Marc Zinnschlag
|
f5972a3080
|
Issue #219: Support for boolean select structs
|
12 years ago |
|
Marc Zinnschlag
|
b412ebd0af
|
Issue #219: Supoort for inverted select structs
|
12 years ago |
|
Marc Zinnschlag
|
4614d2bc8e
|
Issue #219: added basic select struct analysis and type checking
|
12 years ago |
|
greye
|
b5a59c3a07
|
minor doxygen comments update
|
12 years ago |
|
greye
|
2a86432887
|
store birthsign in MWWorld::Player
|
12 years ago |
|
Marc Zinnschlag
|
662054acf4
|
Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter
|
12 years ago |
|
Marc Zinnschlag
|
1502b3f6f8
|
Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)
|
12 years ago |
|
Marc Zinnschlag
|
6c6c0dd1e3
|
Merge branch 'next' into dialogue
|
12 years ago |
|
gugus
|
0a883f4492
|
The player can now barter with merchants
|
12 years ago |
|
greye
|
83e758ee50
|
clean up interfaces
|
12 years ago |
|
scrawl
|
fba32e406c
|
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
|
12 years ago |
|
greye
|
2a06d72e32
|
remove unused custom character classes
|
12 years ago |
|
greye
|
9dc9098fa7
|
update MWBase::World interface since records contains own id
|
12 years ago |
|
greye
|
f818fa1ebf
|
minor update since records contains own id
|
12 years ago |
|
greye
|
5b9621bca5
|
store player record data in ESMStore
|
12 years ago |
|
greye
|
9ab2c16055
|
store created character classes as dynamic records
|
12 years ago |
|
greye
|
78740306db
|
non-const access to Store<T> from ESMStore
|
12 years ago |
|
Marc Zinnschlag
|
c5a6171aab
|
cleanup
|
12 years ago |
|
Marc Zinnschlag
|
918316168f
|
Merge remote-tracking branch 'greye/store' into next
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
|
12 years ago |
|
greye
|
11c0e6382f
|
make ESMStore setting up itself after loading
|
12 years ago |
|
greye
|
bc218759e9
|
forgotten module
|
12 years ago |
|
Marc Zinnschlag
|
0805301922
|
Merge remote-tracking branch 'bwrsandman/master' into next
|
12 years ago |
|
Marc Zinnschlag
|
9e8eb0d8d3
|
updated credits.txt
|
12 years ago |
bwrsandman
|
7911f08c53
|
Issue #438: set 0 a.m. to be 12 a.m.
|
12 years ago |
|
scrawl
|
7b35b82833
|
adding shiny
|
12 years ago |
|
scrawl
|
fb3ac6ad4a
|
no submodule
|
12 years ago |
|
Marc Zinnschlag
|
81a2c629d8
|
Merge remote-tracking branch 'scrawl/master' into next
|
12 years ago |
|
scrawl
|
21e0cde914
|
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
|
12 years ago |
|
greye
|
58b7927a36
|
move 'player' record to dynamic
|
12 years ago |
|
greye
|
83f5b1df81
|
change to static --> dynamic search order
|
12 years ago |
|
greye
|
9f1733a415
|
move record insertion to ESMStore
|
12 years ago |
|
gugus
|
bf98b95955
|
bugfix
|
12 years ago |
|
Marc Zinnschlag
|
6d5333be05
|
some code cleanup
|
12 years ago |
|
Marc Zinnschlag
|
d661d4f6d6
|
Merge remote-tracking branch 'emoose/bug-368' into next
|
12 years ago |