scrawl
da24e298ee
Fix -Wreorder warnings
2015-05-23 22:44:00 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
c4452afd89
Inventory item picking
2015-05-20 04:09:21 +02:00
scrawl
72c1f37527
Port CharacterPreview
2015-05-20 02:18:20 +02:00
scrawl
3b8b217888
Fix no punishment for stealing when taking an item with the inventory opened
2015-05-11 16:38:16 +02:00
scrawl
f0789352c6
Silence error message
2015-05-04 00:34:30 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
scrawl
48ea6286fd
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
scrawl
653ddd3f25
Warning fix
2015-03-02 20:16:11 +01:00
scrawl
730138035d
Cycle infinite loop fix ( Fixes #2421 )
2015-03-02 17:25:26 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
scrawl
aa6ebcd75c
Change stolen items handling to match MW ( Fixes #1443 , Fixes #2290 )
2015-02-05 04:18:43 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
scrawl
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
2015-01-10 03:01:01 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
scrawl
4b704f665f
Reduce includes, move DragAndDrop to separate file
2015-01-10 01:21:17 +01:00
scrawl
0dc9401269
Fix GUI crash due to outdated spells list
2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5
Fix missing armor rating label update
2014-12-15 19:19:08 +01:00
scrawl
c7e1c0b595
Fix weapon cycle getting stuck for same item IDs
2014-12-15 17:49:08 +01:00
scrawl
935cccf974
Implement weapon/spell cycling hotkeys ( Fixes #1024 )
2014-12-15 16:23:08 +01:00
Thoronador
db38108801
fix uninitialized pointer variables in some classes
2014-10-11 01:20:33 +02:00
scrawl
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
2014-09-24 12:21:19 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
Ragora
f250e3df4b
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
2014-09-13 18:48:41 -04:00
scrawl
cfc57d0fe0
Use MyGUI's castType for widget casts
2014-09-13 04:07:40 +02:00
Ragora
69dbd6b30f
Added checks for different bound item situations
2014-09-10 23:38:38 -04:00
Ragora
141755b473
Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them
2014-09-10 21:34:17 -04:00
scrawl
c775e05d7a
Show encumbrance preview when trading ( Fixes #1793 )
2014-08-26 02:09:22 +02:00
scrawl
ddf8c5023e
InventoryWindow: don't unnecessarily update preview on opening count dialog
2014-08-16 17:18:13 +02:00
scrawl
084cc857d4
Update magic effects when changing equipment ( Fixes #1646 )
2014-08-15 01:13:38 +02:00
scrawl
025f50a2df
Improve performance of inventory window resize (don't update selection buffer unnecessarily)
2014-08-12 17:07:06 +02:00
scrawl
4a26dcb2ad
Avoid calling RenderTarget::update from within loadResource
2014-08-08 15:46:33 +02:00
scrawl
44b517f66d
Implement hiding inventory windows by double click on caption ( Fixes #1690 )
2014-08-06 20:13:58 +02:00
scrawl
c6bf9dfbfb
Add ManualResourceLoader for character previews ( Fixes #1752 )
2014-08-06 20:13:57 +02:00
scrawl
4f73e8bb71
Add items to player inventory upon drag start ( Fixes #1507 )
2014-06-16 02:52:25 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
scrawl
6f03694d50
Fixes #1334 : Only unequip item if the sell/drag action is actually successful
2014-05-19 08:03:55 +02:00
scrawl
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
2014-05-15 09:54:10 +02:00
scrawl
117b812fb1
Fix invisibility not breaking on certain actions
2014-05-12 02:20:56 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
Rohit Nirmal
e3a9daf921
Play item sound when trying to sell a bound item, too.
2014-03-20 22:22:31 -05:00
Rohit Nirmal
e4c4747a27
Play item sound even if merchant doesn't purchase it.
2014-03-19 20:08:01 -05:00
Sandy Carter
72a3c50eb8
( #1191 ) Disallow picking up if inventory disabled
...
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
2014-03-08 13:45:54 -05:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
