Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
0ba0b2122e
set the implicit object for script excution by clicking on it
2012-06-02 12:25:24 +02:00
scrawl
36d26e0681
set the camera orientation after using teleport doors
2012-05-30 15:52:39 +02:00
Marc Zinnschlag
2bbbff2b75
Merge remote branch 'scrawl/spellwindow'
2012-05-30 10:22:56 +02:00
scrawl
2c90654401
fix a typo that caused a crash when trying to disable an already disabled object
2012-05-30 09:21:41 +02:00
scrawl
30461438f6
still left: spell success formula
2012-05-29 12:35:03 +02:00
scrawl
8c7cb6909d
addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors
2012-05-29 01:59:16 +02:00
scrawl
738e107b52
Merge branch 'master' into next
2012-05-26 05:31:32 +02:00
scrawl
c7010623fb
Issue #294 : disallowed inventory prevents Talk, Open and Take actions
2012-05-25 18:45:17 +02:00
Marc Zinnschlag
173820d29b
Merge branch 'enable'
2012-05-25 18:19:12 +02:00
Marc Zinnschlag
6fe53aa320
Issue #277 : containers in cells were not filled up on cell load when the cell was preloaded before
2012-05-25 17:55:00 +02:00
Marc Zinnschlag
0131c53005
Issue #176 : removed enable/disable functions from MWWorld::Class
2012-05-25 17:28:27 +02:00
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
2012-05-24 15:57:23 +02:00
Marc Zinnschlag
684208dfc9
Issue #176 : when deleting objects, don't go through disable to remove actors from the mechanics manager
2012-05-24 13:26:07 +02:00
scrawl
7ebbc099b3
allow stacking gui modes
2012-05-23 12:23:35 +02:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
Marc Zinnschlag
3e85151c9d
Merge remote branch 'scrawl/inventoryGUI'
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-05-21 10:13:27 +02:00
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
2012-05-21 09:50:46 +02:00
Marc Zinnschlag
420cd53be0
Merge branch 'effects'
2012-05-19 17:41:47 +02:00
Marc Zinnschlag
be46f5a59c
various fixes
2012-05-19 17:39:24 +02:00
Marc Zinnschlag
74ae3605e0
Issue #256 : added getTimeStamp function to World
2012-05-19 09:31:45 +02:00
scrawl
9ca579ba63
slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly
2012-05-19 00:36:01 +02:00
scrawl
8a0c859c16
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
2012-05-18 22:27:48 +02:00
Marc Zinnschlag
498530fad7
container iterator fix
2012-05-18 22:24:19 +02:00
scrawl
c004f5d570
adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications
2012-05-18 22:06:25 +02:00
Marc Zinnschlag
a4343bfa18
Issue #256 : added TimeStamp class
2012-05-18 22:04:22 +02:00
Marc Zinnschlag
124ea77612
Issue #256 : consider equipped items when calculating magic effects
2012-05-18 15:48:55 +02:00
scrawl
3cacc8feec
add re-stocking items to containers (though restocking isn't implemented)
2012-05-17 23:22:41 +02:00
scrawl
1f85475536
Merge branch 'master' into inventoryGUI
2012-05-17 19:03:41 +02:00
scrawl
375c198ebd
WeatherManager: fix for cells that have no region.
2012-05-17 18:21:05 +02:00
scrawl
ae77e7b0d8
don't try to retrieve land data from non-predefined cells.
2012-05-17 18:11:34 +02:00
Marc Zinnschlag
6b74fec8ed
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
2012-05-17 17:13:41 +02:00
scrawl
fca9f1fc5f
gold dropping works without crash, but the code needs clean up.
2012-05-16 22:56:54 +02:00
scrawl
178ad876d7
fix for objects other than Miscellaneous.
2012-05-16 22:17:13 +02:00
scrawl
5875ce5128
select the correct gold base object (still crashing)
2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f
fix to the "drop object on ground" feature. still crashes for gold.
2012-05-16 21:27:02 +02:00
scrawl
6d34e61dbd
don't stack gold if it has a script (not used in MW, but some mods might)
2012-05-16 19:18:50 +02:00
scrawl
4b5d6ce311
allow stacking gold
2012-05-16 17:22:25 +02:00
scrawl
0f1e09d2c1
make Class::use method return an equip action for equippable items, add sound for equipping
2012-05-16 16:08:55 +02:00
scrawl
2fa7ce0c19
equipping works also when the item wasn't in player inventory before.
2012-05-16 00:02:05 +02:00
scrawl
e9ea1fba4e
fixed typo getCapacity method
2012-05-15 22:31:52 +02:00
scrawl
d3a53ae0b8
removed the _freeSlot method which is now unneeded
2012-05-15 22:01:09 +02:00
scrawl
0063387979
Merge branch 'master' into inventoryGUI
2012-05-15 21:48:05 +02:00
Marc Zinnschlag
7e00fea18b
added getEncumbrance function
2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133
added getCapacity function
2012-05-15 21:17:00 +02:00
scrawl
ca4fa21d64
removed the attempt to unify activation and use scripts which was incorrect
2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e
equipping items works, but only if you have more than one of the item that you're equipping
2012-05-15 20:33:34 +02:00
scrawl
ab6336b745
using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)
2012-05-15 18:05:53 +02:00
