mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-25 00:23:50 +00:00
Code Issues Releases Wiki Activity
11852 commits 38 branches 54 tags 122 MiB
Commit graph

8975 commits

Author SHA1 Message Date
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
Marco Melletti
f212f0e4d2 subviews now get destroyed on close 2014-09-12 16:45:21 +02:00
Marc Zinnschlag
70ee899691 Merge remote-tracking branch 'cc9cii/Bug-No-1725' 
Conflicts:
	apps/opencs/model/tools/bodypartcheck.cpp
 2014-09-12 14:37:26 +02:00
Marc Zinnschlag
b8fdccdbff Merge remote-tracking branch 'cc9cii/Bug-No-1864' 2014-09-12 14:33:17 +02: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
b29d1d452f removed some redundant checks 2014-09-11 14:19:18 +02: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
717c1b15f5 fixed drop implementation for unpaged worldspace (wasn't updating cell object) 2014-09-11 13:08:30 +02:00
Marc Zinnschlag
0db288ce07 generalising and cleaning up drop implementation of worldspace widget 2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b some cleanup of the scene view drop code 2014-09-11 11:27:56 +02: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
cc9cii
88cf2bd597 Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected. 2014-09-11 07:27:48 +10: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
cc9cii
faac91472c Allow '-' and '_' in new addon name. Resolves Bug #1789. 2014-09-10 23:30:42 +10:00
cc9cii
85596322f3 Update status bar when record filter is changed. Should resolve Bug #1290. 2014-09-10 23:13:56 +10:00
cc9cii
ae0fb77e30 Move recordfilterbox label 2 pixels to right. Resolves Bug #1839. 2014-09-10 21:23:38 +10:00
cc9cii
227eb12295 Added document name to showModifiedDocumentMessageBox. 2014-09-10 20:29:47 +10:00
cc9cii
f7c1b169b3 Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838. 2014-09-10 20:00:07 +10:00
cc9cii
89f7608022 Refactor for better legibility. 2014-09-10 14:40:41 +10:00
cc9cii
77171b788b Made popup messagebox non-modal. 2014-09-10 14:03:25 +10: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
cc9cii
f0e0494f03 Since commit 8bce460f34 negative value checks no longer make sense. Not sure what to do about Vampire flag, however. 2014-09-10 08:13:10 +10:00
cc9cii
3a5ed9c5bb Build objects and connections only once. 2014-09-10 07:14:01 +10: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
cc9cii
fdc20c595d Fix gcc compile error. 2014-09-09 21:24:54 +10:00
cc9cii
4471fe771e Fix logic errors. 2014-09-09 21:09:37 +10:00
scrawl
dd5f4947d7 Add a TODO comment 2014-09-09 05:05:20 +02:00
cc9cii
84f5784575 Remove document when closing the last view. Should resolve Bug #1292. 2014-09-09 13:04:48 +10: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
cc9cii
ad8d722763 Close documents rather than views. 2014-09-09 10:05:06 +10: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
cc9cii
5675626482 Cleanup signals when finished. 2014-09-09 07:24:18 +10: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
Marc Zinnschlag
77e9ac8975 Merge remote-tracking branch 'cc9cii/Bug-No-1710' 2014-09-08 16:38:25 +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
724ed807c8 Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable. 2014-09-08 23:14:04 +10:00
cc9cii
988c8f9ebe Ignore duplicate connections. 2014-09-08 16:18:31 +10: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
f59c7fcb36 Fix esmtool FactionId output 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
Marc Zinnschlag
3f24593dba added profile selection panel 2014-09-07 14:40:50 +02:00
Marc Zinnschlag
4337d05126 added right-click handling support to SceneTool class 2014-09-07 13:35:30 +02:00
cc9cii
f616000afb More fix based on code review. 2014-09-07 21:17:34 +10:00
Marc Zinnschlag
f913d51e35 remove deleted debug profiles from run tool 2014-09-07 12:55:52 +02: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
cc9cii
cedf1171e3 Cleanup comments. 2014-09-07 18:37:33 +10:00
cc9cii
dba352fd6f Check all views before exiting. 2014-09-07 18:35:50 +10:00
Marc Zinnschlag
16aa55dcde Merge remote-tracking branch 'miroslavr/master' 2014-09-07 10:22:07 +02:00
Marc Zinnschlag
d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 2014-09-07 10:10:54 +02:00
cc9cii
4a8fe39b2c For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type. 2014-09-07 06:29:09 +10: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
Marc Zinnschlag
51128d2d57 added run button to scene subview toolbar 2014-09-06 16:11:06 +02:00
MiroslavR
007404e17f Merge branch 'master' of github.com:OpenMW/openmw 2014-09-06 14:54:59 +02:00
cc9cii
c78ac391a0 Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour. 
Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.
 2014-09-06 20:24:34 +10:00
Marc Zinnschlag
64cf0870c6 set content files when running OpenMW from OpenCS 2014-09-06 12:24:09 +02:00
Marc Zinnschlag
e5dac5e80b Merge remote-tracking branch 'cc9cii/Bug-No-1735' 2014-09-06 10:12:30 +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
cc9cii
ab8403192c Fix typo. 2014-09-06 08:00:48 +10: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
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
cc9cii
fa0b3eb298 Add an icon to opencs.exe as well 2014-09-05 20:30:50 +10:00
Marc Zinnschlag
5e022195b8 create startup script when running from OpenCS 2014-09-05 11:40:01 +02:00
Marc Zinnschlag
61a92da374 use --new-game/--skip-menu switches when running from OpenCS 2014-09-05 11:03:16 +02: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
Marc Zinnschlag
a728d6d77a full implementation of global run menu item (replaces earlier placeholder implementation) 2014-09-04 17:45:43 +02: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
Marc Zinnschlag
67dfaa7f35 update actions in main menu when creating a new view 2014-09-04 10:47:30 +02:00
cc9cii
801b9446b7 Support for ubuntu/debian. Can easily be reverted if not required. 2014-09-04 07:58:46 +10:00
Marc Zinnschlag
431abcb63a handle shutdown of OpenMW processes when shutting down OpenCS 2014-09-03 20:06:49 +02:00
Marc Zinnschlag
3fec253409 save first (if document was modified) before running OpenMW 2014-09-03 19:56:52 +02:00
Marc Zinnschlag
a06133a50e added failed flag to operation done signal 2014-09-03 19:14:27 +02: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
Marco Melletti
8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 2014-09-03 14:40:32 +02:00
cc9cii
fd5f814218 Trivial change from "Musics" to "Music Files" 2014-09-03 20:06:43 +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
bee36c9167 block saving while OpenMW process is running 2014-09-02 11:59:04 +02:00
Marc Zinnschlag
c88b3a1520 track state of OpenMW process and enable/disable run/stop actions accordingly 2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130 added OpenMW runner 2014-09-02 10:21:17 +02: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
Marc Zinnschlag
96cd46568b some cleanup 2014-09-01 11:15:59 +02:00
Marc Zinnschlag
bec6c4e726 fixed editor creation for Display_LongString 2014-09-01 10:56:38 +02:00
Marc Zinnschlag
7e653cebdf implement script editor via QPlainTextEdit instead of QTextEdit 2014-09-01 10:52:10 +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
Marc Zinnschlag
03c0cbc65a added owner global column to references table (Fixes #1695) 2014-08-30 10:13:34 +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
78393bca30 Merge branch 'editorfix' 2014-08-28 13:33:08 +02:00
Marc Zinnschlag
0dff1fb816 fix for previous commit (was using wrong destination path) 2014-08-28 13:25:56 +02:00
Marek Kochanowicz
ea2feb0aa9 fix for bug 1672 2014-08-28 12:51:49 +02:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
Marc Zinnschlag
9197d4b653 Merge remote-tracking branch 'scrawl/ai' 2014-08-28 09:32:44 +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
Marc Zinnschlag
0b3e2775a0 fixed wording in body part verifier 2014-08-27 10:46:21 +02:00
Stanislav
4d2bdda22f Merge branch 'master' of https://github.com/OpenMW/openmw 2014-08-26 22:14:50 +06:00
Stanislav
bdfb0c8351 Feature #1616: Body part record verifier 2014-08-26 21:55:31 +06: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
44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 2014-08-26 02:09:23 +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
Marc Zinnschlag
ea4cd94c25 syntax highlighter modes 2014-08-24 17:56:20 +02:00
MiroslavR
e8a245bea3 Enchanting dialog: follow vanilla behavior more closely 2014-08-24 16:41:17 +02:00
Marc Zinnschlag
5c536d571b added script column to debug profile table (dialogue only) 2014-08-24 13:15:18 +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
30830d0693 make delegates use the whole document instead of the undo stack 2014-08-23 12:25:12 +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
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
Marc Zinnschlag
be61ed0f6a minor cleanup 2014-08-22 13:18:47 +02:00
Marc Zinnschlag
c2e3709d0f moved syntax highlighter from ScriptSubView to ScriptEdit 2014-08-22 12:49:34 +02:00
MiroslavR
85aa237baf Implement removal of corprus spells 2014-08-22 03:34:31 +02:00
Marc Zinnschlag
d4981c3037 moved change lock from ScriptSubView to ScriptEdit 2014-08-21 14:50:13 +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
2f08d44313 moved script widget configuration code from ScriptSubView to ScriptEdit 2014-08-17 15:25:22 +02:00
Marc Zinnschlag
4e521d1aca fixed resources collection access 2014-08-17 14:21:23 +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
Marc Zinnschlag
06e1cfe613 added missing allowed drop types for script edit (script and region) 2014-08-15 14:41:34 +02:00
Marc Zinnschlag
58916a7731 fixed creator for filter dialogue subview 2014-08-15 13:37:37 +02:00
Marc Zinnschlag
6f97fa472e added dialgoue subview for debug profiles 2014-08-15 13:35:53 +02:00
Marc Zinnschlag
fd3842d726 added flag columns to debug profile table 2014-08-15 13:22:20 +02:00
Marc Zinnschlag
2b9395333a fixed error detection and improved error reporting in IdValidator 2014-08-15 13:11:55 +02:00
Marc Zinnschlag
775e24d2c0 save debug profiles in project files 2014-08-15 12:08:29 +02:00
Marc Zinnschlag
605f71ecc0 added creator to debug profile table 2014-08-15 12:03:07 +02:00
Marc Zinnschlag
1bf177fe72 fixed double namespace in GenericCreator 2014-08-15 12:01:37 +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
Marc Zinnschlag
c66dfe67b1 integrated namespace widget into input field (GenericCreator) 2014-08-14 14:21:34 +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
gus
1ac220593d clean up 2014-08-12 21:32:07 +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
Marc Zinnschlag
40a33eb9f0 Merge remote-tracking branch 'miroslavr/master' 2014-08-12 17:49:03 +02:00
gus
11922dc53a code is shorter, thanks scrawl 2014-08-12 17:41:13 +02:00
gus
465914c77c more clean up 2014-08-12 17:20:02 +02:00
gus
321d385a5d clean up 2014-08-12 17:18:08 +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
gus
d4d8f07bf3 clean up 2014-08-12 13:32:56 +02:00
gus
e9cc1df69e use QPainter 2014-08-12 13:31:32 +02:00
gus
5fd599b5de minor corrections 2014-08-12 13:31:20 +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
Marc Zinnschlag
a5ecf2e9f0 hide record type column in resources tables 2014-08-12 11:32:38 +02:00
Marc Zinnschlag
98fa789904 fixed mixed-up tooltip 2014-08-12 11:07:54 +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
Marc Zinnschlag
fa9c6b19c2 removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on) 2014-08-10 21:03:45 +02:00
Marc Zinnschlag
2df1079dd4 removed mScope field from Filter record (redundant now) 2014-08-10 20:49:14 +02:00
Marc Zinnschlag
a54efbcfa0 made FilterCreator redundant by generalising GenericCreator 2014-08-10 18:46: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
Marc Zinnschlag
35803bc9b6 added scope configuration to creators 2014-08-07 09:32:49 +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
0be1e3d12f removed WriteFilterStage class (functionality integrated into WriteCollectionStage) 2014-08-06 10:03:04 +02:00
Marc Zinnschlag
828536e999 generalised the concept of record scope 2014-08-06 09:53:10 +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
4d49924025 added debug profile record table 2014-08-04 13:36:01 +02: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
Marc Zinnschlag
3f6a7e36d0 removed the (partial broken) return/enter shortcut for custom push buttons, since there is already a space shortcut) 2014-08-01 09:50:49 +02:00
Marc Zinnschlag
1e6d557089 Merge branch 'visibility' 2014-07-31 14:34:25 +02:00
Marc Zinnschlag
f381451ae0 added control element selector toolbar button 2014-07-31 14:33:38 +02:00
Marc Zinnschlag
612202a7a5 fixed several bugs in the layout algorithm of the toggle scene tool 2014-07-31 14:33:12 +02:00
Marc Zinnschlag
507e5c4f6e explicitly flag scene as modified when changing visibility mask 2014-07-31 14:29:52 +02:00
Marc Zinnschlag
439ba57d46 added visual element selector toolbar button 2014-07-31 14:06:04 +02:00
Marc Zinnschlag
a25758c3b1 fixed visibility flags setting 2014-07-31 14:02:55 +02:00
Marc Zinnschlag
b0a9d17dc3 use name as a tooltip if no tooltip is given for scene tool bar toggle buttons 2014-07-31 13:26:23 +02:00
Marc Zinnschlag
92d322cbd1 added visibility flags 2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949 added scene toolbar toggle widget 2014-07-31 13:05:08 +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
Marc Zinnschlag
7a5f73de9e added navigation mode icons to buttons 2014-07-30 17:02:23 +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
ccde462308 Fix typo (RefId -> RefNum) 2014-07-29 19:01:14 +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
4421e7a5cc added lighting mode toolbar icons 2014-07-25 11:15:04 +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