Marc Zinnschlag
|
6c5dc5c7a0
|
Merge remote-tracking branch 'smbas/fix-cell-creating'
|
2015-07-05 20:43:59 +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 |
|
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 |
|
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
|
631cec7304
|
Take the radius of lights into account when sorting
|
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 |
|
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
|
43f9c7f295
|
Skip the Update traversal for inactive skeletons
|
2015-06-30 03:25:30 +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
|
bbf4927a10
|
Disable OSX travis for now, needs to be updated with an OSG package
|
2015-06-28 16:38:11 +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 |
|