Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
c19f89976e
Add missing Hit voice dialogue for friendly hits
2014-09-18 05:13:17 +02:00
scrawl
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
2014-09-18 04:26:12 +02:00
scrawl
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
2014-09-18 04:10:17 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
scrawl
09042ba6d9
Use object name instead of ID when available for tooltips
2014-09-17 13:03:12 +02:00
scrawl
2eaceb71ba
Reject AiTravel destinations further than 7168 units away, as in vanilla MW ( Fixes #1911 )
2014-09-17 12:39:10 +02:00
scrawl
441073b475
Remove ancient comment
2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6
Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep
2014-09-17 07:02:19 +02:00
scrawl
269c200c8f
Fix jump velocity mechanics ( Fixes #1708 )
2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845
Fix idlestorm animation conflict with torch animation
2014-09-17 07:02:19 +02:00
scrawl
4c285151a3
Fix incorrect movement animation for some creatures ( Fixes #1924 )
2014-09-17 07:02:10 +02:00
Marc Zinnschlag
71c868aa94
Merge remote-tracking branch 'scrawl/master'
2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
scrawl
0c75c6bf1b
Improve spellcasting AI for Drain/Damage effects
2014-09-15 10:42:51 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
Marc Zinnschlag
19f469c7db
Merge remote-tracking branch 'scrawl/master'
2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
89000f6196
removed unused OmwLoader
2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
002b41ba51
Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)
2014-09-14 08:38:54 +02:00
scrawl
4b27950879
Don't apply race height to NPC collision shape ( Fixes #1487 )
2014-09-14 07:04:02 +02:00
scrawl
bd96764229
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
2014-09-14 03:54:50 +02:00
Ragora
b8851790a6
Covered forgotten old bound item checks
2014-09-13 18:59:13 -04: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
4426b03fa4
Remove some garbage
2014-09-13 22:21:37 +02:00
scrawl
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
scrawl
a42e60970b
Revert "delete death events on adding an actor to the scene"
...
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.
This reverts commit fd2c07a6f4
2014-09-13 20:57:25 +02:00
scrawl
8625764143
Give 100% of health back when Resurrecting an actor ( Fixes #1877 )
2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484
add project file to content file list when running OpenMW from OpenCS
2014-09-13 20:48:24 +02:00
Marc Zinnschlag
10fa205ced
fixed --data switch (was missing composing option)
2014-09-13 20:41:57 +02:00
scrawl
319f4e0547
Bind to scancodes instead of keycodes
2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22
Don't trigger any mouse button bindings while in the settings menu
2014-09-13 20:39:59 +02:00
scrawl
04c79d5f1e
Fix case issue when setting companion's profit on the script
2014-09-13 20:39:59 +02:00
scrawl
e54ba2c5d1
Fix broken dialogue Function_HealthPercent
2014-09-13 20:39:58 +02:00
Marc Zinnschlag
882ef37ae3
Merge remote-tracking branch 'ragora/conjureditemsgmstcheck'
2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3
Merge remote-tracking branch 'ragora/fixmapresize'
2014-09-13 15:52:36 +02:00
scrawl
f82224497a
Compatibility fix for MyGUI git
2014-09-13 08:00:24 +02:00
scrawl
2c58a879ec
Fix minor exploit when map window is shown with transparency
2014-09-13 07:59:29 +02:00
scrawl
2b5adb325b
Remove a useless method
2014-09-13 07:57:15 +02:00
scrawl
cfc57d0fe0
Use MyGUI's castType for widget casts
2014-09-13 04:07:40 +02:00
MiroslavR
4fdef94034
Use player's base name for profiles
2014-09-13 02:58:01 +02:00
MiroslavR
23e6d52844
Fix UI not updating initially for zero stats
2014-09-13 02:56:06 +02:00
Ragora
282e7abd16
Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is
2014-09-12 18:26:38 -04:00
Ragora
35571bb108
Global compass arrow rotates regardless of indoor or outdoor presence
2014-09-12 17:31:37 -04:00
Ragora
25f99c5d5a
Discarded use of a static variable and renamed event function to be less ambiguous
2014-09-12 15:06:37 -04:00
Marc Zinnschlag
560eae3f4d
Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix'
2014-09-12 14:22:24 +02:00
cc9cii
1107156334
Workaround incorrectly reported channel_layout
2014-09-12 21:18:54 +10:00
Ragora
58d70c2895
Removed Unused includes from experimentation
2014-09-12 05:20:03 -04:00
Ragora
4ecac31752
Map keeps focus on wherever it was last moved when resizing map window
2014-09-12 05:16:33 -04:00
scrawl
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
2014-09-12 05:14:21 +02:00
Ragora
e105202ee2
Use std::set instead of std::map
2014-09-11 22:45:30 -04:00
scrawl
ee3b1e800c
Add FontLoader and transparent BG texture to the MyGUI plugin
2014-09-12 04:27:23 +02:00
cc9cii
675d11c0e5
Mental note: need to get a linux box
2014-09-12 11:25:11 +10:00
cc9cii
8fe6877cb2
More include madness b/w different systems & compilers
2014-09-12 11:05:02 +10:00
cc9cii
de41dfc314
Add includes.
2014-09-12 10:52:10 +10:00
Ragora
f9e2fd0f3d
Also forgot to remove a now unused variable I introduced
2014-09-11 20:47:14 -04:00
Ragora
efaa820ee2
Managed to forget the itemmodel.cpp code
2014-09-11 20:46:21 -04:00
Ragora
ea43a23505
All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map
2014-09-11 20:45:22 -04:00
cc9cii
0121fdca2c
Don't use C99 in printf.
2014-09-12 10:31:49 +10:00
cc9cii
be74db8b24
Don't use to_string()
2014-09-12 10:04:46 +10:00
Ragora
83868bca23
Removed unused include left over from experimentation
2014-09-11 19:37:00 -04:00
Ragora
ee6298f520
Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best
2014-09-11 19:33:45 -04:00
cc9cii
ecd9dd81ea
Moved debug statements before exception..
2014-09-12 08:41:33 +10:00
cc9cii
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
2014-09-12 08:27:25 +10:00
Marc Zinnschlag
5dd424b6c6
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-11 14:14:02 +02:00
cc9cii
48a36442c6
Add libswresample and libavresample support for sounds.
2014-09-11 21:15:18 +10:00
Marc Zinnschlag
b5d5eadf79
Merge remote-tracking branch 'scrawl/master'
2014-09-11 09:01:21 +02:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
Ragora
74e1db3ac8
Minor Correction to existing conjured item logic
2014-09-11 01:00:39 -04:00
scrawl
f3d4b63aaf
Fix AI moving load doors and throw an exception when trying to do this ( Fixes #1907 )
2014-09-11 05:53:56 +02:00
Ragora
69dbd6b30f
Added checks for different bound item situations
2014-09-10 23:38:38 -04:00
scrawl
36a90198e2
Add option to change screenshot image format
2014-09-11 04:32:31 +02: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
7fa3100993
Refactor TradeWindow balance buttons to use ControllerRepeatClick
2014-09-11 00:25:09 +02:00
scrawl
ebab911e44
Add a hack to support binding the console to a printable key ( Fixes #371 ) and change default console key to morrowind default (GRAVE)
2014-09-10 18:13:39 +02:00
scrawl
cf355d0fcb
Change Always Run key default to Caps Lock, as in vanilla
...
A poor choice, but it's still what players coming from vanilla MW will expect.
2014-09-10 18:09:05 +02:00
MiroslavR
d64be1c092
Use CellId::mWorldspace to find out whether objects are in the same worldspace
2014-09-10 02:49:57 +02:00
MiroslavR
621e81fa7d
Make getdistance return maximum value only if the given objects are in different worldspaces ( Fixes #1895 )
2014-09-10 01:40:33 +02:00
scrawl
616148e168
Fix "failed to open file" error when no startup script is given
2014-09-09 18:28:49 +02:00
MiroslavR
45c90bdcb5
Call getPtrViaHandle instead of searchPtrViaHandle for faced handle
2014-09-09 18:10:34 +02:00
MiroslavR
7e6e248511
Don't cache faced handle, as its context may have been changed during the frame by input events
2014-09-09 17:50:56 +02:00
MiroslavR
86c286c24e
Fix werewolf globals
2014-09-09 15:12:42 +02:00
scrawl
dd5f4947d7
Add a TODO comment
2014-09-09 05:05:20 +02:00
