krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
12942 commits 35 branches 0 tags 65 MiB
Commit graph

7537 commits

Author SHA1 Message Date
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.

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
 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
scrawl
56cd0da522 Fix potential infinite recursion when an area effect spell is reflected (Fixes #1896) 2014-09-09 04:44:14 +02:00
MiroslavR
5ac2788a15 Feature #1545: Allow to select the player in the console 2014-09-09 04:36:17 +02:00
MiroslavR
21eb25706c Don't pursue the player for their crimes when they are a werewolf 2014-09-09 04:15:54 +02:00
scrawl
cb916594d9 Always show tooltips for dead actors 2014-09-09 02:12:44 +02:00
scrawl
d2ef0d362c Implement vanilla distance threshold for AI processing (Bug #1876) 2014-09-09 01:52:48 +02:00
scrawl
f18d4b4ac4 Don't show crosshair tooltips for actors in combat 2014-09-09 00:47:26 +02:00
scrawl
780a48cd1e Don't greet dead actors in AiWander 2014-09-09 00:43:12 +02:00
scrawl
c54ab2e846 Don't allow talking to creatures that are in combat 2014-09-09 00:39:38 +02:00
scrawl
a9847c9453 Fix creature attacking flag not being reset after the attack starts (Fixes #1889) 2014-09-09 00:27:25 +02:00
scrawl
457b96a8af Reset bounty and crime immediately when going to jail (Fixes #1892) 2014-09-09 00:00:55 +02:00
scrawl
628600a0a5 Make PlaceItem place the item in the player's current worldspace 2014-09-08 23:57:16 +02:00
scrawl
3007af44ea Revert "Don't trigger CellChanged events when crossing exterior cell borders (Fixes #1874)" 
This reverts commit 0c67ff9ed0.
 2014-09-08 20:52:15 +02:00
scrawl
6b06ab23aa Don't play sound for torches with OffDefault flag (Fixes #1884) 2014-09-08 15:31:47 +02:00
scrawl
8b0cb239a9 Ignore text keys for zero-length animations (Fixes #1876) 
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
 2014-09-08 15:23:35 +02:00
scrawl
07d827c907 Ignore invalid input in numeric EditBox (Fixes #1885) 2014-09-08 15:22:33 +02:00
cc9cii
785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 2014-09-08 15:24:39 +10:00
scrawl
fe0c9ec9b7 Change priorities in World::searchPtr 
Fixes performance bottleneck of scripts searching through all Containers in all active cells every frame. Can be observed near cell (2,-6)
 2014-09-07 19:09:23 +02:00
scrawl
adbc50366b Use random attack strength for creatures (Bug #1876) 
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.

This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
 2014-09-07 18:55:59 +02:00
scrawl
b6635c7964 Move eventDone out of WindowBase 2014-09-07 18:55:59 +02:00
scrawl
271c921cf8 Add missing confirmation dialog for deleting map notes 2014-09-07 18:55:59 +02:00
scrawl
6e2673daf3 Remove an unneeded include 2014-09-07 18:55:59 +02:00
scrawl
d6bc50c492 Remove an unused member variable 2014-09-07 18:55:59 +02:00
scrawl
31b31115af Fix AI not using Restore Health effect when it is complemented by unnecessary restore magicka/fatigue effects (e.g. in sc_purityofbody) 2014-09-07 18:55:59 +02:00
scrawl
0c67ff9ed0 Don't trigger CellChanged events when crossing exterior cell borders (Fixes #1874) 2014-09-07 18:55:59 +02:00
cc9cii
f616000afb More fix based on code review. 2014-09-07 21:17:34 +10:00
MiroslavR
b574131b06 Unset selected spell after selecting enchanted item in the spell window (Fixes #1878) 2014-09-07 12:42:11 +02:00
cc9cii
c396149f23 Code review fix. 2014-09-07 20:35:32 +10:00
Marc Zinnschlag
16aa55dcde Merge remote-tracking branch 'miroslavr/master' 2014-09-07 10:22:07 +02:00
MiroslavR
931e778b4d Initialize mHasMovedInXY in CharacterController 2014-09-06 21:31:48 +02:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
MiroslavR
007404e17f Merge branch 'master' of github.com:OpenMW/openmw 2014-09-06 14:54:59 +02:00
MiroslavR
b1a449a0b9 Fix wolfrun sound playing all the time when running is default 2014-09-06 05:52:47 +02:00
MiroslavR
57f7ef1db4 GUI: update/clear force-hidden window status 2014-09-06 03:13:35 +02:00
MiroslavR
c1cc66985d Werewolf: only NPCs should have modified fight and react to your transformation 2014-09-06 03:09:11 +02:00
scrawl
f274d5a627 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-09-05 17:18:36 +02:00
scrawl
282c93ccc5 Handle death in actor update rather than instantly (Fixes #1866) 2014-09-05 17:17:45 +02:00
cc9cii
6d12374ace Move windows platform specific files into a common directory. 2014-09-05 22:36:33 +10:00
Marc Zinnschlag
86995adc4a Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-05 09:00:12 +02:00
MiroslavR
9e0d5dc28a Werewolf: can't sleep in beds anymore, actors will attack you on sight, and if you are seen transforming, you will be marked for death 2014-09-05 01:58:57 +02:00
cc9cii
e0e561a105 Add icon to windows exe 2014-09-05 07:17:31 +10:00
cc9cii
7ae8d04c47 Arrgh... silly typo 2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5 Make cmake more reliably detect libswresample 2014-09-04 18:55:10 +10:00
cc9cii
801b9446b7 Support for ubuntu/debian. Can easily be reverted if not required. 2014-09-04 07:58:46 +10:00
Marc Zinnschlag
71a2424500 Merge remote-tracking branch 'miroslavr/master' 2014-09-03 17:58:54 +02:00
cc9cii
093c7f8882 Moved format conversion to audio_decode_frame() 2014-09-03 22:52:03 +10:00
cc9cii
1e72cf4cdc More refactoring, remove more #ifdef guards and fix repeat samples for planar formats. 2014-09-03 18:13:43 +10:00
scrawl
628d57f18c Merge branch 'master' of https://github.com/OpenMW/openmw 2014-09-03 04:55:24 +02:00
scrawl
2379c0ada7 Pause frame updates when the window is minimized (Fixes #1868) 2014-09-03 04:54:07 +02:00
MiroslavR
386bb98fd2 Do not attach coin widgets to a box 2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09 Fix broken coin placement in levelup dialog + possible memleak 2014-09-02 22:06:02 +02:00
scrawl
84a0d064cd Fall back to regular death animation if deathknockdown/deathknockout don't exist (Fixes #1870) 2014-09-02 15:14:23 +02:00
cc9cii
5095f729b0 Make travis happy again. 2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5 Minimize the use of #ifdef guards for better code legibility. 2014-09-02 21:52:19 +10:00
Marc Zinnschlag
4894699eba Merge remote-tracking branch 'scrawl/master' 2014-09-02 09:04:19 +02:00
scrawl
0eb949c8a7 Don't update ripples when they are not used 2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 2014-09-01 21:49:37 +10:00
Marc Zinnschlag
a9df3b53fd restored --new-game switch 2014-09-01 11:55:12 +02:00
MiroslavR
7dfba0ae30 Followers with high fight should not engage in combat with the player 2014-09-01 03:43:53 +02:00
MiroslavR
41c6045986 Realign all parent boxes when autosizedwidgets change size 2014-09-01 03:38:05 +02:00
scrawl
9caff1d800 Don't say Idle voices when player is not in LOS (Fixes #1436) 2014-09-01 02:21:54 +02:00
scrawl
59720b7dc6 Implement MagicItems flag for vendors (Fixes #1861) 2014-09-01 02:10:36 +02:00
scrawl
0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 2014-09-01 02:04:18 +02:00
cc9cii
0b9d17a81d More cleanup. 2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb Implemented feedback review comments, removing hard coded values and adding error handling. 2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e Cleanup comments. 2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16). 2014-08-31 23:35:05 +10:00
cc9cii
8429dab271 Working version - converts FLTP to FLT. Does not work when converting to S16. 2014-08-31 22:01:08 +10:00
cc9cii
16c165185b Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101. 2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 2014-08-31 13:20:33 +10:00
Corporama
ccca6db865 Compile fixes for Linux 2014-08-30 23:11:09 +02:00
scrawl
9d6ca9066f Fix summoned creatures not following for non-player summoners 2014-08-30 18:48:28 +02:00
scrawl
180a831e96 Fix typo in combat distance 2014-08-30 18:38:24 +02:00
scrawl
fde6cad24b Reset RefNum when copying a reference to a new cell 2014-08-30 18:27:59 +02:00
scrawl
267cf4e140 Implement ResetActors script instruction (Fixes #1859) 2014-08-30 18:27:32 +02:00
scrawl
58945c557a Add sound for casting enchanted item with insufficent charge (Fixes #1857) 2014-08-30 02:47:35 +02:00
scrawl
a62e40f4ed Add situational AI use of Feather, Dispel and Cure effects 2014-08-29 17:58:32 +02:00
Marc Zinnschlag
2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663 Silence some scan-build warnings. 2014-08-28 20:55:32 -05:00
cc9cii
fa0352cd75 fix typo 2014-08-29 10:47:44 +10:00
cc9cii
961b4f0142 Suppress a warning. 2014-08-29 07:48:52 +10:00
scrawl
0be1ac1343 Enable casting of NoMagnitude effects in AI (e.g. summoned creatures) 2014-08-28 21:37:18 +02:00
scrawl
feeb740497 Fix bone not found exception for golden saint spellcasting 2014-08-28 17:02:11 +02:00
scrawl
0f43592237 Another invalid iterator fix 2014-08-28 16:47:54 +02:00
scrawl
1c222a0154 Fix mSelectedEnchantItem cleanup not working for non-player actors 2014-08-28 16:31:06 +02:00
scrawl
f91d639782 Add missing soul trap sound (Fixes #1855) 2014-08-28 16:30:42 +02:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
scrawl
253036abee Play VFX_Soul_Trap on successful soul trap 2014-08-28 02:55:36 +02:00
scrawl
f8f4d2dfdb Another invalid iterator fix 2014-08-28 02:14:30 +02:00
scrawl
1a98f8ca93 Invalid iterator fix 2014-08-28 02:09:00 +02:00
scrawl
2e623bac5a Don't attempt to use broken weapons in AI 2014-08-28 02:01:41 +02:00
scrawl
0bdc1b243a Consider weapon ammunition in combat AI (Fixes #1576) 2014-08-28 01:54:32 +02:00
scrawl
f1d72419de Don't equip weapons in autoEquip, AiCombat does that now (Fixes #1451) 2014-08-28 00:59:54 +02:00
scrawl
0fe9612afb Implement basic spellcasting AI (Fixes #961) 
Select a weapon to attack with in AiCombat and equip it (Fixes #1609, Fixes #1772)
 2014-08-28 00:55:37 +02:00
scrawl
1a96dd0bd5 Remove more MyGUI 3.2.0 specific code 2014-08-27 16:39:13 +02:00
scrawl
c5fa7bf7c2 Minor cleanup 2014-08-26 17:45:28 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 2014-08-26 17:01:35 +02:00
scrawl
dd77954512 Don't pass key to input binder if it was consumed by text editor (Fixes #1845) 2014-08-26 03:06:30 +02:00
scrawl
dcddd9a07c Use MyGUI clipboard events for MyGUI 3.2.1+ (Fixes #1846) 
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
 2014-08-26 03:06:30 +02:00
scrawl
10a0e2434e Open inventory when activating an unconscious actor (Fixes #1848) 2014-08-26 03:06:23 +02:00
scrawl
fc7ed05da8 Knock out actors when fatigue base is 0 (Fixes #1847) 2014-08-26 03:02:06 +02:00
scrawl
b4fbaf1169 Fix potential infinite recursion in ActionTeleport (Fixes #1840) 2014-08-26 02:09:23 +02:00
scrawl
854491ac15 Don't treat actors as following if another non-combat AiPackage precedes (Fixes #1843) 2014-08-26 02:09:23 +02:00
scrawl
7714192e28 Remove wrong comment 2014-08-26 02:09:23 +02:00
scrawl
9f13315d1c Remove unused numUnload 2014-08-26 02:09:23 +02:00
scrawl
c775e05d7a Show encumbrance preview when trading (Fixes #1793) 2014-08-26 02:09:22 +02:00
MiroslavR
fc21d898f2 Add hand-to-hand tooltip 2014-08-25 03:15:28 +02:00
MiroslavR
3823e36f05 Merge branch 'master' of github.com:OpenMW/openmw 2014-08-25 00:56:35 +02:00
MiroslavR
d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 2014-08-24 21:59:52 +02:00
MiroslavR
df262e53ae Display school in the spell tooltip 2014-08-24 20:51:41 +02:00
MiroslavR
fc789265e2 Spells that always succeed should not increase your skill when you cast them 2014-08-24 20:36:31 +02:00
Marc Zinnschlag
111b55f48e Merge remote-tracking branch 'scrawl/script' 2014-08-24 17:58:05 +02:00
MiroslavR
e8a245bea3 Enchanting dialog: follow vanilla behavior more closely 2014-08-24 16:41:17 +02:00
Marc Zinnschlag
52f6a2ec7b remote local variable access was always using variable with index 1 instead of the index specified by the access request (Fixes #1739) 2014-08-24 11:58:08 +02:00
Marc Zinnschlag
d024c1a93f Merge remote-tracking branch 'scrawl/master' 2014-08-24 09:14:17 +02:00
Marc Zinnschlag
79e1786ff9 Merge remote-tracking branch 'rohitnirmal/quick-draw' 2014-08-24 09:11:58 +02:00
scrawl
c5c822ecba Use Chop attack when walking diagonally (Fixes #1729) 2014-08-24 02:38:00 +02:00
scrawl
e0e4cbbb41 Implement Light magic effect (Fixes #1122) 2014-08-24 02:37:59 +02:00
scrawl
714c927fda Fix being able to change camera during death via mouse wheel 2014-08-24 02:37:59 +02:00
scrawl
3dbe17b6ed Terminate AiPursue when target dies (Fixes #1836) 2014-08-24 02:37:59 +02:00
scrawl
2b407a9995 Refactor NIF cache 
- Remove broken cache locking mechanism

This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.

 - Decouple cache from NIFFile (now a new nifcache component)

 - Add API for future background loading

 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
 2014-08-24 02:37:50 +02:00
Marc Zinnschlag
80d39780ae same fix for a couple of additional instructions 2014-08-23 18:50:53 +02:00
Marc Zinnschlag
7de49a66e2 fix for PCJoinFaction and for getPcRank without explicit reference 2014-08-23 18:45:06 +02:00
Marc Zinnschlag
0d8bfbfa9b getpcrank did not read the explicit reference in some cases (Fixed #1767) 2014-08-23 18:23:14 +02:00
Rohit Nirmal
6ed4f530df Forgot to update comment. 2014-08-23 10:35:55 -05:00
Rohit Nirmal
bf97fe7b35 Need to change draw state if use'd item is in player's right hand. 2014-08-23 10:31:10 -05:00
scrawl
e9e7e96c5f SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation) 2014-08-23 16:18:46 +02:00
Marc Zinnschlag
7c1b32ae62 Merge remote-tracking branch 'miroslavr/corprus' 2014-08-23 09:15:27 +02:00
Rohit Nirmal
234903d93c Change player draw state when quick-selecting weapon or spell. 
(Fixes #1828)
 2014-08-22 21:36:39 -05:00
MiroslavR
85aa237baf Implement removal of corprus spells 2014-08-22 03:34:31 +02:00
MiroslavR
2cbe17ca0a Make Spells::mCorprusSpells private 2014-08-20 12:40:38 +02:00
MiroslavR
26732bc228 Purge blight should not remove corprus 2014-08-19 22:13:37 +02:00
MiroslavR
96e7ff666d Implement saving/loading of corprus stats, remove redundant code 2014-08-19 03:17:31 +02:00
Bret Curtis
feb0ef8390 fixes building on systems with kFreeBSD kernel 2014-08-18 17:19:54 +02:00
scrawl
83037a1a91 Move fast-forward of particle systems outside of OgreNifLoader (Fixes #1830) 
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
 2014-08-18 16:37:47 +02:00
MiroslavR
3722c7adc3 Initial work on implementing corprus worsening effect 2014-08-18 15:33:12 +02:00
scrawl
03cb66c342 Set render queue group for projectiles (Fixes #1829) 2014-08-18 15:32:52 +02:00
Bret Curtis
bb1fe23f9c fix building on GNU Hurd 2014-08-18 14:41:46 +02:00
scrawl
888a53af04 SaveGameDialog: Allow deleting saves with keyboard (Delete key) 2014-08-17 20:41:23 +02:00
scrawl
9b38888ac9 Add missing AiFollow ActorId initialization (Fixes #1818) 2014-08-17 17:01:04 +02:00
Marc Zinnschlag
02b7712d7c Merge remote-tracking branch 'scrawl/master' 2014-08-17 12:07:44 +02:00
scrawl
bcc79919a7 Fix fortified skill not immediately updating on changing equipment 2014-08-17 05:42:52 +02:00
scrawl
360c7f863c Store magic effect Base values in savegame (Fixes #1489) 2014-08-17 05:38:48 +02:00
scrawl
2db50da8dd Implement magic effect script instructions (Feature #1489) 2014-08-17 05:09:14 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
e508450c1c Add persuasion GMST to ensureNeededRecords (Fixes #1817) 2014-08-17 03:58:03 +02:00
scrawl
322480862b InteractiveMessageBox: lay out buttons horizontally if button width does not exceed message width (Fixes #1812) 
Also fix some layout bugs.
 2014-08-16 18:53:13 +02:00
MiroslavR
195f044f3b Replace more .tga->.dds hacks with ResourceHelpers 2014-08-16 18:12:18 +02:00
scrawl
bb33b4e005 Revert "Remove horizontal messagebox layout, not used in vanilla (Fixes #1402)" 
This reverts commit 40d6c8abf7.
 2014-08-16 17:24:18 +02:00
scrawl
ddf8c5023e InventoryWindow: don't unnecessarily update preview on opening count dialog 2014-08-16 17:18:13 +02:00
scrawl
6ddd9cc5a2 Don't show weight or value for keys (Fixes #1815) 2014-08-16 16:51:56 +02:00
Marc Zinnschlag
47619d957a Merge remote-tracking branch 'miroslavr/master' 2014-08-16 15:25:13 +02:00
Marc Zinnschlag
e893d0d7d3 Merge remote-tracking branch 'scrawl/master' 2014-08-16 15:10:03 +02:00
MiroslavR
063b40a0ee Correct tooltip for maxed out skills 2014-08-16 13:30:49 +02:00
MiroslavR
236eec3d89 Allow widgets with layout-type tooltip to change user data of widgets from tooltip layout 2014-08-16 13:24:44 +02:00
MiroslavR
a9f7a30d90 HBox, VBox: call parent setPropertyOverride 2014-08-16 13:12:02 +02:00
scrawl
c4ae07f48a Remove partially broken sound pausing in main menu (Fixes #1707) 2014-08-16 02:01:39 +02:00
scrawl
7432771ac7 For non-active torches set the particle system speed factor to zero instead of destroying it (Fixes #1811) 2014-08-16 00:51:02 +02:00
scrawl
ddba9e5854 Improve performance of ItemView resize (reposition widgets instead of recreate) 2014-08-15 18:42:33 +02:00
scrawl
084cc857d4 Update magic effects when changing equipment (Fixes #1646) 2014-08-15 01:13:38 +02:00
MiroslavR
1385a86bd4 Spell creation: do not add skill/attribute effects before selecting the skill or attribute 2014-08-15 00:30:24 +02:00
scrawl
7f807f31d0 Remove comment 
Doing some testing with extended journals, doesn't appear to be a performance issue.
 2014-08-14 19:49:03 +02:00
scrawl
c62d53ae84 Remove no longer needed comments about coordinate system 2014-08-14 19:09:33 +02:00
scrawl
c065a4b203 Add ManualResourceLoader for global map overlay (Fixes #1736) 2014-08-14 19:01:03 +02:00
scrawl
1bb82c710c Fix use of uninitialized memory in AiWander::init 2014-08-14 18:55:54 +02:00
scrawl
061c7813f6 AiFollow: return from execute() if target is not player (Fixes #1637) 2014-08-14 02:14:13 +02:00
scrawl
f8010c09fe Adjust combat engagement of following actors (Fixes #1810) 2014-08-14 02:13:55 +02:00
scrawl
94c2517d67 Fix race preview crash (Fixes #1808) 2014-08-13 19:30:46 +02:00
scrawl
28e61c9834 Add default values for fDifficultyMult and sDifficulty (Fixes #1742) 
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
 2014-08-13 17:32:52 +02:00
scrawl
09f27d142a Clear movement queue when changing to a new cell (Fixes #1802) 2014-08-13 16:25:27 +02:00
scrawl
d649c19790 Cache ActorId in AiFollow::getTarget (Fixes #1804) 2014-08-13 16:00:32 +02:00
Marc Zinnschlag
93ed019ca3 Merge remote-tracking branch 'scrawl/master' 2014-08-13 09:04:35 +02:00
scrawl
8ae6796b2f Play creature movement animation without scaling if a fallback is used (Fixes #1797) 2014-08-13 01:53:56 +02:00
scrawl
e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp
 2014-08-12 19:53:37 +02:00
MiroslavR
4f67f5d26f Spellcreation window: set captions to "0" if no effects are added (Fixes #1778) 2014-08-12 18:53:03 +02:00
scrawl
b374255447 Improve performance of moving spell window (don't recreate widgets unnecessarily) 2014-08-12 17:07:15 +02:00
scrawl
025f50a2df Improve performance of inventory window resize (don't update selection buffer unnecessarily) 2014-08-12 17:07:06 +02:00
MiroslavR
baa14511cf Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision 2014-08-12 12:18:38 +02:00
scrawl
177de58884 Use fWereWolfRunMult only when no weapon is drawn 2014-08-12 01:10:18 +02:00
scrawl
63cb91db2e Add --export-fonts command line option 2014-08-11 20:40:02 +02:00
scrawl
cf22d2fa36 Make Potions reveal two effects for every fWortChanceValue of alchemy skill (Fixes #1792) 2014-08-11 20:40:02 +02:00
scrawl
5335f00958 Don't show Until Healed button when only fatigue is not full (Fixes #1798) 2014-08-11 20:40:02 +02:00
scrawl
28fe81df90 Make Lights with OffDefault flag not emit light nor particles when placed in a cell (Fixes #1796) 2014-08-11 20:39:56 +02:00
MiroslavR
4d403ed747 Rename and move functions for texture path correction 2014-08-11 20:04:44 +02:00
scrawl
8866b5f860 Fix maximum magicka calculation (Fixes #1795) 2014-08-11 19:07:14 +02:00
scrawl
fc1687906b Use the last Loop Stop key for calculating animation velocity (Fixes #1776) 2014-08-11 05:29:36 +02:00
scrawl
34847baa54 Disable head animations for dead actors (Fixes #1781) 2014-08-11 05:00:13 +02:00
scrawl
f8040da694 Make doors move through dead actors (Fixes #1608) 2014-08-11 04:43:06 +02:00
scrawl
98bc4618cb AiAvoidDoor: turn and walk forward instead of backwards or sideways (Fixes #1788) 2014-08-11 04:21:04 +02:00
scrawl
36ba56d037 Make Position instruction move non-player actors within their cell only (Fixes #1791) 2014-08-11 02:01:20 +02:00
scrawl
f724732290 Implement mouse wheel journal navigation (Fixes #1790) 2014-08-11 00:51:54 +02:00
scrawl
fcd2a9e4d5 Don't set magic effects for dead actors (Fixes #1783) 2014-08-10 23:52:32 +02:00
scrawl
4138c3e966 Reuse health of previous level rather than recalculating initial health (Fixes #1787) 2014-08-10 17:09:14 +02:00
scrawl
399fa90ef1 Add missing include guard 2014-08-10 16:56:54 +02:00
MiroslavR
4873c4bd31 Generalize function for texture path correction (Fixes #1779) 2014-08-09 18:59:57 +02:00
scrawl
4a26dcb2ad Avoid calling RenderTarget::update from within loadResource 2014-08-08 15:46:33 +02:00
scrawl
8c26f802e6 Move terrain grid implementation to a component so the editor can use it (Feature #1597) 2014-08-08 15:46:33 +02:00
scrawl
982453d4f6 Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597) 2014-08-08 15:46:33 +02:00
scrawl
accab47724 Don't knock down from fall damage in onHit (CharacterController is doing that already) 2014-08-08 15:46:32 +02:00
scrawl
a731ec3587 Remove summoned creature and its effect when it is killed (Fixes #1341) 2014-08-08 15:46:32 +02:00
scrawl
8a4e0a2ce8 Don't fade out screen if teleport target cell is not found 2014-08-08 15:46:32 +02:00
scrawl
143609be59 Set glyph width/height separately from texture coordinates (Bug #1096) 
Requires MyGUI SVN
 2014-08-08 15:46:13 +02:00
scrawl
22d7d8a466 Implement Command creature/humanoid magic effects (Fixes #1120) 2014-08-07 17:21:07 +02:00
scrawl
0f8a10f468 Savegame: Set equipment slot for lights (Fixes #1761) 2014-08-06 20:13:58 +02:00
scrawl
2bfcec53bf Don't show sMagicInvalidTarget for soultrap on NPCs (Fixes #1762) 
Note the message was accurate, since NPCs can't be soultrapped. Maybe vanilla doesn't show it to not spam the screen with message boxes when attacking with a "soultrap on strike" weapon...
 2014-08-06 20:13:58 +02:00
scrawl
a9a7a7ec73 Use Modified attribute values to derive magicka and fatigue (Fixes #1760) 2014-08-06 20:13:58 +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
0b1e997bdd Make sure dialogue is ended properly when closing it by using a service (Fixes #1755) 2014-08-06 20:13:57 +02:00
scrawl
1fc424ce30 Make sure player doesn't get any AI packages (Bug #1749) 2014-08-06 20:13:57 +02:00
MiroslavR
42dceb641e Readd Azura's Star after recharging (Fixes #1765) 2014-08-06 19:50:10 +02:00
MiroslavR
8707f7b116 Fix spell creation magicka cost (Fixes #1763) 2014-08-06 13:19:40 +02:00
Marc Zinnschlag
f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 2014-08-06 08:04:11 +02:00
root
c15902487d fix indent in cmake 2014-08-06 07:59:39 +04:00
root
32ebc90ba4 fix v9 2014-08-06 07:52:36 +04:00
root
713787d92f fix v7 2014-08-06 07:48:16 +04:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
57a8b9cdb5 abdroid-build 2014-08-04 19:52:01 +04:00
root
16aafc26bc fixed cmake for build on all plaforms include android 2014-08-04 19:49:54 +04:00
Marc Zinnschlag
33c36bf0df Merge remote-tracking branch 'scrawl/master' 2014-08-03 22:23:48 +02:00
scrawl
45f0f0e4c3 Use sky_night_02.nif if available (Fixes #1744) 2014-08-03 17:40:29 +02:00
scrawl
639ae7e06c Implement friendly hits on followers (Fixes #1139) 2014-08-03 16:24:16 +02:00
scrawl
2d74388a76 Don't report crime if we are in combat with the victim 2014-08-03 16:24:16 +02:00
scrawl
216ebac2e9 Implement weapon condition damage for ranged weapons (Fixes #1746) 2014-08-03 16:24:11 +02:00
Marc Zinnschlag
dbf5613d8c cleanup 2014-08-03 09:28:44 +02:00
Digmaster
a32ab842ae Added ForceJump/ForceMoveJump commands 2014-08-02 22:42:40 -07:00
scrawl
eb1888a540 Fix GetPcRank and PcExpelled not accepting Faction IDs properly (Fixes #1709) 2014-08-03 00:31:25 +02:00
scrawl
ef78ae22f6 Loosen mode restrictions on opening Journal window (Fixes #1570) 2014-08-03 00:31:18 +02:00
scrawl
cd8287da16 Make sure fog texture is loaded before trying to convertToImage 2014-08-01 18:42:51 +02:00
scrawl
6cb9382bf0 Adjust screen-sized widgets automatically using Stretch align 2014-08-01 17:15:28 +02:00
scrawl
715d357f24 Use a controller to move Drag&Drop widget with the mouse cursor 2014-08-01 17:14:35 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
scrawl
b58b8c6f8f Adjust player position to ground when using a door marker, even if the player is levitating (Fixes #1737) 2014-07-31 04:28:02 +02:00
scrawl
89af49f669 Make sure fog of war texture is loaded before accessing its buffer 2014-07-31 01:58:33 +02:00
scrawl
175cc98e64 Make magic effects with no corresponding resistance attribute unresistable (Fixes #1727) 2014-07-31 01:14:44 +02:00
scrawl
0f1451babd Add epsilon to armor class calculation 2014-07-30 20:26:47 +02:00
scrawl
261e755e73 Font hacking again (Fixes #1506) 2014-07-30 15:26:10 +02:00
scrawl
d1feb9ef02 Fix # in book text being interpreted as MyGUI color code 2014-07-30 15:26:10 +02:00
scrawl
78bd516ab4 Show sMagicInvalidTarget for an invalid soultrap target (Fixes #1728) 2014-07-30 15:26:10 +02:00
Michał Ściubidło
f754e06be9 Fix for bug 1685 2014-07-30 07:47:09 +01:00
scrawl
45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-07-29 19:35:44 +02:00
scrawl
543bb22e8f Implement collision script instructions (Fixes #1111) 2014-07-29 19:01:40 +02:00
scrawl
9e48d56244 Reset RefNum when copying an object (Fixes #1723) 2014-07-29 15:55:58 +02:00
scrawl
1a6db097ed Fix dangling MWWorld::Ptrs in enchanting dialog after loading save game (Fixes #1722) 2014-07-29 15:32:22 +02:00
scrawl
a59620f643 Cache loudness vector in the buffer cache 2014-07-29 14:32:44 +02:00
scrawl
0943ff0886 Fix normalizing sample values 2014-07-29 14:19:12 +02:00
scrawl
625f9a35e6 Implement NPC eye blinking (Fixes #1721) 2014-07-29 01:16:08 +02:00
scrawl
598c0c4ae7 Implement mouth animation for NPCs based on say sound (Fixes #642) 2014-07-29 01:15:22 +02:00
Michał Ściubidło
bd3729a6cb Add grace periods for player greeting. 
Add delay for NPC greating. NPC ignores greeted player after some time.
Fixes bug 1503.
 2014-07-28 23:45:26 +01:00
Michał Ściubidło
d47bfbe69c Implement AI greeting states. 
Greeting consist of 3 phases:
- none - default one, greeting state can only change to "in progress"
  when near enough and some time passes
- in progress - NPC says his greating and rotates toward player,
  state can only change to "done" after some time
- done - rotation is stoped, after idling can go away from player,
  state can only change to "none" when player and NPC are faraway
 2014-07-28 23:45:26 +01:00
Michał Ściubidło
20efeea5d9 AI tell their greatings even when player is moving (like morrowind). 
Greating reset distance was greatly inflated comparing with morrowind.
 2014-07-28 23:45:26 +01:00
scrawl
8455ed6279 Cancel upper body animations when knocked down 2014-07-28 19:51:29 +02:00
scrawl
5349699172 Only show "target resists magic" message for spells cast by player 2014-07-28 17:54:48 +02:00
bogglez
b56cb7e5ee Remove defunct option for building without FFmpeg 
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
  (FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
 2014-07-28 17:46:41 +02:00
scrawl
f67b7dae91 Sheath weapon in all Ai packages except for AiCombat 2014-07-28 17:32:14 +02:00
scrawl
d956df83e4 Don't make guards fight non-aggressive creatures that are in combat 
Ex. summoned creature that is helping in a fight.
 2014-07-28 17:19:20 +02:00
scrawl
d9a6515fe3 Adjust AiFollow running threshold to more closely match vanilla MW 2014-07-28 17:11:46 +02:00
scrawl
18b3e71be5 Reset player position when spawning in fallback cell 2014-07-28 16:59:46 +02:00
scrawl
4773d754c6 Remove redundant isHostile flag (Fixes #1652) 2014-07-28 16:41:12 +02:00
scrawl
0077296c91 Take actor's speed into account in stuck check 
The Winged Twilight's walking animation was so slow that it incorrectly detects being stuck.
 2014-07-28 15:57:16 +02:00
scrawl
d69ed78ccd Don't add combat AI to player 2014-07-28 15:40:52 +02:00
scrawl
3067082534 Make base_anim.nif take priority for biped creatures 
Fixes the skeletal minion's WalkForward1h animation.
 2014-07-28 14:53:53 +02:00
Marc Zinnschlag
4791098e11 Merge remote-tracking branch 'miroslavr/master' 2014-07-28 10:06:22 +02:00
Marc Zinnschlag
7991dfb907 Merge remote-tracking branch 'scrawl/master' 2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
c6d3b0b70b Moved merchant restock from trade start to dialogue start, since other services also interact with it. 2014-07-28 02:27:48 +02:00
scrawl
315b022d2d Add transfer gold from all services to NPC trade gold pool 2014-07-28 00:55:57 +02:00
scrawl
45206bc3f6 Savegame: write and read dynamic Store before Cells 2014-07-28 00:32:59 +02:00
MiroslavR
b4ba18afe7 Include revision number in the "version" command line option (Closes #1711) 2014-07-27 23:36:40 +02:00
scrawl
6262d6c964 Don't leave stale player CharacterController in Actors when loading game (Fixes #1713) 2014-07-27 23:10:58 +02:00
scrawl
d81e9cfefd Implement actors fighting for the actor they are following (Fixes #1141) 2014-07-27 20:33:45 +02:00
scrawl
47e42d4fda Destroy Engine after exception is logged 
In cases where OpenMW throws an exception, then crashes in the Engine destructor (ideally should not happen, but keeps happening), we will at least see what the exception was about.
 2014-07-27 20:33:45 +02:00
scrawl
8c81e22f3e Determine target for On Touch effects for non-player actors 2014-07-27 20:33:44 +02:00
scrawl
31d058b98c Add workaround for ScrollView messing up canvas size (Fixes #1700) 
TODO: Create fixed ScrollView widget?
 2014-07-27 20:33:44 +02:00
scrawl
16b089cdc8 Fix invisible enchanting price when self-enchanting was previously used. 2014-07-27 20:33:44 +02:00
scrawl
9c60e4d826 Change button caption from "Buy" to "Create" when self-enchanting 2014-07-27 20:33:44 +02:00
scrawl
09607f992e Enchanting: fix inverted self-enchant success chance (Fixes #1701) 2014-07-27 20:33:44 +02:00
scrawl
b370c0f7b5 Enchanting: Don't check price on self-enchanting (Bug #1701) 2014-07-27 20:33:43 +02:00
scrawl
4a1e561015 Properly assign effect attribute/skill in potion creation (Fixes #1704) 2014-07-27 20:33:02 +02:00
scrawl
90b2709d6c Allow absorption of non-harmful spells (Fixes #1693) 
Also fix absorption being calculated for each effect rather than the whole spell.
 2014-07-25 19:56:06 +02:00
scrawl
60499eff83 Hotfix for message boxes locking up the game 2014-07-25 19:48:37 +02:00
Marc Zinnschlag
af54bb9623 removed some redundancies; some more general cleanup 2014-07-25 12:23:18 +02:00
Marc Zinnschlag
d0654f3ade move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load 2014-07-25 12:17:15 +02:00
Marc Zinnschlag
1ca0cc4988 rewrote MWScript::Locals::configure to be independent of precompiled script data 2014-07-25 09:37:21 +02:00
Marc Zinnschlag
a3c4000198 moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation 2014-07-25 09:36:02 +02:00
Marc Zinnschlag
87c54adb24 some cleanup 2014-07-25 09:26:30 +02:00
Marc Zinnschlag
f6b502b195 rewrote dialgoue filter access to local variables 2014-07-25 09:08:59 +02:00
Marc Zinnschlag
9f69db0d69 added missing const to ScriptManager::getLocals 2014-07-25 08:12:53 +02:00
Marc Zinnschlag
2e355df8b3 removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts) 2014-07-25 07:59:50 +02:00
scrawl
4ec51b386a Add ManualResourceLoader for fog of war textures (Fixes #1675) 2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4 Fix pinned widgets receiving mouse clicks in gamemode (Fixes #1686) 2014-07-24 18:04:44 +02:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
 2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5 Remove unused FLTV and NAM0 from CellRef 2014-07-24 02:20:16 +02:00
scrawl
7ae9bbb1a5 Implement iCrimeThresholdMultiplier 2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea Use separate function for fatigue restoration during resting/waiting 2014-07-24 02:17:44 +02:00
scrawl
103325bfb8 Change HUD enemy health bar to use actorId 2014-07-24 02:17:44 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 2014-07-22 17:06:40 +02:00
Marc Zinnschlag
91afc2ebe7 Merge remote-tracking branch 'mikesc/bug1482' 2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca Merge remote-tracking branch 'miroslavr/master' 2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f Merge remote-tracking branch 'lgro/aicombat' 2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a Fix bug 1482: 
- put powers on cooldown only when they are used succedsfully
 2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d Added initialization of weapRange in AiCombat::execute(). 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329 Rework level up dialog to behave more like vanilla 2014-07-21 20:56:02 +02:00
scrawl
c0645d4978 Increase death count immediately on death (Bug #1588) 
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
 2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc Make NPCs react to being attacked by other actors (Fixes #1588) 2014-07-21 20:36:26 +02:00
scrawl
127add7623 Don't allow dialogue with werewolf NPCs 2014-07-21 18:19:45 +02:00
Marc Zinnschlag
d87630b41a blacklisting for scripts in OpenMW 2014-07-21 09:34:10 +02:00
scrawl
10d4da7994 Fix date time in journal entries being off by one day (Fixes #1668) 2014-07-21 01:17:01 +02:00
scrawl
5629803a08 Implement correct armor mitigation mechanics 2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59 Adjust combat mechanics 
- Projectiles can not trigger critical hits
 - Critical hits are only possible if the target is not in combat (Fixes #1669)
 - Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
 2014-07-20 23:17:55 +02:00
scrawl
90a96cd7d8 Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor 2014-07-20 22:34:20 +02:00
scrawl
1636fd66db Don't add creature base damage to weapon damage (UESP was wrong) 2014-07-20 22:26:26 +02:00
scrawl
6d794dac69 Add missing messagebox for spell lock and unlock success 2014-07-20 17:09:55 +02:00
scrawl
9897f14c3c Don't block when actor is paralyzed 2014-07-20 16:52:57 +02:00
scrawl
28a0899d2b Implement difficulty scaling (Fixes #1505) 2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f Consider Shield spell effect for creature armor rating 2014-07-20 14:41:39 +02:00
scrawl
691ba02115 Reduce wepaon condition even if attack misses 2014-07-20 14:12:27 +02:00
MiroslavR
0f2305ae43 Clear selected spell when window manager is cleared 2014-07-20 13:07:47 +02:00
scrawl
63fd04882a Make sure crime gold discounts don't reduce price to zero 2014-07-19 23:49:54 +02:00
MiroslavR
d5381e1bc4 Dynamically resize skill widgets to fit their contents (Fixes #1610) 2014-07-19 14:04:38 +02:00
Marc Zinnschlag
6a3ff211b1 automatically get target ID at InterpreterContext construction, if a reference is available 2014-07-18 09:57:47 +02:00
Marc Zinnschlag
4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 2014-07-18 09:56:58 +02:00
scrawl
d4ffd30f98 Implement Rank filter with no faction given (Fixes #1660) 2014-07-17 20:57:37 +02:00
scrawl
f9a39138cc Add missing endline 2014-07-17 16:16:14 +02:00
scrawl
08ce6ed7fb Attempt to restack item after repair or recharge (Fixes #1656) 2014-07-17 16:16:06 +02:00
Marc Zinnschlag
27c84d6cb7 the reference for a targeted script is now determined when needed instead of at the start of the script execution 2014-07-17 13:36:55 +02:00
Marc Zinnschlag
dba6a9ebff run targeted scripts with an implicit reference based on the ID given 2014-07-17 09:15:41 +02:00
scrawl
20a0040bdb Apply elemental shield magnitude to element resistance (Closes #1121) 2014-07-16 10:58:28 +02:00
scrawl
123157b216 Implement elemental shield damage to attacker (Feature #1121) 2014-07-16 10:58:28 +02:00
scrawl
f43a10b7b9 Adjust disease contraction according to Hrnchamd's research 2014-07-16 10:58:21 +02:00
Marc Zinnschlag
75ab8de3d2 added opcode for running scripts with explicit references (targeted scripts) 2014-07-15 13:26:04 +02:00
Marc Zinnschlag
e9377ad5c4 include targeted script data in saved games 2014-07-15 13:05:38 +02:00
Marc Zinnschlag
8241ee59c3 modified GlobalScripts data structures to accommodate targeted script data 2014-07-15 12:59:02 +02:00
scrawl
5839691530 Check for container organic flag before checking weight (Fixes #1654) 2014-07-14 17:27:36 +02:00
scrawl
6cd739678a Fix dangling model pointer after reference cleanup (Fixes #1653) 2014-07-14 16:53:58 +02:00
scrawl
7c7c71428a Don't crash if certain class doesn't exist 2014-07-13 14:26:59 +02:00
scrawl
c9150c9680 Initialize character skeleton to a suitable pose (Fixes #1473) 2014-07-13 10:40:48 +02:00
slothlife
d0e1210dd7 Fix for Bullet debug assert 
After changing the vector comparison to squaredDistance, the threshold
for rejecting similar vectors needed to be readjusted.
 2014-07-13 01:39:42 -05:00
scrawl
8b404ee255 Fix not being able to exit dialogue using Escape when a Goodbye link appears 2014-07-13 06:42:24 +02:00
scrawl
f2799ea1d9 Reset item model when reference is reset (Fixes #1628) 
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
 2014-07-12 18:53:22 +02:00
scrawl
d63dd88113 Apply autocalc corrections to player starting spells 2014-07-12 18:53:16 +02:00
scrawl
fd3f109362 Fix underflow for NPCs with level 0 2014-07-12 18:53:16 +02:00
scrawl
a1639371d3 Fix rounding for skill/attribute autocalc 2014-07-12 18:53:16 +02:00
scrawl
83819b2894 Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences. 2014-07-12 18:53:15 +02:00
scrawl
479f248c1d Use spell effect range type, not base effect (applied to spellcasting code) 2014-07-12 18:53:15 +02:00
scrawl
b4f8edc186 Use spell effect range type, not base effect 2014-07-12 18:53:15 +02:00
scrawl
1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 2014-07-12 18:53:15 +02:00
scrawl
d91d599269 Disable quickload when in modal dialog (Fixes #1641) 2014-07-12 06:43:04 +02:00
scrawl
048d07b299 Show owner of doors in tooltip 2014-07-11 11:57:21 +02:00
scrawl
5fbce67b9d Don't redraw ItemView if the size did not change 2014-07-11 04:30:44 +02:00
scrawl
53c70dbdaa Exit dialogue when going to jail (Fixes #1635) 2014-07-11 04:25:56 +02:00
scrawl
0704fa2b3d Reset local rotation axis in SetAngle (Fixes #1630) 2014-07-09 10:23:01 +02:00
scrawl
df80c436fb Fix compile error for OPENMW_USE_FFMPEG=0 2014-07-08 10:30:46 +02:00
scrawl
742d008765 Fix initializing CharacterController with fists or spell equipped 2014-07-08 10:30:46 +02:00
scrawl
a3a8f4da70 More font hackery. Will it ever end? 
Fixes #1606
 2014-07-08 10:30:45 +02:00
scrawl
0a2d5d34bc Cancel queued view mode switch when switching view mode (Fixes #1618) 2014-07-08 10:30:45 +02:00
scrawl
ee81698089 Always control movement by animation except for first person or in-air 2014-07-08 10:30:45 +02:00
scrawl
6cd6578a88 Handle Deleted moved references (Bug #1613) 2014-07-01 21:47:27 +02:00
scrawl
e666ddfe18 Fix list of moved references being discarded (Fixes #1613) 2014-07-01 21:42:11 +02:00
scrawl
df62c06acf Print exterior grid position in betaComment 2014-07-01 21:41:23 +02:00
scrawl
205e039a39 Allow modCurrent instructions to decrease below zero (Bug #1589) 2014-06-30 17:58:08 +02:00
scrawl
2506c16bf5 Add a dummy GetStat function returning 0 (Fixes #1589) 2014-06-30 17:49:01 +02:00
scrawl
85a1f9d37b Fall back to resolution selected from list when switching to fullscreen (Fixes #1599) 2014-06-30 00:08:39 +02:00
scrawl
082b6125a9 Fix crash during spell creation when an effect targeting a skill/attribute doesn't have one assigned yet (Fixes #1598) 2014-06-29 17:02:29 +02:00
scrawl
5ec96c5394 Add missing visibility flags 2014-06-29 16:02:43 +02:00
scrawl
1de406cb6d Catch exception from invalid scripts during save&load (Fixes #1590) 2014-06-29 16:02:43 +02:00
Marc Zinnschlag
604509ac7e Merge remote-tracking branch 'scrawl/master' 2014-06-29 10:34:48 +02:00
scrawl
e25fa6c157 Refactor non-distant land terrain path to a grid based implementation (Fixes #1562) 2014-06-29 02:42:36 +02:00
scrawl
4949aa1fbb Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif) 2014-06-28 18:21:56 +02:00
scrawl
10ef0a34d9 Update effects even when main animation is paused (Fixes #1585) 2014-06-28 17:54:14 +02:00
scrawl
f929004635 Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm) 2014-06-28 17:44:52 +02:00
scrawl
65e36793fc Fix messagebox on crash showing wrong path 2014-06-28 15:31:55 +02:00
scrawl
3b2358888b Attempt to fix player position after using coc/coe 2014-06-28 15:19:32 +02:00
scrawl
8e361bb879 Make targeted spells collide with water (Fixes #1500) 2014-06-28 14:49:07 +02:00
scrawl
92f5898b32 AiWander: Make sure we have 8 idle values (Fixes #1583) 
The AiWander instruction may specify more (or less) than 8.
 2014-06-28 14:22:27 +02:00
scrawl
523c2715e3 AiCombat: Handle Start to Min and Min to Max durations of 0 (found in Riekling animation) 2014-06-28 01:31:34 +02:00
scrawl
516014c071 Trigger hit on start key if there's no hit key (Fixes #1574) 2014-06-28 01:06:53 +02:00
scrawl
911bd0e340 Use walk animation as fallback if there's no run animation (Fixes #1578) 2014-06-28 00:07:13 +02:00
scrawl
78d02d97da Find text keys in reverse (Bug #1578) 2014-06-28 00:06:08 +02:00
scrawl
2451eead8a Some additional wrapping for faction rank instructions 2014-06-27 20:07:19 +02:00
scrawl
7f26843dc3 Reset key focus when the key focus widget is hidden (Fixes #1568) 2014-06-27 19:35:41 +02:00
scrawl
37c85f0af4 Don't update object root controllers with no time source (Fixes #1564) 2014-06-27 19:35:41 +02:00
scrawl
6a900e0aad Update weapon and shield controllers for creatures 2014-06-27 19:35:41 +02:00
Marc Zinnschlag
3100206b28 replaced an assert with an exception 2014-06-27 08:37:41 +02:00
scrawl
8b340ddd5e Implement slower movement against storms (Closes #41) 2014-06-27 03:22:00 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70 Make flying creatures fall when paralyzed (Fixes #1494) 2014-06-27 03:21:50 +02:00
scrawl
865f4648b0 Fix flying creatures not falling on death 2014-06-26 17:15:07 +02:00
scrawl
44fd526c98 Don't show disposition bar for creatures 2014-06-26 15:36:19 +02:00
scrawl
4aab4e1c26 Ignore item condition when determining value, except in trade (Fixes #1557) 2014-06-26 14:59:33 +02:00
scrawl
869fa08a32 Fix disarming a trap when key is used (Fixes #1556) 2014-06-26 14:30:19 +02:00
scrawl
e5254ff8ef Set render queue for rain 2014-06-26 14:26:53 +02:00
scrawl
7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwrender/sky.hpp
 2014-06-26 04:29:03 +02:00
scrawl
697329f128 Fix crash for in_dagoth_bridge00.nif (Fixes #1561) 
This one is causing trouble by using an unnamed node, will need some more work.
 2014-06-26 03:33:09 +02:00
scrawl
15b486e149 Don't trigger changed flag if a script with no locals is configured 2014-06-26 01:21:15 +02:00
scrawl
2d17d8f61a Savegame: start in (0,0) cell if player's cell no longer exists 
This happens frequently when saves are loaded that were created in a different MW language.
 2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99 CellRef uninitialized fixes 2014-06-25 19:52:14 +02:00
scrawl
f6a568c995 Implement rain (Feature #41) 2014-06-25 18:20:21 +02:00
scrawl
09926a86cb Fix comparing outdated listener position with up-to-date cell (Fixes #1499) 2014-06-25 18:10:26 +02:00
scrawl
2bcbc6ab7d Potential crash fix, either way should have a better error message now 2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
ec64f1a53a Reset accumulation root when its animation finishes 
Fixes a position flicker after standing up from knockdown.
 2014-06-25 02:46:39 +02:00
scrawl
ee098de0a6 Don't ignore lighting values of particles not attached to a character 2014-06-25 01:14:21 +02:00
scrawl
b259c5def2 Make GetFactionReaction garbage argument optional 2014-06-25 01:12:57 +02:00
scrawl
3d9bdad8ba Correct run speed for creatures (by Hrnchamd - Fixes #1136) 2014-06-25 00:51:02 +02:00
scrawl
7f1d0fc2a2 Fix disposition for npcs in same faction, by Hrnchamd 2014-06-25 00:12:51 +02:00
scrawl
8a8ecce1e5 Fix some uninitialized data written to savegames 2014-06-25 00:11:25 +02:00
scrawl
693a097b21 Implement idlestorm animation (Feature #41) 2014-06-24 18:37:38 +02:00
scrawl
36135293e8 Fix moving object from an inactive to another inactive cell 2014-06-24 15:29:36 +02:00
scrawl
b52977e44c Add dummy Face implementation for now (Bug #1541) 2014-06-24 15:09:13 +02:00
scrawl
36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 2014-06-24 15:00:15 +02:00
scrawl
1d46ac19ff Fix being able to activate through terrain 2014-06-24 02:24:32 +02:00
scrawl
320ab1b2c1 Don't say voice when using startcombat for a dead actor (Fixes #1542) 2014-06-23 22:00:17 +02:00
scrawl
0b34d8d2fd Add support for animated collision shapes (Fixes #1549) 2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
scrawl
64a4c2785e Fix water walking 2014-06-22 22:30:30 +02:00
scrawl
d296c6e9b7 Handle fog density values of 0 (Bug #1549) 2014-06-22 22:30:29 +02:00
scrawl
cbec0ffaee Exception fix 2014-06-22 22:30:29 +02:00
slothlife
ead801f2d0 Fix for compiling Win32 debug. 2014-06-21 21:15:41 -05:00
scrawl
e23a7694f3 Don't throw exception when using ModDisposition on creatures (Fixes #1548) 2014-06-22 00:34:32 +02:00
scrawl
e002acdeae Physics: Create actor shapes outside of BulletNifLoader 
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
 2014-06-21 23:37:16 +02:00
scrawl
98329a94b4 Add case sensitivity workaround for spine bones (Fixes #1547) 2014-06-21 19:54:12 +02:00
scrawl
a4ce9d6a7f Always show the script name when a script fails to compile 2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6 Implement toggleMenus 2014-06-20 18:51:00 +02:00
scrawl
ad0a182b7e Improve error message for unknown cells 2014-06-19 20:08:53 +02:00
scrawl
091f9a8fdc Optimize global map render slightly 2014-06-19 19:14:59 +02:00
scrawl
8eab3abb15 Fix initial view offset for large world maps (Fixes #1523) 2014-06-19 19:03:12 +02:00
scrawl
11b05c352f Fix exception when casting Bound Gloves spell 2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
4648524df4 Improve getLOS (use eye level). Also, don't crash when used with non-actors. 2014-06-19 04:53:25 +02:00
scrawl
185ff279a3 Add missing sound effect for mages guild transport 2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8 Fix very slow movement on some creatures, e.g. rats (Bug #1136) 
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
 2014-06-19 02:36:10 +02:00
scrawl
6760f4c897 Make cached GMSTs in MWClass::Npc/Creature safer 2014-06-19 02:09:46 +02:00
scrawl
4234c70232 Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers) 2014-06-19 02:00:40 +02:00
scrawl
d878456d0f Don't add an extra path separator 2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a Don't crash in StatsWindow for invalid faction rank values 
PcRaiseRank: don't allow to raise rank beyond max rank
 2014-06-18 23:50:55 +02:00
scrawl
2193977eec Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway 
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
 2014-06-18 22:59:18 +02:00
scrawl
4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 2014-06-18 21:39:17 +02:00
scrawl
8a4227ec38 Heal player while in jail 2014-06-18 16:57:54 +02:00
scrawl
9a6737073f Fix broken swimdeath in first person 2014-06-18 16:57:54 +02:00
scrawl
e95483c40f Fix crash for on target spells cast by non-actors (Fixes #1529) 2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719 Make Weakness effects apply to all subsequent effects within the same spell (Fixes #1150) 2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39 Fix being able to steal undetected just after invisibility breaks 2014-06-18 16:57:53 +02:00
scrawl
80f66e2157 Fix crash when avformat_open_input fails (Fixes #1522) 2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc Disable QuickKeysMenu in werewolf form 2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956 Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked) 2014-06-18 16:57:53 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
scrawl
1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c Fix broken AI movement on Z axis 2014-06-17 15:25:54 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba Add delay to sneak icon update and skill progress (Fixes #1321) 2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 2014-06-17 04:05:27 +02:00
scrawl
8ac019611d Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47 Fixed underwater issue 
I had accidentally deleted some interpolation parameters.
 2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7 Fix positionCell not properly teleporting actors from inactive to active cells (Fixes #1516) 2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42 Fix getDistance not detecting references in inactive cells properly 2014-06-16 20:05:47 +02:00
scrawl
47bd170d7e Crashcatcher: create temp file in /tmp, not working directory (which may not have write access) 2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9 Fix crash when stealing items with the owner not around (Fixes #1512) 2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 2014-06-16 03:17:31 +02:00
scrawl
78f30e2970 Fix a journal layout bug 2014-06-16 02:52:25 +02:00
scrawl
345ba99c17 Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497) 2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8 Fix weapon incorrectly showing when saving and loading with spell equipped 2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f Clear MyGUI's clipboard, since we don't want to use it (Fixes #1277) 
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
 2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71 Add items to player inventory upon drag start (Fixes #1507) 2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1 Attempt to open companion window if no greetings are found (Bug #1507) 2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d Make Bipedal creatures always able to walk and swim (Fixes #1509) 
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
 2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508) 
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
 2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e Savegame: Store AiSettings and summoned creatures 
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
 2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f Disable fProjectileThrownStoreChance when shooting at player (Fixes #1490) 2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce Implement BetaComment instruction (dumps reference info) 2014-06-15 16:11:16 +02:00
scrawl
326c747508 Don't run scripts when in pause menu (Fixes #1495) 2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b Clear message boxes in windowmanager cleanup (Fixes #1496) 2014-06-15 14:18:16 +02:00
scrawl
e288437885 Disable all other animations on death (Fixes #1483) 2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0 Sort using ciLess, not ciEqual 2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa Don't allow scripted dialogue with dead actors (Fixes #1493) 2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18 Remove a squareroot in pathfinding 2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee Move AiWander arrival check to time-critical section 2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614 Consider moved references in CellStore::listRefs 2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f Fix incorrect trigger of change flag for static doors 2014-06-15 14:18:16 +02:00
scrawl
395f98e476 Fix triggering changed flag for all references when cell is visited 
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.

Also clean up RefData interface slightly.
 2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f Don't clear AiSequence if there are no saved packages (eg for old savegames) 2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434 Merge remote-tracking branch 'mrcheko/master' 2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa fix bug when you were able to kill somebody from large distance without 
being spotted
 2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96 fix http://bugs.openmw.org/issues/1340 
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
 2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6 Use Ogre::Math::PI 2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac Another way of getting M_PI 2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7 Fix missing M_PI define on Windows 2014-06-14 13:29:55 +02:00
scrawl
832f1a4857 Fix merge mistake 2014-06-14 02:31:01 +02:00
scrawl
0637cde267 Bug #1417: Make sure to reset all position/rotation fields when placing items 2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e Bug #1417: Use fmod to wrap local rotations (more efficient and robust) 2014-06-13 23:40:35 +02:00
scrawl
54d8606b78 Fix logging fatal exceptions to cerr, and log them to openmw.log 2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196 Merge remote-tracking branch 'origin/master' 2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620 fix bug http://bugs.openmw.org/issues/1470 2014-06-13 23:22:00 +04:00
scrawl
3334078d4d Add first person meshes to refraction render (Fixes #1481) 2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-06-13 19:31:33 +02:00
scrawl
8114f48469 Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame. 2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27 Merge remote-tracking branch 'upstream/master' 
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case

Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2 Savegame: Store death counter (Fixes #1477) 2014-06-13 02:26:53 +02:00
scrawl
797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5 Savegame: Store AiSequence 2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe Fix a sign error 2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8 Show base item value in tooltip, not real value (Fixes #1469) 2014-06-13 02:26:52 +02:00
scrawl
604d5ac000 Fix console reference label not resetting when loading save 2014-06-13 02:26:52 +02:00
mrcheko
df7213185f warning fixes 2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070 Merge remote-tracking branch 'cc9cii/master' 2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6 For compiling with MSVC 2012 2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3 Cell merge fix (reference context position was not saved correctly) 2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 
Note: breaks compatibility with input.xml, so the filename was changed.
 2014-06-11 19:47:42 +02:00
scrawl
013916fca3 Fix for broken physics in exteriors (Fixes #1446) 
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
 2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7 Don't play the same music track twice in a row (Fixes #746) 2014-06-11 18:11:16 +02:00
scrawl
d60df66811 Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108) 2014-06-11 16:56:41 +02:00
scrawl
73be457805 Merge ESM::Cell fields by subrecord 
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
 2014-06-11 16:13:33 +02:00
Marc Zinnschlag
2faeceacfa Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/main.cpp
 2014-06-11 08:51:18 +02:00
scrawl
0f31e31088 Allow opening journal during dialogue (Fixes #1460) 2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8 Handle Quadratic and Linear attenuation independently (Fixes #1456) 2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e Write logs in log directory 
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
 2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec split getStartTime 2014-06-11 00:20:46 +04:00
scrawl
07d20c212b Fix crash activating quick key 1 2014-06-10 21:34:47 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b Fix character selection caption when there is no character in settings.cfg 2014-06-10 19:01:18 +02:00
scrawl
5a955279bb Fix main menu background showing when resizing window during load 2014-06-10 18:49:42 +02:00
scrawl
3788fb042e Implement MenuTest script instruction (Fixes #1454) 2014-06-10 18:49:42 +02:00
scrawl
6ba112619a Fix dropped items ending up inaccessible when standing in objects with no collision (Fixes #1441) 2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
scrawl
a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1 Implement text replacement for journal topic responses (Fixes #1429) 2014-06-10 15:42:50 +02:00
scrawl
3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 2014-06-10 15:03:27 +02:00
scrawl
4119038f1d Remove an old workaround (Fixes #1458) 2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5 Combat music; some minor combat fixes 2014-06-10 14:20:29 +04:00
scrawl
65d5311037 Revert "Don't try to show exceptions in a message box if SDL was not initialized" 
According to SDL docs, "This function may be called at any time, even before SDL_Init()".

Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.

This reverts commit 39eea24dc3.

Conflicts:
	apps/openmw/main.cpp
 2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490 Don't list non-usable items in QuickKeysMenu selection (Fixes #1427) 2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc Savegame dialog: Grey out buttons if no save is selected 2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00
scrawl
881ae33b74 Don't allow Creatures with no movement abilities to move (Fixes #1457) 2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4 Move video skip detection to WindowManager 
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
 2014-06-10 01:57:54 +02:00
scrawl
7721e54191 Use descriptive names for save files and character folders (Fixes #1449) 2014-06-10 00:22:00 +02:00
scrawl
e796fa2313 Add another french morrowind font workaround (Fixes #1447) 2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef old bug + comment fix 2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067 merge openmw master 2014-06-09 22:37:49 +04:00
scrawl
1bab74a98d Fix punishment for stealing 0 value items (Fixes #1435) 2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3 Change npc training skills to prefer skills with lowest ID if skill values are the same (Fixes #1445) 2014-06-09 03:40:14 +02:00
scrawl
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +02:00
mrcheko
67abc60264 aiming to moving target in ranged combat ai 
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
 2014-06-08 20:59:26 +04:00
Marc Zinnschlag
b717e3fcb8 Merge remote-tracking branch 'filkry/bug1196jumpdialog' 2014-06-08 11:25:34 +02:00
scrawl
d2dca27067 Correct wrong assertions (Fixes #1425) 2014-06-08 11:25:10 +02:00
scrawl
b9dadff5a3 Recognize DELE subrecords at the end of the record (Fixes #1414) 2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 2014-06-08 11:22:37 +02:00
scrawl
69855097ca Fix an always true condition (Bug #1355) 2014-06-08 11:22:37 +02:00
scrawl
b470596206 Handle failed savegame file operations (Fixes #1413) 2014-06-08 11:22:37 +02:00
scrawl
2ec324c80b Consider all splash screens in the Splash folder (Fixes #1416) 2014-06-08 11:22:37 +02:00
scrawl
927ae00454 Fix code that stopped animation immediately after starting it, due to thinking it has completed (Fixes #1370) 2014-06-08 11:22:37 +02:00
slothlife
51c45796b1 Fix physics to not trigger Bullet assert in Debug 
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
 2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37 Fixed mouse closing containers, and injection/gui test order 
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
 2014-06-07 20:08:29 -04:00
Fil Krynicki
1d3a220d94 Added A_Use command to player controls. 2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04:00
Marc Zinnschlag
0668019c86 Merge remote-tracking branch 'scrawl/master' 2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6 Fix warning 2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd Remove unused map 2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5 Don't reserve Pauldron parts for robes (Fixes #1396) 2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e Fix for Bug #1409 2014-06-06 15:13:25 +02:00
scrawl
9627146bf4 Another fix for trade exploit (hopefully the last: Fixes #1408) 2014-06-06 15:08:44 +02:00
scrawl
f3cece8dec Fix alchemy allowing same item ID in different slots (Fixes #1407) 2014-06-06 14:12:50 +02:00
scrawl
40d6c8abf7 Remove horizontal messagebox layout, not used in vanilla (Fixes #1402) 2014-06-06 02:24:51 +02:00
scrawl
d442853b3e Allow opposite gender's parts as fallback (Fixes #1404) 2014-06-06 01:30:23 +02:00
scrawl
c36decb855 Fix being able to place items on top of actors (Fixes #1403) 2014-06-06 00:43:24 +02:00
scrawl
3d103f3785 Don't block hits when in hand-to-hand combat (shield not visible) 2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4 Don't use armor mitigation for fall damage 2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391) 
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
 2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9 Fix AiCombat being incorrectly added to player (Fixes #1356) 2014-06-05 21:51:57 +02:00
scrawl
1173957e56 Fix item weight displaying as 1e+3 for Stendarr's Hammer 2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6 Add missing padding for item tooltip magic effects 2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1 Fix forced switch to third person on death not always working 
For instance, when dying from fall damage
 2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab Fix crash when loading a savegame after dying (Fixes #1389) 2014-06-05 17:01:22 +02:00
scrawl
4e235516c3 Work around missing character in french morrowind font (Bug #1390) 2014-06-05 16:16:16 +02:00
scrawl
85c9871178 Use question mark for not found glyphs in the font 2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9 Fix not reacting to quit request while video is playing 2014-06-05 15:52:02 +02:00
scrawl
c0f1449004 Cycle with equipped items if all slots are occupied (Fixes #1395) 2014-06-05 14:54:07 +02:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
scrawl
00775035af Add missing hasItemHealth for lockpicks/probes (Fixes #1385) 2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac Rewrite journal GUI topic list to use MWList 2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f Fix overlapping text in SpellWindow when the window is too small 2014-06-03 01:12:31 +02:00
scrawl
d777739425 Fix a crash on exit when projectiles were active 2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab Rewrite journal GUI quest index 
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
 - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
 - Fixes a bug where the quest index would not be updated when opened.
 2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95 Fix for dereferencing past end of mGuiModes. 2014-06-02 17:21:13 -05:00
scrawl
577ed3943b Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31 Re-enable collision when an actor is resurrected 2014-06-02 20:45:25 +02:00
scrawl
996e49c534 Change CharacterManager to use list instead of vector 
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
 2014-06-02 20:24:35 +02:00
scrawl
68afac6a19 Fix large size_t being truncated to int 2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c Merge remote-tracking branch 'slothlife/cmake-fixes' 2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0 Properly handle exceptions when saving the game 
Add message boxes when an exception occurs while loading or saving the game
 2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869 Silence a clang warning 
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
 2014-06-02 10:30:44 +02:00
slothlife
20dabaead9 Fix CMake scripts to link static dependencies 
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
 2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a Fix loading a savegame when some of its content files were disabled 
Fixes #1380
 2014-06-01 23:11:38 +02:00