Chris Robinson
2853b56ed5
Throw an exception when trying to get an empty Ptr's type
2013-08-15 04:52:01 -07:00
Chris Robinson
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Marc Zinnschlag
e2e76147c8
Merge remote-tracking branch 'potatoesmaster/magic'
2013-08-13 15:36:43 +02:00
Emanuel Guevel
ad3646cb15
Fix spell icons displayed when effect ended
2013-08-13 04:57:45 +02:00
Emanuel Guevel
37ea0f3fb9
Display refusal message when weapon/magic icons are clicked as werewolf
2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d
Display HUD icons for hidden windows
2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542
Fix pinned windows hiding
...
They were always displayed in console mode and in game (even if they
were force hidden).
2013-08-12 15:04:41 +02:00
Chris Robinson
5968165de0
Merge remote-tracking branch 'zini/master' into werewolf
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2013-08-09 07:00:00 -07:00
Chris Robinson
46bc7bd9c8
Some cleanup since NpcStats is now also CreatureStats
...
This isn't a thorough cleaning, so keep an eye out for more
2013-08-09 01:14:08 -07:00
Marc Zinnschlag
fb0b57efaa
Merge remote-tracking branch 'vorenon/bug876'
2013-08-09 09:38:10 +02:00
Chris Robinson
6110a0ee3b
Don't allow resting as a werewolf
2013-08-08 18:30:47 -07:00
Chris Robinson
5fbfce6d1e
Don't show WerewolfRobe objects in the inventory
...
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
2013-08-08 16:05:26 -07:00
vorenon
a718a62ef5
Fix for bug 876
2013-08-09 00:06:34 +02:00
Chris Robinson
3cff7b1e42
Don't assume icons have a period in their filename
2013-08-08 04:40:31 -07:00
Marc Zinnschlag
e9521dc8f1
Merge remote-tracking branch 'potatoesmaster/pinning'
2013-08-08 13:06:58 +02:00
Chris Robinson
2bac4566c0
Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Emanuel Guevel
b2e5e8dd0d
Saner inventory window pinning/hiding
...
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
2013-08-07 23:30:08 +02:00
Alex
a0931b01fe
Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg
2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32
mild cleanup
2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Alex
de1f423bd7
initial move of script opcodes and registerExtensions functions to components/compiler
2013-08-06 20:38:41 -04:00
Emanuel Guevel
ddc92d1fbd
Set appropriate weapon icon when player is a werewolf
2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460
Permit to force hiding GUI windows
2013-08-06 12:34:35 +02:00
Emanuel Guevel
8f8362d2c4
Expose sneak indicator widget through WindowManager
2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060
Update sneaking indicator position with other widgets
2013-08-03 02:43:56 +02:00
Marc Zinnschlag
ca94d1a2fb
Merge remote-tracking branch 'swick/inventorypos'
...
Conflicts:
apps/openmw/mwgui/inventorywindow.cpp
2013-07-31 22:16:56 +02:00
Sebastian Wick
7ed763262f
GUI mode dependent position
2013-07-31 21:40:29 +02:00
Marc Zinnschlag
5cafe65cd7
Merge remote-tracking branch 'scrawl/cppcheck'
2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08
Fixed alchemy
2013-07-31 19:03:51 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
PLkolek
8bc8c38f2d
Spell cost is updatedon every change in enchanting and spellmaking.
2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458
Fixed area slider in self enchantments.
2013-07-31 12:26:34 +02:00
scrawl
da01ec4f52
Only show the "Rest until healed" button when stats are not full
2013-07-30 22:07:27 +02:00
Marc Zinnschlag
3642562959
Merge remote-tracking branch 'scrawl/master'
2013-07-30 08:11:40 +02:00
scrawl
3961c276b8
Added enemy health meter
2013-07-30 06:00:20 +02:00
Marc Zinnschlag
e27ba55541
Merge remote-tracking branch 'swick/countdialog'
2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671
use cancel methid
2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1
Allow the 'Activate' key to close the countdialog window; cleanups
2013-07-29 18:27:00 +02:00
Sebastian Wick
1b310c5c5b
use SDL resolutions in the ingame settings
2013-07-29 13:34:56 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
Marc Zinnschlag
ec575200e3
Merge remote-tracking branch 'gus/MeleeCombat2'
...
Conflicts:
apps/openmw/mwrender/animation.cpp
2013-07-23 09:12:23 +02:00
Emanuel Guevel
48f0e64ec3
Fix health calculation at character creation
2013-07-21 11:02:03 +02:00
Emanuel Guevel
2a0644a7c3
Move some levelup logic from mwgui to mwmechanics
2013-07-20 22:14:10 +02:00
Chris Robinson
14e0c182f3
Allow specifying the sound type to playSound and playSound3D
2013-07-18 21:50:11 -07:00
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
2013-07-16 23:32:41 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
scrawl
bbb5d2b98a
Change tooltip positioning to resemble vanilla
2013-07-10 03:40:13 +02:00
scrawl
91f6d87126
Fix an uninitialized variable
2013-07-07 16:57:46 +02:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
