scrawl
|
636f297f10
|
enchant
|
12 years ago |
|
scrawl
|
ac0c1ea986
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
apps/openmw/mwgui/dialogue.cpp
|
12 years ago |
Marc Zinnschlag
|
bb6d9a329c
|
Merge remote-tracking branch 'scrawl/book_skillgain' into next
|
12 years ago |
|
scrawl
|
71d04e16da
|
fix the global map updating when pinned
|
12 years ago |
|
scrawl
|
8daf790235
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into next
|
12 years ago |
|
scrawl
|
caef570c8a
|
fix the weather not changing when sleeping/waiting
|
12 years ago |
|
scrawl
|
359824d614
|
oops
|
12 years ago |
|
scrawl
|
4453459378
|
re-use the texture across preview instances
|
12 years ago |
|
scrawl
|
e2b1329620
|
fix the race selection escape crash
|
12 years ago |
|
scrawl
|
d163f8203c
|
change books to RecListWithIDT
|
12 years ago |
|
scrawl
|
853d62adba
|
book skillgain
|
12 years ago |
|
Marc Zinnschlag
|
a34bdb9623
|
per NPC ID interaction tracking
|
12 years ago |
|
scrawl
|
b63d205c6e
|
change the select attribute/skill dialogs to be reusable
|
12 years ago |
|
Marc Zinnschlag
|
5bdc7bcacf
|
Merge branch 'master' into next
|
12 years ago |
|
scrawl
|
d393f551ed
|
edit effect dialog
|
12 years ago |
|
scrawl
|
02e7b3df4f
|
oops
|
12 years ago |
|
scrawl
|
f8a18d58a6
|
re-use the texture across preview instances
|
12 years ago |
|
scrawl
|
dd5c083124
|
fix the race selection escape crash
|
12 years ago |
|
scrawl
|
1cb1259e18
|
fixing some unrelated warnings
|
12 years ago |
|
scrawl
|
bf3aad8be0
|
handle NCC flag
|
12 years ago |
|
scrawl
|
9d7c35ae48
|
and go
|
12 years ago |
|
scrawl
|
b4db339fd5
|
everything uses find now
|
12 years ago |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
12 years ago |
|
scrawl
|
f45a6b71a9
|
Merge branch 'master' into next
|
12 years ago |
|
scrawl
|
b471bef92a
|
Merge branch 'master' into next
|
12 years ago |
|
Marc Zinnschlag
|
63772e2301
|
Merge remote-tracking branch 'scrawl/gamma' into next
|
12 years ago |
|
Marc Zinnschlag
|
39e21a6103
|
Merge remote-tracking branch 'scrawl/globalmap' into next
|
12 years ago |
|
scrawl
|
dbf59d14dc
|
water gamma correction
|
12 years ago |
|
scrawl
|
78b2d51cfc
|
fix a map crash
|
12 years ago |
Nikolay Kasyanov
|
8a81a4a334
|
Fixed typo on openmw.cfg that caused launcher crash on OS X
|
12 years ago |
|
Marc Zinnschlag
|
9d1a9520fc
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
12 years ago |
Jason Hooks
|
f365cab824
|
Possible fix for a issue
|
12 years ago |
|
Marc Zinnschlag
|
8da00caaa4
|
Merge remote-tracking branch 'scrawl/globalmap' into next
|
12 years ago |
|
scrawl
|
47d9fae89f
|
don't use cache
|
12 years ago |
|
Marc Zinnschlag
|
3560690660
|
Merge remote-tracking branch 'scrawl/sleep_wait' into next
|
12 years ago |
|
scrawl
|
845dddbab8
|
fix a weird problem with the fading overlay
|
12 years ago |
|
scrawl
|
b91d74d394
|
fix normalized encumbrance
|
12 years ago |
|
scrawl
|
872fcf3e3d
|
sleeping restoration of health, magicka, and fatigue
|
12 years ago |
|
Marc Zinnschlag
|
28e2430f3a
|
Merge remote-tracking branch 'scrawl/master'
|
12 years ago |
|
scrawl
|
f49401bb53
|
center map on the player, dynamic map size
|
12 years ago |
|
scrawl
|
1d012d1680
|
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
|
12 years ago |
|
scrawl
|
9106e5307c
|
moved global map from RenderingManager to gui and removed world method
|
12 years ago |
|
scrawl
|
a161b34c67
|
remove useless member, fix map rendering crash
|
12 years ago |
|
scrawl
|
98c1dc1151
|
ShowMap & FillMap commands, merged next
|
12 years ago |
|
scrawl
|
8214966d44
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
|
12 years ago |
|
scrawl
|
451a9fd6ac
|
don't update world arrow position in interior
|
12 years ago |
|
scrawl
|
e5e3d829d0
|
player arrow & markers
|
12 years ago |
|
scrawl
|
e8bba2b833
|
disabled loading of land normals again, didn't need them after all
|
12 years ago |
|
scrawl
|
5f014f7411
|
oops, left in a testing assertion
|
12 years ago |
|
scrawl
|
86cfc91ef3
|
global map rendering
|
12 years ago |