Marc Zinnschlag
|
76d733d2b3
|
Merge remote branch 'scrawl/inventoryGUI'
|
13 years ago |
scrawl
|
bda90b77bc
|
oops, forgot something
|
13 years ago |
|
scrawl
|
157dd81524
|
removed script instruction, will be in the settings window later
|
13 years ago |
|
scrawl
|
5f6e8224f4
|
skill progress
|
13 years ago |
|
Marc Zinnschlag
|
3e85151c9d
|
Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
apps/openmw/CMakeLists.txt
|
13 years ago |
|
scrawl
|
8f2c8bbea4
|
Merge branch 'master' into graphics
|
13 years ago |
|
scrawl
|
789dfe1c88
|
fix a bug with water reflection plane height
|
13 years ago |
|
scrawl
|
b2d207130d
|
vastly improved look of the GUI, skin background textures now use tiling instead of stretching
|
13 years ago |
|
scrawl
|
40c52c5d09
|
max faction rank crashfix
|
13 years ago |
|
scrawl
|
1079bb2677
|
finished tooltips for everything in the stats window, some gui refactoring
|
13 years ago |
|
scrawl
|
76d71f86bc
|
fixed a faction case folding issue
|
13 years ago |
|
scrawl
|
4a009fc2bb
|
faction tooltip (doesn't handle player having max. rank)
|
13 years ago |
|
scrawl
|
8ce4727424
|
skill tooltips
|
13 years ago |
|
scrawl
|
6518eb7794
|
some cleanup
|
13 years ago |
|
scrawl
|
1c7110fbf5
|
birthsign tooltip
|
13 years ago |
|
scrawl
|
8d52ee27dc
|
attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files
|
13 years ago |
|
Marc Zinnschlag
|
420cd53be0
|
Merge branch 'effects'
|
13 years ago |
|
Marc Zinnschlag
|
be46f5a59c
|
various fixes
|
13 years ago |
|
scrawl
|
876b369ca5
|
minor tooltip fix
|
13 years ago |
|
scrawl
|
92d9e070fb
|
small tweak to getPlayerGold() method
|
13 years ago |
|
scrawl
|
2a4c55f1ab
|
use Class::getInventoryStore instead of casting ContainerStore.
|
13 years ago |
|
scrawl
|
4fb30544d4
|
more gui files cleanup
|
13 years ago |
|
scrawl
|
7a4de0ed1d
|
changed more gui stuff to use the new tag system
|
13 years ago |
|
scrawl
|
a284bfb4d0
|
Merge branch 'master' into inventoryGUI
|
13 years ago |
|
Marc Zinnschlag
|
0dc412d44c
|
Merge remote branch 'scrawl/refid_case'
|
13 years ago |
|
Marc Zinnschlag
|
ada86cbf32
|
Merge remote branch 'gus/collisionbug'
|
13 years ago |
|
Marc Zinnschlag
|
9f1919a230
|
Issue #256: added active spell management (completely untested)
|
13 years ago |
|
scrawl
|
7ef0ad4e39
|
show faction & birthsign in the stats window
|
13 years ago |
|
Marc Zinnschlag
|
635a89c35c
|
Issue #256: RNG fix
|
13 years ago |
|
scrawl
|
24ce88de2a
|
working mygui tag replacement system for GMST strings
|
13 years ago |
|
scrawl
|
ee884634b9
|
fixed item refID handling in the dialogue manager and container script extensions.
|
13 years ago |
|
Marc Zinnschlag
|
74ae3605e0
|
Issue #256: added getTimeStamp function to World
|
13 years ago |
|
scrawl
|
9ca579ba63
|
slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly
|
13 years ago |
|
scrawl
|
1006411c02
|
small fix for mygui log being spammed with errors
|
13 years ago |
|
scrawl
|
41466fc5fc
|
gold label fix, and don't allow selling gold
|
13 years ago |
|
scrawl
|
656b08f620
|
removed the workaround for the ContainerStore bug.
|
13 years ago |
|
scrawl
|
8a0c859c16
|
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
|
13 years ago |
|
scrawl
|
f28f36f262
|
added sounds to trade window
|
13 years ago |
|
Marc Zinnschlag
|
498530fad7
|
container iterator fix
|
13 years ago |
|
scrawl
|
c30b9e4bb9
|
add/remove gold from the player at the end of the transaction.
|
13 years ago |
|
scrawl
|
c004f5d570
|
adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications
|
13 years ago |
|
Marc Zinnschlag
|
a4343bfa18
|
Issue #256: added TimeStamp class
|
13 years ago |
|
scrawl
|
db49e2c046
|
bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things
|
13 years ago |
|
scrawl
|
fb47681fbd
|
fix a bug, some cleanup
|
13 years ago |
|
scrawl
|
342a244e31
|
NPC now doesn't buy items of types that he shouldn't accept.
|
13 years ago |
|
scrawl
|
50a8eb05d9
|
transfering items between player and merchant works and shows a red frame for bought/sold items.
|
13 years ago |
|
scrawl
|
e2400ca7b2
|
only show items in the trade window that the NPC actually trades (services enum)
|
13 years ago |
|
Marc Zinnschlag
|
124ea77612
|
Issue #256: consider equipped items when calculating magic effects
|
13 years ago |
|
Marc Zinnschlag
|
372efaafd7
|
Issue #256: changed implementation of MagicEffects::operator+=
|
13 years ago |
|
Marc Zinnschlag
|
40c58c1bb7
|
Issue #256: fixed a capitalisation mistake
|
13 years ago |