scrawl
|
0a17d6d710
|
more resolution switching fixes
|
13 years ago |
Marc Zinnschlag
|
76b23ae864
|
Merge remote branch 'scrawl/buildplayerfix'
|
13 years ago |
|
scrawl
|
a54623bcd2
|
reset attributes when building player
|
13 years ago |
|
scrawl
|
e1ee45a6d6
|
Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue
|
13 years ago |
|
scrawl
|
6014a90002
|
added tooltip delay option
|
13 years ago |
|
scrawl
|
14f4f09f83
|
proper resolution switching (reposition GUI & adjust mouse clipping region)
|
13 years ago |
|
scrawl
|
3daf1ebc3f
|
small map tweak
|
13 years ago |
|
scrawl
|
19c428e86c
|
delete fix
|
13 years ago |
|
scrawl
|
8f667580bb
|
ogre 1.8 final release compability fixes
|
13 years ago |
|
scrawl
|
f6a6684685
|
when the resolution changes, adjust camera aspect ratio and recreate compositors
|
13 years ago |
|
scrawl
|
10cfe0f5bc
|
Issue #295: Class creation dialogs tooltips; plus tons of other improvements
|
13 years ago |
|
scrawl
|
f1d3978897
|
Issue #290: Auto-Close MW-reference related GUI windows
|
13 years ago |
|
scrawl
|
a7e6a142f9
|
blend fog of war into adjacent cells
|
13 years ago |
|
scrawl
|
63213b36bf
|
Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind
|
13 years ago |
|
scrawl
|
313a8e55b7
|
- Issue #296: Clicking on HUD elements shows/hides the respective window
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
|
13 years ago |
|
scrawl
|
3cba884f59
|
Issue #294: show/hide HUD elements based on allowed windows
|
13 years ago |
|
scrawl
|
738e107b52
|
Merge branch 'master' into next
|
13 years ago |
|
scrawl
|
c7010623fb
|
Issue #294: disallowed inventory prevents Talk, Open and Take actions
|
13 years ago |
|
Marc Zinnschlag
|
173820d29b
|
Merge branch 'enable'
|
13 years ago |
|
scrawl
|
750259973e
|
potion creating works, most of the values are bogus
|
13 years ago |
|
Marc Zinnschlag
|
6fe53aa320
|
Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before
|
13 years ago |
|
Marc Zinnschlag
|
0131c53005
|
Issue #176: removed enable/disable functions from MWWorld::Class
|
13 years ago |
|
Marc Zinnschlag
|
36885b2e40
|
Issue #176: removed enable/disable functions from Creature, Npc and Light
|
13 years ago |
|
scrawl
|
63b3b82657
|
don't allow more than 4 potion effects
|
13 years ago |
|
scrawl
|
1df1b521a4
|
show the list of potion effects
|
13 years ago |
|
scrawl
|
6eb15f7680
|
auto-select the alchemy tools with highest quality
|
13 years ago |
|
scrawl
|
3ba24aee0d
|
Merge branch 'alchemy' into next
|
13 years ago |
|
scrawl
|
9b623a79ff
|
Merge branch 'master' into alchemy
|
13 years ago |
|
scrawl
|
09c870ad68
|
first alchemy window layout (not pretty)
|
13 years ago |
|
scrawl
|
51b8a76a68
|
merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
|
13 years ago |
|
scrawl
|
c2b818373e
|
adjust tooltip skin, now is never transparent
|
13 years ago |
|
scrawl
|
a3a22e9096
|
ingredient tooltip shows possible effects
|
13 years ago |
Chris Robinson
|
05fd8f0211
|
Update the actual sounds and music volume when settings change
|
13 years ago |
|
Marc Zinnschlag
|
684208dfc9
|
Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager
|
13 years ago |
|
Marc Zinnschlag
|
c0ee382c72
|
Issue #176: made actor deregistration more robust
|
13 years ago |
|
scrawl
|
57d834b14b
|
fixed an issue with interactive messagebox
|
13 years ago |
|
scrawl
|
6ea7bdb224
|
vsync & fps buttons, sound volume apply fix
|
13 years ago |
|
scrawl
|
cbe89f7e32
|
copy&paste mistake
|
13 years ago |
|
scrawl
|
189b044392
|
small correction
|
13 years ago |
|
scrawl
|
9b94edd561
|
audio tab with volume sliders
|
13 years ago |
|
scrawl
|
cb35f4d208
|
some unrelated gui cleanup
|
13 years ago |
|
scrawl
|
a1907e7b88
|
cleaning up mwgui/widgets part 1
|
13 years ago |
|
scrawl
|
7ebbc099b3
|
allow stacking gui modes
|
13 years ago |
|
scrawl
|
689cf7ce05
|
ConfirmationDialog
|
13 years ago |
|
scrawl
|
656a8f1be9
|
working menu transparency slider
|
13 years ago |
|
scrawl
|
313294c522
|
settings window (hotkey F2) which does nothing. Yay!
|
13 years ago |
|
scrawl
|
b25d62a7e2
|
rename antialiasing mode "MSAA 0" to "none" to avoid confusion.
|
13 years ago |
|
scrawl
|
ad46049ee0
|
got the launcher working with the new settings system.
|
13 years ago |
|
scrawl
|
355268dae1
|
make the launcher build and run again, but it doesn't change settings
|
13 years ago |
|
scrawl
|
343bbaf0fd
|
integrated video settings in the settings file, the launcher is now useless
|
13 years ago |
|
Marc Zinnschlag
|
7938566004
|
Merge remote branch 'scrawl/graphics'
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
13 years ago |
|
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
|
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 |
|
Marc Zinnschlag
|
0dc412d44c
|
Merge remote branch 'scrawl/refid_case'
|
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 |
|
Marc Zinnschlag
|
5236bcb557
|
Issue #256: added operator+= for MagicEffects
|
13 years ago |
|
Marc Zinnschlag
|
79055e281d
|
Issue #256: Force update after building the player character
|
13 years ago |
|
Marc Zinnschlag
|
e1997b7f04
|
Issue #256: added MagicEffects::add overload for EffectLists
|
13 years ago |
|
scrawl
|
adf0550292
|
fixed a wrong label.
|
13 years ago |
|
scrawl
|
52e5e14654
|
use GMST sDefaultCellname for the map window when cell has no region or name.
|
13 years ago |
|
scrawl
|
3cacc8feec
|
add re-stocking items to containers (though restocking isn't implemented)
|
13 years ago |
|
scrawl
|
9a3fd96a0c
|
display the merchant gold.
|
13 years ago |
|
scrawl
|
41efea4c1d
|
in the trade window, don't show items that the merchant has equipped.
|
13 years ago |
|
scrawl
|
6ae642aa06
|
complete trade window layout
|
13 years ago |
|
scrawl
|
c9aa0ca1f4
|
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
|
13 years ago |
|
scrawl
|
4213b4370f
|
trade window shows up and shows the vendor's inventory items.
|
13 years ago |
|
scrawl
|
1f85475536
|
Merge branch 'master' into inventoryGUI
|
13 years ago |
|
scrawl
|
375c198ebd
|
WeatherManager: fix for cells that have no region.
|
13 years ago |
|
scrawl
|
0afda15ce9
|
fix for cells that have no region.
|
13 years ago |
|
scrawl
|
ae77e7b0d8
|
don't try to retrieve land data from non-predefined cells.
|
13 years ago |
|
scrawl
|
5da4da820e
|
beginnings of trade window layout.
|
13 years ago |
|
Marc Zinnschlag
|
6b74fec8ed
|
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
|
13 years ago |
|
scrawl
|
0dc5e5919b
|
show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.
|
13 years ago |
|
scrawl
|
66abfd17ab
|
check the container's "Organic" flag before trying to place items inside.
|
13 years ago |
|
scrawl
|
0c1d06d9f7
|
added some trade window stuff, which does nothing yet.
|
13 years ago |
|
Marc Zinnschlag
|
e56ff9283d
|
Issue #256: moved magic effects update from MechanicsManager to Actors
|
13 years ago |
|
Marc Zinnschlag
|
1fddbf9a40
|
Issue #256: moved dynamic stats update from MechanicsManager to Actors
|
13 years ago |
|
scrawl
|
630241c8e2
|
load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.
|
13 years ago |
|
scrawl
|
c5185cf2e4
|
drop item on avatar from external container bugfix
|
13 years ago |
|
scrawl
|
fca9f1fc5f
|
gold dropping works without crash, but the code needs clean up.
|
13 years ago |
|
scrawl
|
178ad876d7
|
fix for objects other than Miscellaneous.
|
13 years ago |
|
scrawl
|
5875ce5128
|
select the correct gold base object (still crashing)
|
13 years ago |
|
scrawl
|
f73d3ad33f
|
fix to the "drop object on ground" feature. still crashes for gold.
|
13 years ago |
|
scrawl
|
6d34e61dbd
|
don't stack gold if it has a script (not used in MW, but some mods might)
|
13 years ago |
|
scrawl
|
4b5d6ce311
|
allow stacking gold
|
13 years ago |
|
scrawl
|
0f1e09d2c1
|
make Class::use method return an equip action for equippable items, add sound for equipping
|
13 years ago |
|
scrawl
|
9c4243782e
|
sorting items
|
13 years ago |
|
scrawl
|
9a01e18b29
|
fix some MessageBox code that was using deleted pointers sometimes
|
13 years ago |
|
scrawl
|
398a7dc65c
|
crash fix (hopefully)
|
13 years ago |
|
scrawl
|
6a0cb32b7e
|
removed unnecessary code
|
13 years ago |
|
scrawl
|
c5d685c780
|
added an assert
|
13 years ago |
|
scrawl
|
f8c20ef77f
|
don't allow putting items into a container if the weight is exceeded.
|
13 years ago |
|
scrawl
|
2fa7ce0c19
|
equipping works also when the item wasn't in player inventory before.
|
13 years ago |
|
scrawl
|
477f1b42ab
|
fixed another item dropping bug
|
13 years ago |
|
scrawl
|
0f811edb47
|
fixed a bug with dropping items on the ground
|
13 years ago |
|
scrawl
|
5a43fe3e5f
|
remove debug prints
|
13 years ago |
|
scrawl
|
3f4ce32727
|
implemented player encumbrance bar
|
13 years ago |
|
scrawl
|
e9ea1fba4e
|
fixed typo getCapacity method
|
13 years ago |
|
scrawl
|
d3a53ae0b8
|
removed the _freeSlot method which is now unneeded
|
13 years ago |
|
scrawl
|
0063387979
|
Merge branch 'master' into inventoryGUI
|
13 years ago |
|
scrawl
|
175623bf22
|
change the drag&drop to not use a seperate containerstore
|
13 years ago |
|
Marc Zinnschlag
|
fdfddc8be7
|
some todo comment cleanup
|
13 years ago |
|
Marc Zinnschlag
|
7e00fea18b
|
added getEncumbrance function
|
13 years ago |
|
Marc Zinnschlag
|
c6493fb133
|
added getCapacity function
|
13 years ago |
|
scrawl
|
ca4fa21d64
|
removed the attempt to unify activation and use scripts which was incorrect
|
13 years ago |
|
scrawl
|
71de10cb7e
|
equipping items works, but only if you have more than one of the item that you're equipping
|
13 years ago |
|
scrawl
|
765881a61d
|
equipping items in the inventorywindow (there is no visual indication yet)
|
13 years ago |