teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
14429 commits 34 branches 0 tags 66 MiB
Commit graph

10941 commits

Author SHA1 Message Date
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
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
scrawl
531bca1273 Add a threshold for changing aicombat targets (Fixes #2755) 2015-07-05 18:09:13 +02: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
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
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
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
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
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