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

10871 commits

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