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

11493 commits

Author SHA1 Message Date
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0 Outdated comment fix 2015-07-25 00:28:47 +02:00
scrawl
3f3c3d0ad3 Remove an already resolved todo comment 2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc Include cleanup 2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
71bc22401f Include cleanup 2015-07-24 18:23:23 +02:00
Marc Zinnschlag
fcf9ae42f4 Merge remote-tracking branch 'smbas/fix-table-proxy-bugs' 2015-07-24 10:29:08 +02:00
Rohit Nirmal
6d2d32485f Fix building OpenCS with Qt 5. 2015-07-23 22:22:22 -05:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Stanislav Bas
a7b3248ee7 Proper sorting of columns with enum values 2015-07-23 20:35:16 +03:00
scrawl
7e4e59efb9 Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792) 2015-07-23 02:29:09 +02:00
scrawl
7900631d51 Print the missing player cell to error output 2015-07-23 02:29:09 +02:00
scrawl
8286dc6c5a Player followers don't report crimes (Fixes #2457) 2015-07-23 02:29:09 +02:00
Marc Zinnschlag
6e3032efc1 Merge remote-tracking branch 'koncord/fix-gold-beh' 2015-07-22 08:30:43 +02:00
Koncord
6c3c85f0d4 Fix indent 
Remove misc.hpp in containerstore.cpp
 2015-07-20 21:53:20 +09:00
Marc Zinnschlag
f3d3cbc58b Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-20 09:57:46 +02:00
Marc Zinnschlag
d2cd151f77 Merge remote-tracking branch 'kunesj/master' 2015-07-20 09:45:14 +02:00
dteviot
2a4d35b98c fixed "comma at end of enumerator list" warning. 2015-07-20 18:20:57 +12:00
Koncord
7a86c8d8b6 Fix OpAddItem, OpGetItemCount and OpRemoveItem. 2015-07-20 12:48:19 +09:00
Koncord
a24df8cb66 Revert addImp() and remove() 
add isGold() in MWWorld::Class
 2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44 Fix "removeitem gold_100" behavior 2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07 Fix "additem gold_100" behavior 2015-07-20 08:20:28 +09:00
Koncord
75e5023590 fix code duplication 2015-07-20 08:06:43 +09:00
Jiří Kuneš
a14a3c82de added description of new syntax to the onRetrieveTag function comment 2015-07-19 19:52:50 +02:00
Marc Zinnschlag
9b3d5c958f Merge remote-tracking branch 'scrawl/music' 2015-07-19 11:49:00 +02:00
Marc Zinnschlag
137d5e2586 Merge remote-tracking branch 'scrawl/master' 2015-07-19 11:46:06 +02:00
dteviot
00eef585af renamed mPlayedIdle to mIdleAnimation. 2015-07-19 18:04:42 +12:00
dteviot
22f49128cc replaced multiple booleans with single state variable. 2015-07-19 18:02:13 +12:00
dteviot
1ed6e95c07 Got rid of some radians to degrees to radians conversions. 2015-07-19 18:01:25 +12:00
dteviot
3ebe9fb34f renamed mRotate to mTurnActorGivingGreetingToFacePlayer 2015-07-19 18:00:49 +12:00
scrawl
b01abe4d19 Stop title music when the game starts (Fixes #2468) 2015-07-19 02:08:24 +02:00
scrawl
1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +02:00
scrawl
278a078e9d Unify magic effect tick functions 
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
 2015-07-18 20:39:45 +02:00
scrawl
77f1387da8 Include cleanup 2015-07-18 20:36:28 +02:00
Marc Zinnschlag
833ad5a2b4 Merge remote-tracking branch 'origin/master' 2015-07-18 17:48:05 +02:00
Marc Zinnschlag
cdfa3006a3 incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-18 17:47:50 +02:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Marc Zinnschlag
f1ac440b78 do not allow editing of deleted scripts 2015-07-18 17:00:00 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
scrawl
111cf5462b Merge pull request #666 from scrawl/animation 
Animation refactoring & fixes
 2015-07-18 13:33:41 +02:00
Marc Zinnschlag
73b6df8280 put script compilation in script subview behind a timer 2015-07-18 13:09:17 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
Marc Zinnschlag
e921552053 Merge remote-tracking branch 'scrawl/opencs' 2015-07-18 11:58:20 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96 Merge remote-tracking branch 'kunesj/master' 2015-07-18 11:34:04 +02:00
slothlife
f8f0380413 Fix for loading window icon on Windows 2015-07-17 21:41:53 -05:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
scrawl
a33ca75742 Pass AnimPriority by const reference 2015-07-18 03:23:41 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
scrawl
c783b50a83 Fix config file priority in the launcher to match OpenMW 2015-07-18 01:38:35 +02:00
scrawl
6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9 Use multimap to speed up custom map marker code 2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16 removed setCrosshairOwned from windowmanager 2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d use correct mechanics manager 2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93 change collor of crosshair 2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
Marc Zinnschlag
5febb96012 do not try to jump to source location for errors that do not have a source location 2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046 consider column when jumping to error in source text 2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4 jump to line in source text when clicking on an error in error table 2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388 made error table read only 2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd improved error table layout 2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160 consider script warning settings for script subview 2015-07-17 11:52:59 +02:00
scrawl
91d71d0fcd Disable MyGUI's scrollbar autorepeat (Fixes #2779) 
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
 2015-07-17 03:39:09 +02:00
scrawl
660e7f5d89 Don't update animation states in skipAnim mode (Fixes #2782) 2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2 Don't restart the jump animation when equipping a different weapon (Fixes #2286) 2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1 Fix enchantments casting more than once per button press, broken by a1432b0255 2015-07-16 19:56:09 +02:00
scrawl
f6f82d433c Fix bug with loop key assignment 
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.

This fixes incorrect playing of the jump animation, one aspect of Bug #2286.
 2015-07-16 19:55:05 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d improved error reporting 2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f display script errors in script subview 2015-07-16 12:36:20 +02:00
scrawl
f8d360190d Remove an unneeded virtual 2015-07-15 19:10:09 +02:00
scrawl
992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 2015-07-15 18:52:23 +02:00
scrawl
17ada63fcb Don't play turning animations on the upperbody when in first person mode (Fixes #2287) 2015-07-15 16:43:11 +02:00
scrawl
3656851750 Remove the now unused changeBlendMask 2015-07-15 16:43:11 +02:00
scrawl
83cceeee72 Use the extended animation priority for Block animations, allow starting attacks during a block animation (Fixes #2761) 2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c Use the extended animation priority for Hit animations 2015-07-15 16:33:10 +02:00
scrawl
50db6ed396 Use the extended animation priority for weapon animations 2015-07-15 14:40:36 +02:00
scrawl
e93a578f23 Extend the animation priority system to one priority value per bone group / distinct blend mask 2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5 Rename Animation::Group to Animation::BlendMask 
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
 2015-07-15 13:49:16 +02:00
Marc Zinnschlag
df027b3498 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4 fixed deleted button sensitivity state 2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03 improving consistency of subview layouts 2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24 replaced the script subview status bar with a bottom box (including a status bar) 2015-07-14 10:05:45 +02:00
scrawl
de6dc21552 Create hardware cursors in advance (Fixes #2660) 2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b Print exceptions in CharacterCreation::spawnDialog 2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a Select the current resolution in resolution list on game start (Fixes #2768) 2015-07-13 18:00:41 +02:00
Marc Zinnschlag
fc6c14614b added user settings option to toggle toolbars in single-record subviews 2015-07-13 12:52:18 +02:00
Marc Zinnschlag
749eff5259 renaming a few user settings categories 2015-07-13 09:42:16 +02:00
Marc Zinnschlag
d22f8703e5 Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-13 09:09:01 +02:00
dteviot
ddeabcdfbe Removed unused field that was giving compiler warning. 2015-07-12 17:15:41 +12:00
dteviot
e294cd95cd extracted function playIdleDialogueRandomly() 2015-07-12 17:15:14 +12:00
dteviot
22059d68f6 Remove duplicated code. 2015-07-12 17:14:48 +12:00
dteviot
0b089a5564 extracted function evadeObstacles() 2015-07-12 16:38:36 +12:00
dteviot
1ef78b1e56 extracted playGreetingIfPlayerGetsTooClose() 2015-07-12 16:37:31 +12:00
dteviot
df421fce92 extracted function setPathToAnAllowedNode() 2015-07-12 16:35:15 +12:00
dteviot
b508846a64 Renamed mStoredAvailableNodes to mPopulateAvailableNodes. 
Don't call getAllowedNodes() needlessly.
 2015-07-12 16:32:48 +12:00
Marc Zinnschlag
b97a4cee44 added button bar to script subview 2015-07-11 16:09:13 +02:00
Marc Zinnschlag
dacb93c57f Merge remote-tracking branch 'scrawl/coverity_scan' 2015-07-11 11:53:43 +02:00
scrawl
0ed3e3e489 Fix cout/cerr mixup 2015-07-11 04:27:41 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a Add brackets around a correct expression to fix coverity warning 2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993 Fix code that I forgot to uncomment (thanks coverity) 2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
12f413ba9b Don't instantiate specialized templates 
This fixes the VS2012 build issue
 2015-07-10 20:21:55 +02:00
Marc Zinnschlag
ba9a9d16bb Merge remote-tracking branch 'scrawl/master' 2015-07-10 09:06:04 +02:00
Marc Zinnschlag
08d2b196bd Merge remote-tracking branch 'ace/explicit-instantiation' 2015-07-10 08:58:53 +02:00
scrawl
f12619b86a Implement fStromWindSpeed (Fixes #2764) 2015-07-10 02:34:00 +02:00
Alexander "Ace" Olofsson
b3b55a5842 Explicitly instantiate MWWorld::Store 2015-07-09 19:22:04 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a Explicity instantiate MWMechanics::Stat 2015-07-09 14:41:37 +02:00
Marc Zinnschlag
87a089d6b6 Merge remote-tracking branch 'dteviot/Bug2726' 2015-07-09 07:49:42 +02:00
dteviot
f1774ee7c3 Fixed compile failing on OSX and Linux. 2015-07-08 19:34:33 +12:00
dteviot
52cf8541f5 End point tolerance restored to 64 units. 
Corrected problem pointed out by Scrawl.
Destination needs tolerance of 64 to avoid overcrowding.
 2015-07-08 18:41:03 +12:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
dteviot
40a925ad37 Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726 2015-07-07 18:16:15 +12:00
MiroslavR
13f289d1a5 Fix calculation of selected blocks in ScriptEdit 2015-07-06 16:35:45 +02:00
Marc Zinnschlag
e89614a35d Merge remote-tracking branch 'origin/master' 2015-07-06 13:10:04 +02:00
Marc Zinnschlag
88f1220a77 Merge remote-tracking branch 'dteviot/Bug2726' 2015-07-06 13:07:40 +02:00
scrawl
49c07de773 Merge pull request #643 from ace13/win-build-fix 
Fix build error and a pair of warnings
 2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d Fix the comments 2015-07-05 21:56:04 +02:00
Stanislav Bas
47d21ff4b3 Add edit locking to ExtendedCommandConfigurator 2015-07-05 22:49:48 +03:00
Stanislav Bas
3c6bc74062 Close the extended configurator when all respective records were removed outside 2015-07-05 22:10:37 +03:00
Marc Zinnschlag
e0781a5d70 Merge remote-tracking branch 'scrawl/master' 2015-07-05 20:47:04 +02:00
Marc Zinnschlag
6c5dc5c7a0 Merge remote-tracking branch 'smbas/fix-cell-creating' 2015-07-05 20:43:59 +02:00
Stanislav Bas
ceb3dea55c Rewording of the user setting for extended configuration 2015-07-05 20:11:21 +03:00
scrawl
531bca1273 Add a threshold for changing aicombat targets (Fixes #2755) 2015-07-05 18:09:13 +02:00
Stanislav Bas
6162a46fbe Update to upstream/master. Resolve the merge conflict 2015-07-05 16:15:48 +03:00
Marc Zinnschlag
432384d280 Merge remote-tracking branch 'scrawl/aicombat' 2015-07-05 14:47:20 +02:00
Marc Zinnschlag
ea1ddb5c9f Merge remote-tracking branch 'smbas/feature-dialogue-edit-id' 2015-07-05 14:44:33 +02:00
Stanislav Bas
3ffa0aa185 Count of nested columns can be retrieved for a collection with no records 2015-07-05 15:36:41 +03:00
dteviot
1239667cb4 AiWander uses points between PathGrid points (Fixes #1317) 
When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.
 2015-07-05 18:21:35 +12:00
dteviot
eb2aa965b9 Extracted function SetCurrentNodeToClosestAllowedNode() 2015-07-05 18:17:18 +12:00
dteviot
76f20b8b20 fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning. 2015-07-05 18:10:02 +12:00
dteviot
0095737c40 Use correct type of variable. Remove unnecessary casts. 2015-07-05 18:09:14 +12:00
dteviot
f942db2b27 Simplified code. 2015-07-05 18:08:09 +12:00
dteviot
9a02a85a24 Pulled duplicate code into function. 2015-07-05 18:07:14 +12:00
scrawl
c90841d649 Fix head tracking for NPCs 2015-07-04 21:00:01 +02:00
Stanislav Bas
4fbd24206b ExtendedCommandConfigurator: layout changes 2015-07-04 20:47:10 +03:00
Stanislav Bas
880bc31ddf TableBottomBox: Creator/Configurator can be closed via Escape 2015-07-04 20:30:02 +03:00
Stanislav Bas
c1b06538dc Add Edit 'ID' action for nested fields 2015-07-04 19:55:48 +03:00
Stanislav Bas
30fd711a47 TableEditIdAction: prevent creation of a UniversalId with Type_None 2015-07-04 19:39:53 +03:00
Stanislav Bas
86dc5a2c67 Add Edit 'ID' action for nested tables 2015-07-04 19:27:59 +03:00
Stanislav Bas
464e674a81 Rework Table (view) code to use a TableEditIdAction 2015-07-04 18:51:39 +03:00
Stanislav Bas
6b34845168 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-04 18:49:32 +03:00
dteviot
fae93e3d82 Bugfix: was not resetting mStuckCount. 2015-07-04 19:00:27 +12:00
dteviot
46a654286b Remove fix for #1317 
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
 2015-07-04 18:57:56 +12:00
dteviot
164994f3d3 Made PathFinder::buildPath() private. 
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
 2015-07-04 18:47:26 +12:00
scrawl
6bcea21e14 Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876) 2015-07-04 05:19:05 +02:00
Stanislav Bas
1f826476ff Fix build error 2015-07-04 02:02:22 +03:00
Stanislav Bas
ff3c9a6fb2 ExtendedCommandConfigurator: the perform button is now the default for the widget 2015-07-03 23:35:00 +03:00
Stanislav Bas
e664ef7578 ExtendedCommandConfigurator: the perform button takes the name of the command that is executed 2015-07-03 23:15:26 +03:00
Stanislav Bas
05cc130212 The configuration panel gets a focus when opening 2015-07-03 22:31:38 +03:00
Stanislav Bas
95d16b24c0 ExtendedCommandConfigurator: disable the perform button when all tables are unchecked 2015-07-03 22:25:56 +03:00
Stanislav Bas
260f6f22ae TableBottomBox adjusts its size according to the current widget size 2015-07-03 22:07:37 +03:00
Stanislav Bas
d73fd471c3 IdContextMenu: don't add Edit action if it's already in the context menu 2015-07-03 19:07:44 +03:00
Stanislav Bas
61ab0ba482 Prevent the Edit 'ID' action for the current ID of the dialogue subview 2015-07-03 18:48:13 +03:00
Stanislav Bas
149cb9d004 IdContextMenu: if the ID field is empty show the standard context menu (if available) 2015-07-03 16:51:47 +03:00
Stanislav Bas
e8e34f37dd Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels) 2015-07-03 16:24:08 +03:00
Stanislav Bas
47b66b57ae Create a context menu handler for dialogue editors with ID information 2015-07-03 15:37:10 +03:00
Marc Zinnschlag
382cdb8c60 implemented sorting in report views (Fixes #2540) 2015-07-03 10:45:08 +02:00
scrawl
a7bd050928 Accurate attack timings in AiCombat 2015-07-03 05:58:12 +02:00
scrawl
741e5db862 Fix for non-bipedal creatures that use weapons, e.g. rieklings 2015-07-03 05:37:18 +02:00
scrawl
2385938485 Fix a typo 2015-07-03 02:42:40 +02:00
scrawl
82740c1645 Remove completely broken code 2015-07-03 02:29:42 +02:00
scrawl
d07b176b36 Take into account hit recovery, knockdown and other animations for AiCombat attack timing 2015-07-03 02:18:35 +02:00
scrawl
520a832a9a Remove an already resolved todo comment 2015-07-02 22:24:23 +02:00
Stanislav Bas
12bf3694bd Rework widget layout of ExtendedCommandConfigurator 2015-07-02 22:05:45 +03:00
scrawl
6724585777 Light magic effect 
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)
 2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42 Fix for some coverity scan defects 2015-07-02 20:46:34 +02:00
scrawl
dcb8fbc69c Accurate handling of fog depth/density (Fixes #2752) 2015-07-02 20:46:34 +02:00
Stanislav Bas
b8772c6902 Add the ability to configure extended commands for tables 2015-07-02 20:44:59 +03:00
Stanislav Bas
fcf69555f4 Add the user setting for enabling the configuration of extended commands 2015-07-02 20:41:32 +03:00
scrawl
6691891bee Include cleanup 2015-07-02 19:16:44 +02:00
scrawl
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +02:00
scrawl
519fb9482a Minor cleanup 2015-07-02 18:45:11 +02:00
Stanislav Bas
ba762ec1c1 Add the configuration widget to the bottom box 2015-07-02 17:21:47 +03:00
Stanislav Bas
1949fe4bf9 Add the configuration widget for extended commands 2015-07-02 15:47:12 +03:00
Marc Zinnschlag
dafb1b5fa9 Merge remote-tracking branch 'smbas/master' 2015-07-01 23:13:49 +02:00
Stanislav Bas
1afa22f443 Add the RecordType column to the MetaData table 2015-07-01 21:36:17 +03:00
Alexander "Ace" Olofsson
5d24091364 Fix build error and a pair of warnings 
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
 2015-07-01 15:06:38 +02:00
scrawl
2065e0fa2d Use the correct format specifier for ess-imported savegames 2015-06-30 17:43:22 +02:00
scrawl
20d03c7e39 Refuse loading save games of unknown format 2015-06-30 17:41:44 +02:00
scrawl
a081d402c5 Use the format field instead of version field 2015-06-30 17:26:33 +02:00
scrawl
4637750601 Savegame loading optimization 2015-06-30 16:47:41 +02:00
scrawl
4eaaa5e855 Increment save file version and mark it as used, will be used in next commit 2015-06-30 16:47:40 +02:00
Stanislav Bas
51a2d4ef5a Merge remote-tracking branch 'upstream/master' 2015-06-30 13:50:33 +03:00
Marc Zinnschlag
d3bcf0711c Merge remote-tracking branch 'smbas/feature-cloning-enhancements' 2015-06-30 10:40:28 +02:00
scrawl
ca21e9ecb1 Fix magic hit VFX showing when casting on a static object 2015-06-30 03:14:49 +02:00
scrawl
4b2391c60f Ignore effect meshes in getScreenBounds 2015-06-30 02:51:32 +02:00
scrawl
d5a47cfafe Include cleanup 2015-06-30 01:41:03 +02:00
Stanislav Bas
e2103287aa Not accepted drag event must be ignored 2015-06-30 01:08:42 +03:00
scrawl
017c9f7ac9 Fading for weather particle effects 2015-06-29 20:19:46 +02:00
scrawl
cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 2015-06-28 05:53:03 +02:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
Stanislav Bas
e4d52ff9b0 Deleted records can be cloned 2015-06-28 00:31:41 +03:00
Stanislav Bas
9d274ee156 Merge branch 'master' into feature-cloning-enhancements 2015-06-27 22:02:31 +03:00
Stanislav Bas
81c7ce5b06 Add the proper getErrors() method to CellCreator. 
Fix the impossibility of the Exterior Cell creation.
 2015-06-27 21:59:16 +03:00
Marc Zinnschlag
15bb2855a9 disable prev/next buttons if there is no previous/next record 2015-06-27 16:57:45 +02:00
Marc Zinnschlag
e27a75bd10 added user setting for cyclic prev/next 2015-06-27 15:56:41 +02:00
Marc Zinnschlag
95522fcad2 more general cleanup 2015-06-27 15:29:54 +02:00
Marc Zinnschlag
9aa153984a fixed inconsistent handling of deleted records in dialogue; general cleanup 2015-06-27 15:02:50 +02:00
Marc Zinnschlag
a8c26ec0c1 moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar 2015-06-27 14:42:22 +02:00
Marc Zinnschlag
d5e6d8a58b disable dialogue subview buttons while document is locked 2015-06-27 14:25:48 +02:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
Marc Zinnschlag
7f1129df3b cleaned up DialogueSubView constructor; moved bottom box below button bar 2015-06-27 12:53:46 +02:00
Marc Zinnschlag
49dc30683f refactored dialogue subview button bar into a new class 2015-06-27 12:49:56 +02:00
Stanislav Bas
cbb124ab4f Close the creator when the original record is removed (in clone mode) 2015-06-27 12:26:19 +03:00
Stanislav Bas
cad4ce4e0f Cell type can be changed when cloning a cell 2015-06-27 11:47:59 +03:00
Stanislav Bas
5761ec428d Creating/cloning Cell sets the proper Interior flag 2015-06-26 23:38:20 +03:00
Stanislav Bas
f3bb00e3d9 Add the ability to add nested values to the Create command 2015-06-26 22:16:12 +03:00
Stanislav Bas
a7f31988d1 Add the ability to search a nested column index 2015-06-26 22:14:11 +03:00
Marc Zinnschlag
6d5823e8aa killed some tabs 2015-06-26 18:54:49 +02:00
Marc Zinnschlag
fdf6645dbc Merge remote-tracking branch 'smbas/fix-info-tables' 2015-06-26 18:47:16 +02:00
Marc Zinnschlag
654e7428aa Merge remote-tracking branch 'smbas/master' 2015-06-26 18:39:40 +02:00
Marc Zinnschlag
2dada1a162 Merge branch 'meta' 2015-06-26 18:37:39 +02:00
Marc Zinnschlag
4487bda702 size limits for meta data strings 2015-06-26 18:19:00 +02:00
scrawl
59db9664ba Pass the CharacterController to AiPackage::execute 2015-06-26 17:47:04 +02:00
Marc Zinnschlag
a4c2c75d1f fixed overwriting of meta data when loading project file 2015-06-26 16:22:06 +02:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
Marc Zinnschlag
57015f3666 fixed handling of numeric read-only fields in dialogue sub views 2015-06-26 15:50:36 +02:00
Marc Zinnschlag
10fbe6aada split DialogueSubView in SimpleDialogueSubView and DialogueSubView 2015-06-26 15:17:47 +02:00
Marc Zinnschlag
5a37530c1c added missing MetaData table UniversalId type 2015-06-26 15:17:18 +02:00
Marc Zinnschlag
1870b087e7 ported setting of meta data for saving to the new mechanism 2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd moved meta data into a new single-row table 2015-06-26 13:01:25 +02:00
Stanislav Bas
feeb9ea8b0 Merge remote-tracking branch 'upstream/master' 2015-06-26 12:10:51 +03:00
scrawl
a44be148d8 Fix door collisions 2015-06-26 06:40:28 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
beb1086260 Fix attackStrength being unset for creatures with no weapons 2015-06-26 04:21:10 +02:00
scrawl
5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 2015-06-26 02:32:41 +02:00
scrawl
4ef6aa6b7f Fix weather particles disappearing 2015-06-26 02:30:39 +02:00
scrawl
ea0339d471 Make the string argument to BetaComment optional 2015-06-25 21:45:59 +02:00
Stanislav Bas
ea97b0a20c Refine InfoTableProxyModel::getFirstInfoRow() code 2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d Fix conversion to QString 2015-06-25 19:41:26 +03:00
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03:00
scrawl
8a3889a81e Rain fading 2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e Rain effect 2015-06-25 17:23:01 +02:00
Marc Zinnschlag
8fbc799655 Merge remote-tracking branch 'cc9cii/master' 2015-06-25 14:06:22 +02:00
Marc Zinnschlag
69db0179ca update refresh menu item on stateChanged signal instead of when opening the menu 2015-06-25 13:05:57 +02:00
cc9cii
c0f3d70f06 Use the new severity message attribute. 2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f Fix crash when user preference is missing. 2015-06-25 20:21:51 +10:00
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02:00
Stanislav Bas
d282bead23 InfoCreator accepts drops of Topic/Journal ID 2015-06-25 11:24:19 +03:00
Stanislav Bas
5b82b9d9d0 ReferenceCreator accepts drops of Cell ID 2015-06-25 11:20:35 +03:00
Stanislav Bas
21f0b586ec Rows with the same topic but in different letter case can be reordered 2015-06-24 20:01:29 +03:00
Marc Zinnschlag
e29d9bcc8e use a namespace instead of a class with only static functions 2015-06-24 17:29:47 +02:00
Marc Zinnschlag
b0aad9c8cb Merge remote-tracking branch 'smbas/feature-improved-dragndrop' 2015-06-24 17:20:43 +02:00
Stanislav Bas
270c17faa7 Prevent drops on non-editable table cells 2015-06-24 16:36:09 +03:00
Stanislav Bas
d1339a643a Fix for NestedTableProxyModel::forwardDataChanged() 2015-06-24 15:07:09 +03:00
scrawl
6f34a0501a Attempting to make a potion with no effects removes the ingredients (Fixes #2722) 2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31 An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722) 2015-06-24 05:17:45 +02:00
scrawl
d7695f2560 Remove unused NpcAnimation visibilityFlags 2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55 Move HeadAnimationTime to the implementation file 2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13 Move head tracking from NpcAnimation to Animation (Bug #2720) 2015-06-22 21:06:27 +02:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-22 15:20:58 +02:00
scrawl
3f54f77647 essimporter build fix 2015-06-21 22:17:06 +02:00
Stanislav Bas
d606b62688 Nested tables accept drops 2015-06-21 21:35:00 +03:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
Stanislav Bas
b9882eb59a DragRecordTable checks drag type before accepting it 2015-06-21 18:40:13 +03:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
Stanislav Bas
a23de394f8 Refine DropLineEdit code 2015-06-21 17:16:13 +03:00
Stanislav Bas
2565452052 Add some drag'n'drop utils to work with TableMimeData 2015-06-21 17:08:10 +03:00
dteviot
c65e7a31e7 Aquatic creatures no longer try to get onto land. 
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
 2015-06-21 16:23:40 +12:00
Stanislav Bas
dc37aea8eb Add missing mappings to TableMimeData 2015-06-20 21:00:15 +03:00
Stanislav Bas
7dcdd130bb Rework Dialogue subview code according to DropLineEdit changes 2015-06-20 20:52:47 +03:00
Marc Zinnschlag
c644f15167 calm down travis 2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317 add normal script warnings mode (Fixes #2642) 2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731 added severity attribute for operation messages (Fixes #2717) 2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86 standarised on the use of the Message struct when passing operations messages around 2015-06-20 17:56:42 +02:00
Stanislav Bas
64701b273d LineEdits for ID values accept drops with a proper type 2015-06-20 18:29:31 +03:00
scrawl
ad6764fa6a Fix bug #2715 2015-06-20 17:08:46 +02:00
Marc Zinnschlag
0e21c61297 replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct 2015-06-20 16:55:34 +02:00
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +03:00
Marc Zinnschlag
9a102f81c8 added setting for controlling script compiler warnings 2015-06-20 16:21:04 +02:00
Marc Zinnschlag
1ee1934053 framework for accessing user settings in operation stages 2015-06-20 16:20:31 +02:00
Stanislav Bas
ced4e237a8 Fix the sorting of Info tables when new row are added 2015-06-20 12:43:53 +03:00
Marc Zinnschlag
8aba52170f fixed a build error 2015-06-20 11:34:32 +02:00
Stanislav Bas
f1a38ffe93 InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row 2015-06-20 11:29:15 +03:00
scrawl
efad4efe19 Star fading (Bug #2693) 2015-06-19 20:55:04 +02:00
scrawl
74260a9a44 Tweak moon sizes 2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581 Disable FreezeOnCull for effect particles 2015-06-19 18:38:44 +02:00
Stanislav Bas
170692b480 InfoTableProxyModel: invalidate first row cache after row insertion/deletion 2015-06-19 19:24:06 +03:00
scrawl
1ed4e33815 Fading for mooncircle texture 2015-06-19 18:19:52 +02:00
scrawl
38d90f47a6 Moon fading fix (Bug #2713) 2015-06-19 18:15:23 +02:00
Stanislav Bas
e212414bc7 Use an ID parent type as the collection ID in GenericCreator. 
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
 2015-06-19 13:49:48 +03:00
Stanislav Bas
581ba55db9 Add Topic/Journal Id completion to InfoCreator 2015-06-19 12:51:50 +03:00
Stanislav Bas
a6734a0ea4 Add Cell Id completion to ReferenceCreator 2015-06-19 11:50:02 +03:00
scrawl
2b53e5d965 Fix for explosion effects playing when the game is paused 2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e Correct moon blending 2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3 Cloud opacity & cross-fading 2015-06-19 01:03:12 +02:00
scrawl
fb94395628 Fix atmosphere lighting 2015-06-18 23:15:13 +02:00
Stanislav Bas
36271f25ec Rework creator factories to accept Document as a parameter 2015-06-18 22:59:40 +03:00
Marc Zinnschlag
d5bc561d17 Merge remote-tracking branch 'smbas/feature-color-picking' 2015-06-18 16:37:49 +02:00
Marc Zinnschlag
88d1f158d0 made double click behaviour in report tables configurable (Fixes #2622) 2015-06-18 16:36:27 +02:00
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
scrawl
04010b8a1a Set OnPcHitMe even for missed hits 2015-06-18 15:00:04 +02:00
scrawl
76799982a5 Add missing include 2015-06-18 14:56:43 +02:00
Stanislav Bas
cf487581f7 Show the pop-up of ColorEditor immediately after the editor creation in tables 2015-06-18 12:50:46 +03:00
Marc Zinnschlag
12e0873446 Merge remote-tracking branch 'smbas/feature-info-tables-sorting' 2015-06-18 10:31:44 +02:00
Marc Zinnschlag
63d46f7e66 removed an unused variable 2015-06-18 10:26:35 +02:00
Marc Zinnschlag
0b32b24d60 Merge remote-tracking branch 'smbas/fix-enumdelegates' 2015-06-18 10:21:27 +02:00
scrawl
fabc5126f3 Include cleanup 2015-06-18 00:30:51 +02:00
Stanislav Bas
c60fed89ac Enable sorting for Info tables 2015-06-17 23:50:18 +03:00
scrawl
0ffa1f964b Fix water ripple height 2015-06-17 22:49:20 +02:00
Stanislav Bas
a6624ca576 Cache topic/journal first rows in InfoTableProxyModel 2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862 Add a custom proxy model for Info tables 2015-06-17 22:47:39 +03:00
scrawl
6e5f3339ad Make sure to play IdleSwim when the character is swimming (Bug #2696) 2015-06-17 20:49:01 +02:00
scrawl
3ebfb4e0d9 Ignore particle systems in getScreenBounds 2015-06-17 18:22:31 +02:00
scrawl
b543308e3e Remove an already resolved todo comment 2015-06-17 18:16:05 +02:00
Marc Zinnschlag
5a5c2bb5bc Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-17 15:56:01 +02:00
scrawl
b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 2015-06-17 15:13:41 +02:00
scrawl
7b35882814 RemoveParticlesVisitor fix 2015-06-17 15:13:17 +02:00
Stanislav Bas
ed09424223 Correct the position of the colored rectangle in ColorEditor and ColorDelegate 2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
scrawl
1c151f2f0a Re-enable some outcommented sky code 2015-06-16 20:56:48 +02:00
Stanislav Bas
1e368de289 Adjust columns of nested tables when a dialog subview is opened 2015-06-16 21:47:27 +03:00
scrawl
3da8f6e62e Water ripples 2015-06-16 20:36:48 +02:00
Stanislav Bas
6cfee630aa Proper size hint for DataDisplayDelegate 2015-06-16 21:25:06 +03:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
b73947033d Rotate sky meshes 2015-06-16 16:33:31 +02:00
Stanislav Bas
2c1ca33a20 Refactor Enum- and DataDisplayDelegate code 2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc Proper size hint for EnumDelegate 2015-06-16 14:18:47 +03:00
Marc Zinnschlag
62c5f185d7 Merge remote-tracking branch 'cc9cii/master' 2015-06-16 12:30:21 +02:00
Marc Zinnschlag
13112c6d04 Merge remote-tracking branch 'scrawl/aiwanderfix' 2015-06-16 12:28:34 +02:00
cc9cii
6a47ea9a67 fix typo 2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1 DataDisplayDelegate doesn't draw a text outside a table cell 2015-06-16 00:19:51 +03:00
scrawl
2d072aab2d Broken bone references from .kf files are no longer a fatal error (Bug #2687) 2015-06-15 22:42:14 +02:00
scrawl
5347d407d8 Disallow AiWander fast-forward for water creatures 
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
 2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3 Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell 2015-06-15 20:04:36 +02:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30 Merge remote-tracking branch 'smbas/feature-soundgen-verifier' 2015-06-15 16:25:11 +02:00
Marc Zinnschlag
8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 2015-06-15 16:22:48 +02:00
scrawl
07937c741a Improve exception handling when starting a new game from the main menu 2015-06-15 16:19:05 +02:00
scrawl
a5b72a358b Prune empty nodes in RemoveDrawableVisitor 
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
 2015-06-14 23:56:35 +02:00
scrawl
f017fd6860 Reduce includes in animation.hpp 2015-06-14 23:13:26 +02:00
scrawl
412e001edb Fix simulation time reset in OpenCS when opening a new view 2015-06-14 19:19:23 +02:00
scrawl
b90fc8ad92 Fix for various Viewer::frame calls resetting the simulationTime 2015-06-14 18:19:53 +02:00
scrawl
9fc2c2e8ee Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677) 2015-06-14 16:32:34 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
scrawl
2476cd4f9a Error message fix 2015-06-14 16:12:18 +02:00
scrawl
195e1a8410 Fix the Viewer's FrameStamp not being set correctly during Engine::frame 2015-06-14 15:28:22 +02:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
Marc Zinnschlag
0994893bc5 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-14 12:05:53 +02:00
cc9cii
c22c9c271d Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
 2015-06-14 14:51:01 +10:00
cc9cii
0efe8f5465 Fix broken launcher build for windows. 2015-06-14 14:42:08 +10:00
dteviot
520fbd63c4 simplified pathfinding code. 
remove mIsPathConstructed.  Instead call !mPath.empty().
 2015-06-14 15:14:02 +12:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f replaced #include with forward class declaration, as suggested by slaugherfish. 2015-06-14 10:30:55 +12:00
scrawl
de98d991b4 Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535." 
Breaks the saving of content= entry order.

This reverts commit 15fe5d88e2.

Conflicts:
	components/config/gamesettings.cpp
 2015-06-13 23:50:12 +02:00
scrawl
b7cd62e4de Revert "Remove user preference setting option." 
This reverts commit d3b7cf44d3.
 2015-06-13 23:49:27 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
Stanislav Bas
281088c93b Add check for an empty sound field to SoundGens verifier 2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c Add SoundGens verifier 2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8 Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656. 2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 2015-06-13 11:33:12 +02:00
cc9cii
b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 2015-06-13 14:37:47 +10:00
Stanislav Bas
a294e24a85 Reset ColorEditor checked state after the popup is hidden 2015-06-13 00:37:10 +03:00
Stanislav Bas
b06d1f008f Redraw the color editor immediately after the color is updated 2015-06-12 23:34:08 +03:00
Stanislav Bas
f19d07b404 Rename ColorPickerDelegate to ColorDelegate 2015-06-12 23:09:31 +03:00
Stanislav Bas
650e37dba1 RegionMap uses proper colors 2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf MapColourColumn::set() uses the correct color value 2015-06-12 22:03:47 +03:00
Stanislav Bas
caeba1b887 Draw the frame around rect in ColorEditor and ColorPickerDelegate 2015-06-12 20:34:35 +03:00
Stanislav Bas
eb5180ba86 Save selected color in a model when picking is finished 2015-06-12 18:33:55 +03:00
scrawl
89c2a7e26b Fix for possibly missing library on windows 2015-06-12 15:22:19 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
Stanislav Bas
4096d2851c Remove outdated ColorEditButton files 2015-06-12 14:09:25 +03:00
scrawl
d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 2015-06-12 04:39:44 +02:00
scrawl
4b5c2398a1 Remove QTextCodec::setCodecForCStrings 
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
 2015-06-12 02:00:06 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
7407bbdac9 Add a function for SDL error handling 2015-06-12 01:08:58 +02:00
scrawl
800bd511f6 Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649) 2015-06-12 00:12:12 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0 Compile fix for old boost versions 2015-06-11 23:25:26 +02:00
scrawl
76bdf7a5b7 Add night-eye effect 2015-06-11 23:16:05 +02:00
Stanislav Bas
e257c915bf Add color picker popup to choose color 2015-06-12 00:00:23 +03:00
scrawl
6051c47eef Fix for incorrect QString -> path conversion 2015-06-11 22:36:19 +02:00
scrawl
712cef36b0 Minor cleanup 2015-06-11 18:01:00 +02:00
scrawl
f81c3bcd6d Fix for broken InitWorldSpaceParticles on projectile effects 2015-06-11 16:40:26 +02:00
scrawl
c94c87d409 Attach effects to the insert node instead of the object root (Bug #2654) 2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c Fix bug with invisibility effect for meshes w/ vertex colors 2015-06-11 16:14:51 +02:00
dteviot
cb8ca2f03a Moved logic for building a Sync'ed path from AiCombat to PathFinding. 
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
 2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c AiTravel logic merged into AiPackage. 2015-06-11 18:28:31 +12:00
Marc Zinnschlag
8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 2015-06-10 18:51:14 +02:00
scrawl
15453e3d90 Use MyGUI::UString for unicode conversion 2015-06-10 16:59:35 +02:00
Stanislav Bas
ef88b28c26 Create a custom item editor for color columns 2015-06-09 15:20:50 +03:00
scrawl
f511cb08ff Compatibility with bullet versions < 2.81 2015-06-08 21:03:04 +02:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
Alexander "Ace" Olofsson
cd42448cd6 Windows build fixes and CMakeLists cleanup 
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
 2015-06-08 15:41:39 +02:00
Marc Zinnschlag
f3e040b531 Merge remote-tracking branch 'cc9cii/filter-fix' 2015-06-08 10:42:16 +02:00
cc9cii
893ad11be1 Fix missing columns in tables. Should resolve Bug #2624. 
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
 2015-06-08 08:04:18 +10:00
scrawl
0330d3d61e Restore the "transparent" loading screen 2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 2015-06-07 19:38:59 +02:00
scrawl
bf02c7f6e4 Sun visibility fix 2015-06-07 19:28:12 +02:00
scrawl
508c57d6e2 addEffect crash fix for objects with no model 2015-06-07 17:09:37 +02:00
scrawl
16e080e252 Fix the physics debug drawer lagging a frame behind 2015-06-07 17:00:00 +02:00
scrawl
b33fe8fb62 Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
Stanislav Bas
c9a8d53240 Merge remote-tracking branch 'upstream/master' 2015-06-07 13:14:50 +03:00
Marc Zinnschlag
211f6a39b8 Merge remote-tracking branch 'cc9cii/keep-comments' 2015-06-07 09:00:37 +02:00
Marc Zinnschlag
d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 2015-06-07 08:52:44 +02:00
cc9cii
d3b7cf44d3 Remove user preference setting option. 2015-06-07 13:29:45 +10:00
scrawl
0a411cbd7c Enable particle lighting 2015-06-07 04:41:55 +02:00
Stanislav Bas
d63b01dde3 Checkboxes in the table view use a combobox editor 2015-06-06 15:41:25 +03:00
cc9cii
15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- controlled via a checkbox in launcher settings
 2015-06-06 20:35:55 +10:00
Stanislav Bas
49512a2b57 Correct the explanation for the Console::acceptCommand() 2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba Add the explanation to Console::acceptCommand() 2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f Reset Console editbox before command execution 2015-06-05 22:00:02 +03:00
cc9cii
5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 2015-06-05 12:19:21 +10:00
scrawl
4c09ecef72 Normalize fixes 2015-06-05 03:41:10 +02:00
scrawl
1fd48e6f81 Fix not being able to move during ashstorm 2015-06-05 03:36:18 +02:00
scrawl
700000cbca Error handling fix 2015-06-05 02:57:50 +02:00
scrawl
403ce30a35 Graceful handling for failing to create SDL window 2015-06-05 02:53:10 +02:00
scrawl
ddfed35d1c Object placement raycasts should use the rendering meshes 2015-06-05 02:26:16 +02:00
Stanislav Bas
c40987338d Scrollbars don't save their positions between openings 2015-06-04 23:09:40 +03:00
scrawl
a0b0ae9bd1 Remove an unused variable 2015-06-04 21:51:24 +02:00
scrawl
958b34771a Fix clang warnings about 'typename' outside of a template 2015-06-04 20:42:05 +02:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
e23775e338 Fix -Woverloaded-virtual clang warnings 2015-06-04 20:31:28 +02:00
scrawl
141e9d36a4 Get rid of unused DialogueManager::mScriptVerbose 2015-06-04 20:12:39 +02:00
scrawl
78ac37b52a Remove BOOST_STATIC_ASSERT to fix clang warnings 2015-06-04 20:11:40 +02:00
scrawl
93656aa6cf Add a header missing from CMakeLists 2015-06-04 20:10:07 +02:00
scrawl
869f8a329a Cloud scrolling fix 2015-06-04 20:08:44 +02:00
scrawl
ce0d93caed Fix for "GlobalMap trying to erase an inactive camera" spam in main menu 2015-06-04 16:32:21 +02:00
scrawl
91eea1258c doc.hpp fix 2015-06-04 01:30:16 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
364b785e8f ESSImporter image conversions port to osg::Image 2015-06-03 21:36:46 +02:00
scrawl
2eec0caca0 Remove dependency on Ogre::StringConverter 2015-06-03 19:59:54 +02:00
scrawl
cc6d5a3ba0 Fix player setup bug 2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
0cc9b1bb40 Remove dependency on OgrePlatform.h 2015-06-03 18:49:52 +02:00
scrawl
1ba3fa4169 Remove leftovers of the old OpenCS navigation 2015-06-03 18:11:34 +02:00
scrawl
e642f20a65 Restore screenshot key functionality 2015-06-03 17:25:18 +02:00
scrawl
2a85a22dba Write savegame screenshot 2015-06-03 16:40:16 +02:00
scrawl
24551c7bab Fix for savegame incompatibility with master branch 2015-06-03 14:56:57 +02:00
Stanislav Bas
bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
scrawl
41cce5240f Delete remaining files that won't be of any use 2015-06-03 03:29:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3 Unify raycasting techniques for "on touch" magic 
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
 2015-06-03 03:16:26 +02:00
scrawl
cee1db532f Improve area orb positioning for "on touch" spells 2015-06-03 03:04:39 +02:00
scrawl
cd47dff196 Minor cleanup 2015-06-03 03:03:16 +02:00
scrawl
2883ecc19a Fix the hilarious bug of NPCs falling to their deaths in interiors 2015-06-03 02:48:45 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
Stanislav Bas
4e759370de Change Display_String to the proper display type where appropriate 2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500 CommandDelegate: extract a display type from a model if it isn't specified 2015-06-03 00:00:39 +03:00
scrawl
58ebf57154 Apply a comment that got lost in the endless depths of my git stash 2015-06-02 17:13:30 +02:00
scrawl
8c50f8ed26 Fix for lights with no mesh 2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
scrawl
adc8e0b93e Merge branch 'smbas-master' 2015-06-02 14:35:45 +02:00
Stanislav Bas
2c4025ec72 Rename the method isCompleterExistFor() to hasCompleterFor() 2015-06-02 00:26:31 +03:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
c85764b654 Wireframe mode 2015-06-01 17:02:44 +02:00
Marc Zinnschlag
b866e11873 Merge remote-tracking branch 'cc9cii/pathgrid-check-extra' 2015-06-01 16:49:28 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
987918ca15 NpcAnimation::setAlpha 2015-06-01 16:18:57 +02:00
scrawl
bed31996c9 Camera raycast 2015-06-01 15:34:46 +02:00
scrawl
2869424847 Fix first person camera for beast races 2015-06-01 04:41:03 +02:00
scrawl
f88079fddd Restore the isOnGround hack 2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
8e0a988289 Icon fix 2015-06-01 01:32:02 +02:00
scrawl
e306853570 Fix chargen crash 2015-06-01 00:50:55 +02:00
scrawl
84fd682e4e Fix for unnecessary exceptions when opening sounds 
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
 2015-06-01 00:41:44 +02:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
scrawl
5b846ebc71 Camera precision fix 2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
Stanislav Bas
dbe61115b2 Fix the mistyping header guard in the idcompletiondelegate.hpp 2015-05-31 18:22:43 +03:00
Stanislav Bas
e636101725 Add missing new lines at the ends of files 2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
60f55997fd Rotate first person meshes, sneak camera offset in first person 2015-05-31 02:26:58 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29 Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes 2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91 Add ColumnId role to the IdTree data methods 2015-05-30 21:30:25 +03:00
Stanislav Bas
5e8718d8b2 Add the ID completion delegate factory to the delegate factory collection 2015-05-30 18:37:13 +03:00
scrawl
7f2dd21c66 Fix for StartScript regression (Fixes #2590) 2015-05-30 17:20:49 +02:00
Stanislav Bas
33e36ee922 Add the ID completion delegate 2015-05-30 15:51:33 +03:00
Stanislav Bas
19cc6b83e5 Integrate the Id completion manager into the Document class 2015-05-30 15:40:23 +03:00
Stanislav Bas
87a1f9f9aa Add ID completion manager 2015-05-30 15:31:44 +03:00
cc9cii
c4aa3d3ee3 Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained. 2015-05-30 21:12:47 +10:00
Marc Zinnschlag
88d5aed62d removed code that interfered with the default window size on Linux (Fixes #2568) 2015-05-30 12:05:35 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
cc9cii
01eba7b721 Extra check for thread affinity. 2015-05-30 19:17:42 +10:00
cc9cii
76196d815d Update user preference setting value via an event message queue. 2015-05-30 18:58:33 +10:00
Marc Zinnschlag
17747a2dd9 Merge remote-tracking branch 'cc9cii/highlight-colours' 2015-05-30 10:23:27 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
cc3bfe2bb2 Restore collision tracker 2015-05-30 01:32:00 +02:00
scrawl
b2fe21dd3b Minor cleanup 2015-05-30 01:11:00 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
cc9cii
0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 2015-05-30 08:37:58 +10:00
scrawl
5c7ecb9c1d string::compare exception fix 2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
cc9cii
9cbda0ffad Allow users to select syntax highlighting colours. Should resolve Feature #2507. 2015-05-29 22:20:43 +10:00
cc9cii
393cee406f Use signals for user preference setting updates. 2015-05-29 19:28:25 +10:00
cc9cii
ce421b230b Move scrollbar to newly opened subview. Should resolve Bug #2576. 2015-05-29 14:07:41 +10:00
scrawl
7e715decd3 Color fix 2015-05-29 02:26:58 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02:00
cc9cii
734e52d1c8 Move the user preference check to the preparation step before the running of the operation. 2015-05-29 06:40:40 +10:00
cc9cii
9ad69d9085 Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585. 2015-05-29 05:44:35 +10:00
cc9cii
6821cb4133 Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586. 
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
 2015-05-29 05:40:20 +10:00
scrawl
7a1408cfed Restore display of global map overlay, no exploration yet 2015-05-28 18:49:24 +02:00
scrawl
72d0a69132 Fix global map markers not being cleared on a new game 2015-05-28 18:44:34 +02:00
scrawl
9ee63dc3f4 Change stats viewer key to f3 2015-05-28 16:28:48 +02:00
scrawl
5f7a82e0da Fog of war fix 2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe Port fog of war 
Not optimized yet, need to work on fog texture's DataVariance.
 2015-05-28 03:50:49 +02:00
scrawl
5628a2b823 Camera zoom fix 2015-05-28 03:47:53 +02:00
scrawl
8b3054aa8b Fix for player collision cleanup issue 2015-05-28 02:45:38 +02:00
scrawl
6555ee8d80 Minor include cleanup 2015-05-28 02:37:35 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
cc9cii
00c165d3a5 Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx. 2015-05-28 08:44:17 +10:00
scrawl
1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld 
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
 2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff Bullet include cleanup 2015-05-27 22:32:11 +02:00
Marc Zinnschlag
b6878c2e0c improved error handling in LocalScripts::add 2015-05-27 19:45:26 +02:00
Marc Zinnschlag
baaf801521 Merge remote-tracking branch 'cc9cii/loadcell-fix' 2015-05-27 19:31:25 +02:00
cc9cii
674a124bc6 Don't use local type as a template parameter. 2015-05-27 22:27:32 +10:00
cc9cii
3a31468af0 Pathgrid record verifier. Feature #2000. 2015-05-27 22:12:11 +10:00
cc9cii
6966555377 Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582. 2015-05-27 15:55:00 +10:00
cc9cii
b7044ac119 Fix crash loading some addon files. Should resolve Bug #2583. 
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
 2015-05-27 10:27:57 +10:00
scrawl
2f97649540 Fix for cleanup issue when exiting after a failed savegame load (Fixes #2580) 2015-05-27 00:30:39 +02:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
099f93f00d Sky fixes 2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73 Map rotation fix 2015-05-26 18:10:31 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
Marc Zinnschlag
99dbd82a44 Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash' 2015-05-26 14:37:50 +02:00
Marc Zinnschlag
ae1a606876 Merge remote-tracking branch 'cc9cii/selective-refresh' 2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4 Return the correct range for a given topic. Should resolve Bug #2569. 2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5 Qualify the scope of Flag_Dialogue. (another one) 2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077 Qualify the scope of Flag_Dialogue. 2015-05-26 13:58:58 +10:00
cc9cii
ec808843c3 Do not rebuild the dialogue subview unless required. Should resolve Bug #2581. 
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview.  Changes in this commit include:

- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
 2015-05-26 13:35:10 +10:00
cc9cii
95f740ec40 Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578. 2015-05-25 22:28:41 +10:00
Marc Zinnschlag
5f41ef4809 Merge remote-tracking branch 'cc9cii/master' 2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034 Retrieve the correct index for the type of record being un-deleted. 2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78 Refresh table filters when the model is updated. Should resolve Bug #2579. 2015-05-25 09:15:07 +10:00
Marc Zinnschlag
6402b82823 Merge remote-tracking branch 'cc9cii/master' 2015-05-24 21:15:36 +02:00
Marc Zinnschlag
07ce7b95cf Merge remote-tracking branch 'cc9cii/npc-additional-data' 2015-05-24 21:15:26 +02:00
cc9cii
22420c3a83 Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575. 
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
 2015-05-24 23:19:06 +10:00
cc9cii
c721e340d8 Merge branch 'master' into npc-additional-data 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-05-24 19:24:27 +10:00
cc9cii
21af1913e1 Ensure ColumnId names are unique. 2015-05-24 19:18:54 +10:00