scrawl
244db5cbfe
Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33
2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1
fix for implicit references
2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b
dagoth fix
2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09
setDynamic workaround for broken endgame scripts ( Fixes #2016 )
2014-10-15 15:00:45 +02:00
Marc Zinnschlag
720ba2c0d8
split off settings label from internal settings name
2014-10-15 13:39:53 +02:00
Marc Zinnschlag
daf7cab416
refactored section handling
2014-10-15 12:38:17 +02:00
Marc Zinnschlag
219fbd427f
unclutter user settings declarations
2014-10-15 12:13:22 +02:00
Marc Zinnschlag
868fdfba51
reclaiming some unused space
2014-10-15 11:07:40 +02:00
Marc Zinnschlag
e20fa209cc
user settings UI layout improvements
2014-10-15 11:02:41 +02:00
cc9cii
aff6f6fdb2
Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.
2014-10-15 18:48:01 +11:00
cc9cii
1d0ac3b4df
Delete Ogre::OverlaySystem before Ogre::Root
2014-10-15 07:02:19 +11:00
Alexander "Ace" Olofsson
dc788512e2
Fix LNK2019 link error on Visual Studio 2010 builds
...
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
2014-10-14 16:10:19 +02:00
cc9cii
8cebfc411b
Minor visual improvements.
2014-10-14 17:34:10 +11:00
cc9cii
994420aa57
Singleton wrapper for Ogre OverlaySystem.
2014-10-14 13:21:43 +11:00
cc9cii
57b337d368
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
2014-10-14 11:43:56 +11:00
Marc Zinnschlag
6beee95151
Merge remote-tracking branch 'terrorfisch/aistate'
2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d
Merge remote-tracking branch 'internecine/master'
2014-10-13 19:11:14 +02:00
Marc Zinnschlag
e23a32c44f
some cleanup
2014-10-13 15:26:47 +02:00
Marc Zinnschlag
8062faa51a
fixed member variable access in OpenCS script compiler ( Fixes #2011 )
2014-10-13 15:25:27 +02:00
Marc Zinnschlag
02acf60c0b
added tooltips for scopes in creator bar
2014-10-13 14:24:27 +02:00
cc9cii
961867e39f
Hide overlay if off screen.
2014-10-13 20:58:07 +11:00
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-10-13 20:45:30 +11:00
Marc Zinnschlag
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277
Merge remote-tracking branch 'miroslavr/master'
2014-10-13 10:57:04 +02:00
cc9cii
43838ccf01
Remove override (c++11)
2014-10-13 16:42:50 +11:00
cc9cii
e58e5c2bf5
Update overlays independently from multiple viewports.
2014-10-13 15:57:01 +11:00
Thoronador
46496a35a1
fix uninitialized pointer variable in CSVDoc::SubView class
2014-10-12 23:42:44 +02:00
Thoronador
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
cc9cii
47c5bc9a19
Set bounding box on manual objects rather than creating meshes.
2014-10-13 07:42:43 +11:00
MiroslavR
8456741eaa
Fix blindness and create a separate fader for it
2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec
Don't remove player's sounds when unloading a cell
2014-10-12 18:35:15 +02:00
scrawl
d51daf5875
Fix AI not using F_Always spells, for example "vampire touch"
2014-10-12 17:18:27 +02:00
scrawl
9323f96211
Move terrainstorage to opencs_units_noqt
2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed
Make spells cast by scripts always succeed ( Fixes #1993 )
2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae
Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
...
Conflicts:
apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930
Fixes #1887 : Equipped items do not emit sounds
...
Corrected wrong return type of Class::getSound() method.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +02:00
cc9cii
758ce0ed98
Various fixes as per feedback comments.
2014-10-12 21:15:50 +11:00
Lukasz Gromanowski
e1663de7cf
Fixes #1887 : Equipped items do not emit sounds
...
Added getSound() method to MWClass class and implementation
into Light class.
Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
MiroslavR
ad253059b1
Hit indicator for absorb/damage health effect
2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e
Construct hit fader with correct texture right away to prevent mygui warning
2014-10-12 00:40:31 +02:00
MiroslavR
a5e972aeb5
Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode
2014-10-12 00:13:24 +02:00
Lukasz Gromanowski
b44ba84a80
Issue #1887 : Equipped items do not emit sounds
...
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 23:20:40 +02:00
MiroslavR
2162a9e1b9
Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available
2014-10-11 23:09:20 +02:00
Lukasz Gromanowski
1a0c3dc6cf
Issue #1887 : Equipped items do not emit sounds
...
Removed unused mUnequipping and mFirstEquip member variables.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c
Issue #1887 : Equipped items do not emit sounds
...
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:21:59 +02:00
MiroslavR
0ae604990e
Implement continuous damage indication ( Fixes #1970 )
2014-10-11 22:21:48 +02:00
MiroslavR
4dc613a04b
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a
Issue #1887 : Equipped items do not emit sounds
...
Played sound items are based on parts not inserted items.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 21:05:12 +02:00
cc9cii
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 05:54:21 +11:00
Marc Zinnschlag
3fd10d2a82
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498
remove unused var. mSoftwareCursor in WindowManager
2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce
Fix: initialize boolean field with boolean value, not NULL
2014-10-11 10:07:01 +04:00
Thoronador
8361019456
fix uninitialized (pointer) vars in more classes
2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c
fix uninitialized member variables in OcclusionQuery class
2014-10-11 01:35:12 +02:00
Thoronador
db38108801
fix uninitialized pointer variables in some classes
2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13
remove unused dummy variable
2014-10-11 00:56:57 +02:00
Thoronador
ab364c9440
fix some more uninitialized class member fields
2014-10-11 00:50:32 +02:00
Thoronador
51cd2bb5d9
remove unused/double variable from CSMWorld::Column class
2014-10-11 00:15:36 +02:00
Thoronador
a799353f60
fix uninitialized fields in CSMDoc::Operation class
2014-10-11 00:06:50 +02:00
Thoronador
deb6452e0d
fix uninitialized pointer fields in CS::Editor class
2014-10-10 23:57:10 +02:00
terrorfisch
c4badcea6e
removed warning
2014-10-10 23:51:29 +02:00
Thoronador
f0d3fc73d5
fix uninitialized pointer fields in GraphicsPage class
2014-10-10 23:47:27 +02:00
terrorfisch
c28dfc2fa4
Travis CI fix?
2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467
references now initialized when they are needed
2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601
-improved trigonometric precision
...
-cleanup
2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c
- changed namespace
2014-10-10 23:28:49 +02:00
Marc Zinnschlag
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
Marc Zinnschlag
23e969eae7
fixed pathgrid saving again (previous fix was incomplete)
2014-10-10 15:29:21 +02:00
Internecine
470d375177
Removed duplicate functions and moved pause check in weather.cpp
2014-10-10 23:29:51 +13:00
cc9cii
3e5027abbb
Incorporate terrain height to labels and camera.
2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0
User configuration manager's resource directory.
2014-10-10 13:35:14 +11:00
cc9cii
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
2014-10-09 23:47:30 +01:00
terrorfisch
db1b93498d
Added comment.
2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
Marc Zinnschlag
c85735abed
Merge remote-tracking branch 'scrawl/terrain'
2014-10-09 12:56:42 +02:00
Internecine
782e851eb1
Better fix, now allows for teleporting to change weather while still paused.
2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96
removed unecessary PathFinders
2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8
Updated AiCombat:
...
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00
Addded the parts of AiWander that I fully understand to the temporary storage.
...
The rest should be done by someone who has a clearer overview over the class.
2014-10-08 22:11:45 +02:00
cc9cii
13f028e27b
Avoid out of range exceptions.
2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2
Different implementation of update overlay fix.
2014-10-09 05:56:44 +11:00
scrawl
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5
Update overlay upon control elements button signal.
2014-10-08 21:22:12 +11:00
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
cc9cii
e2560de05a
Don't use windows path separator.
2014-10-08 08:08:03 +11:00
cc9cii
4fd7537155
Use default sort until a more generic sort that uses numeric order can be implemented.
2014-10-08 07:59:21 +11:00
cc9cii
e1197e75bc
Handle change of names or regions to dynamically update the overlay.
2014-10-08 07:54:22 +11:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a
Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'
2014-10-07 18:03:25 +02:00
cc9cii
7836ee9ab6
Fixed crash exiting internal cells. Better starting camera position for external cells.
2014-10-07 21:18:32 +11:00
cc9cii
a161ad3cd5
Sort cell id column by numerical order.
2014-10-07 20:11:44 +11:00
cc9cii
0cccdfd114
Added description below the cell id (name if exists, or region)
2014-10-07 19:35:28 +11:00
Jordan Ayers
56db525a93
Document the return value of getEffectMultiplier.
2014-10-06 21:56:41 -05:00
cc9cii
7640875f9d
More cleanup.
2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31
Add full path for Ogre Overlay headers (workaround for osx).
2014-10-07 06:40:28 +11:00
cc9cii
0197f7088f
Remove extra frame rendering after enabling/disabling the label.
2014-10-07 06:04:13 +11:00
MiroslavR
d1dc9951d4
Do not display werewolf overlay in third person
2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb
Silence werewolves' footstep sounds when they are running with their claws sheathed
2014-10-06 18:48:22 +02:00
MiroslavR
4086bc4848
Do not spawn blood vfx on player if hit fader is enabled
2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145
Do not display hit fader if the player wasn't damaged
2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-06 18:24:41 +02:00
scrawl
8097d9801d
Fix HasSoulgem function to return number of soulgems
2014-10-06 14:56:49 +02:00
scrawl
9ab8d0a8e6
Hotfix for crash when deleting an actor
2014-10-06 14:56:49 +02:00
cc9cii
b3e09cce00
Remove mouse picking code.
2014-10-06 22:29:45 +11:00
cc9cii
972c789060
Add Ogre Overlay path to cmake.
2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e
Removed temporary key bindings.
2014-10-06 14:21:44 +11:00
Internecine
3dee4c2b0e
Fixes #1706
2014-10-06 16:10:58 +13:00
cc9cii
6d687993b8
Remove C++11 stuff.
2014-10-06 14:08:35 +11:00
cc9cii
e38417e662
Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
...
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.
2014-10-06 13:55:36 +11:00
Jordan Ayers
aac2de270e
Cleanup: Don't call <environment obj>.get().
...
mEnvironment.get() is redundant. Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61
Fix typo in comments.
2014-10-05 18:12:33 -05:00
cc9cii
dbb2781817
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
2014-10-06 08:20:09 +11:00
scrawl
9cce3bc31b
Implement fDispositionMod according to research wiki
2014-10-05 23:03:30 +02:00
scrawl
39bc11681e
Fix broken onGround status when levitating
2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b
Fix being able to rest while water-walking ( Fixes #1712 )
2014-10-05 22:35:53 +02:00
scrawl
d9165593d9
Fix footstep sounds played during water-walking
2014-10-05 22:27:25 +02:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4
Fix a typo in condition
2014-10-05 19:53:36 +02:00
scrawl
04614651fa
Fix recharging items not being updated for actor's initial inventory
2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
d790506525
Fix projectiles colliding with dead actors ( Fixes #1971 )
2014-10-05 17:41:56 +02:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb
Fix not being able to move with 0/0 encumbrance ( Fixes #1979 )
2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96
Teleport indirect followers as well when using a door ( Fixes #1974 )
2014-10-05 15:18:32 +02:00
Marc Zinnschlag
2d3ffc4483
fixed pathgrid saving
2014-10-05 15:12:12 +02:00
scrawl
ff11745429
Fix magic projectile sound disappearing after multiple save/load cycles
2014-10-05 14:47:23 +02:00
cc9cii
85d93807c5
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
2014-10-05 19:25:37 +11:00
Jordan Ayers
663647bee8
Simplify getEffectMultiplier.
...
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba
Issue #1887 : Equipped items do not emit sounds
...
Added handling of autoEquip and unequipAll cases.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
20777c1b2e
Optimize physics shape scaling on cell load
2014-10-04 20:37:35 +02:00
scrawl
db6b04d127
Use the footstep volume slider for jump landing sounds ( Fixes #1968 )
2014-10-04 19:50:38 +02:00
scrawl
95378aa6ac
Fix crash when a magic projectile has no sound defined ( Fixes #1967 )
2014-10-04 18:37:35 +02:00
Lukasz Gromanowski
e566e4abf2
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
Marc Zinnschlag
be3b229a5f
fixed pathgrid loading
2014-10-04 15:36:52 +02:00
Lukasz Gromanowski
6a89b67cb1
Revert "Issue #1887 : Equipped items do not emit sounds"
...
This reverts commit 566211e753
2014-10-04 13:34:36 +02:00
Marc Zinnschlag
cd7cc4bec9
Merge remote-tracking branch 'miroslavr/master'
2014-10-04 09:46:29 +02:00
Lukasz Gromanowski
566211e753
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-03 22:39:05 +02:00
MiroslavR
95be7ea738
Revert spelling change to preserve consistency, fix a typo
2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc
Support "right" alignment in books
2014-10-03 22:30:46 +02:00
cc9cii
c9e054cdd7
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9
2014-10-04 06:20:10 +10:00
cc9cii
3aea1bf5f9
CMake changes for using Ogre Overlay.
2014-10-04 05:48:56 +10:00
MiroslavR
a13039ad1f
Allow alignment for images in books
2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef
Fix line breaks around IMG tags.
2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-03 21:02:15 +02:00
scrawl
cecc64752e
Increase maximum height for finding spawn points ( Fixes #1633 , Fixes #1881 )
2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57
Use a raycast to find spawn point if convexSweepTest doesn't find one ( Fixes #1623 , Fixes #1679 )
2014-10-03 18:49:41 +02:00
scrawl
6fc53e73ad
Don't run AI for knocked-out actors ( Fixes #1854 )
2014-10-03 15:58:14 +02:00
Marc Zinnschlag
9fd82212b3
Merge remote-tracking branch 'cc9cii/opencs-settings'
2014-10-03 13:11:05 +02:00
scrawl
81a9dc0655
Hotfix for not being able to scroll the world map
2014-10-02 22:44:06 +02:00
cc9cii
115841d31d
Do not save window size on exit.
2014-10-03 05:59:24 +10:00
scrawl
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
2014-10-02 19:26:37 +02:00
scrawl
8dc20712de
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12
Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'
2014-10-02 17:19:32 +02:00
Marc Zinnschlag
f64964d5dd
Merge remote-tracking branch 'scrawl/master'
2014-10-02 17:04:10 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd
Merge branch 'master' into tables
2014-10-02 15:49:36 +02:00
Marc Zinnschlag
00073694c6
added pathgrid subview
2014-10-02 15:16:19 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
afbd2de511
Fix broken alchemy magnitude/duration
2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67
Remove comment for old MyGUI version
2014-10-02 13:55:42 +02:00
Marc Zinnschlag
d64127106b
load and save pathgrid records
2014-10-02 12:30:15 +02:00
Marc Zinnschlag
ce52735df6
Merge remote-tracking branch 'cc9cii/Bug-No-1750'
2014-10-02 08:43:59 +02:00
Jordan Ayers
3bc91c66e6
Disease Check: Shorten the resistance calculations.
2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85
Disease check: Reuse corprus check from spells.hpp.
2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9
Don't update physics and animation for actors outside the AI processing distance
2014-10-02 00:27:04 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
cc9cii
517a797a3e
Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.
2014-10-02 07:00:15 +10:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
cc9cii
5ffb740120
Fix silly mistake (thanks scrawl for picking that up)
2014-10-01 07:19:15 +10:00
scrawl
ee8b85aa2c
Fix priority bug in AiSequence::stack ( Fixes #1959 )
2014-09-30 22:57:38 +02:00
scrawl
795dfdb557
Fix size_t underflow for journals with 1 page ( Fixes #1958 )
2014-09-30 18:14:25 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
Marc Zinnschlag
850a40d4e2
fixed resources table drag source problem
2014-09-30 13:15:15 +02:00
cc9cii
a9745cce1e
Suppress some compiler warnings.
2014-09-30 21:02:31 +10:00
Marc Zinnschlag
ff530a2e19
added missing magic effect table columns
2014-09-30 12:33:48 +02:00
cc9cii
dee090355f
Changes to compile on Ubuntu 14.04.
2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3
Revert some changes (mostly iostream adds)
2014-09-30 18:46:26 +10:00
Jordan Ayers
da9d858201
Add 'const' to a spell helper function.
2014-09-29 20:59:10 -05:00
cc9cii
312b7cd571
Merge branch 'master' into QtOGre
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
3e153d0a9b
Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2
2014-09-29 22:30:21 +02:00
scrawl
b345c50a86
Run stepSimulation before moving actors
...
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d
Forgot const
2014-09-29 12:04:19 +02:00
cc9cii
7675df60ba
Fix far clip distance (again), workaround for broken settings minimum value.
2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875
Silence clang warnings.
2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763
Apply camera setting changes immediately. Remove current value check for shader setting changes.
2014-09-29 06:27:54 +10:00
scrawl
bdab3fa321
Bullet optimization: Don't update AABBs of static objects every frame
2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85
Disable topics list visually when in a choice
2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9
Attempt to fix Clang warnings
2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
2014-09-28 12:18:46 +02:00
cc9cii
6e8977348a
Check the FSAA setting of windows rather than system value.
2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6
Update scenewidget when antialiasing settings change.
2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22
Update SceneWidget when relevant user settings change.
2014-09-28 14:08:14 +10:00
cc9cii
9902e08773
Apply sh::Factory settings immediately.
2014-09-28 11:05:27 +10:00
cc9cii
a25cffc242
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
2014-09-28 10:17:54 +10:00
scrawl
02dec787fd
Cache GMSTs in getDerivedDisposition
2014-09-27 22:44:20 +02:00
scrawl
ea956b537c
Don't search for fFatigueReturnBase and fFatigueReturnMult every frame
2014-09-27 22:37:53 +02:00
MiroslavR
508113f271
Resolve merge conflict
2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5
Book formatter: Fix an excessive line break case
2014-09-27 17:35:57 +02:00
cc9cii
d790b8edfa
Revert old fix.
2014-09-27 23:39:22 +10:00
cc9cii
a2d043f43a
Re-check unknown record id after loading.
2014-09-27 23:36:27 +10:00
MiroslavR
cb5f661596
Book formatter: Support FONT closing tag, minor code cleanup
2014-09-27 13:31:59 +02:00
Marc Zinnschlag
e47f9c7268
added first batch of magic effect columns (re-using existing columns)
2014-09-27 12:51:46 +02:00
Marc Zinnschlag
aa89370db6
make sure magic effects added by expansions are available
2014-09-27 12:38:42 +02:00
Marc Zinnschlag
25a1112627
add magic effect records for newly created games
2014-09-27 12:26:25 +02:00
cc9cii
810ba61909
While loading overwrite records with the same id. Should resolve bug #1750 .
2014-09-27 17:46:48 +10:00
scrawl
e868a48a63
Don't trigger OnPcHitMe for friendly hits ( Fixes #1950 )
...
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
18be152ab1
Allow dragging map even when a marker is hovered
2014-09-26 14:27:52 +02:00
scrawl
603e558fb7
Fix broken getCollidingPc / getCollidingActor (cppcheck)
2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
2014-09-26 13:40:10 +02:00
Marc Zinnschlag
23fd314294
added magic effects table
2014-09-26 13:12:17 +02:00
Marc Zinnschlag
c321f2c252
load and save magic effect records
2014-09-26 13:05:51 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
cc9cii
8e71f092c5
Comment out setMinimum which is broken.
2014-09-26 12:36:55 +10:00
cc9cii
a1c0ec2feb
Repair collateral damage from a purging session gone out of control.
2014-09-26 11:26:33 +10:00
cc9cii
111a35bc38
More strip back.
2014-09-26 07:16:34 +10:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
f56711f443
Fix crash caused by teleportation spells ( Fixes #1904 )
2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208
Revert "AiFollow: return from execute() if target is not player"
...
This reverts commit 061c7813f6Fixes #1898 .
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59
Don't report crime for attacking an NPC that is already in combat with another NPC ( Fixes #1908 , Fixes #1821 )
2014-09-25 17:33:26 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
scrawl
2066097202
Fix incorrect reading of global map state in some cases when the map size changed ( Fixes #1946 )
2014-09-25 15:28:02 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
Marc Zinnschlag
33cd04b37d
added missing sound gen table columns
2014-09-25 11:40:45 +02:00
cc9cii
d5c8ff7d73
More removal.
2014-09-25 18:15:34 +10:00
cc9cii
127f9bb30d
Fix reverting to wrong version.
2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1
Sanitised version. Some settings are only accessible via manually editing the config file.
2014-09-25 08:15:07 +10:00
scrawl
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
2014-09-25 00:04:38 +02:00
scrawl
62ab35881e
Don't advance skills in werewolf mode (thanks Hrnchamd)
2014-09-25 00:03:55 +02:00
scrawl
088d01d727
Minor cleanup
2014-09-24 23:50:28 +02:00
cc9cii
31fb160376
More cleanup.
2014-09-25 06:59:04 +10:00
cc9cii
66852d5392
Code cleanup and revert incorrect settings.
2014-09-24 22:41:49 +10:00
scrawl
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78
Add missing World cleanup for mLevitationEnabled
2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
2014-09-24 12:21:19 +02:00
scrawl
45b4304237
Store levitation/teleport enabled state in savegames ( Fixes #1923 )
2014-09-24 12:21:19 +02:00
cc9cii
fdf375fb4d
Reusing subviews implemented.
2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b
Minor fixes and workarounds.
2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
2014-09-23 22:33:49 +10:00
Marc Zinnschlag
175d4f3d44
Merge remote-tracking branch 'ragora/playdeathlevelupmusic'
2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
2014-09-23 13:23:00 +02:00
Marc Zinnschlag
7ab4881661
added sound gen table
2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5
Tweak the look of the recordfilterbox. Keep titlebar if floating.
2014-09-23 20:51:14 +10:00
Marc Zinnschlag
02247fe712
load and save sound gen records
2014-09-23 12:20:02 +02:00
Ragora
06e683d378
Added code to play music on level up and on death
2014-09-23 04:58:19 -04:00
cc9cii
ffae816aab
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
2014-09-23 17:01:08 +10:00
cc9cii
62406d5322
Use reasonable values for the spinbox.
2014-09-23 07:28:55 +10:00
MiroslavR
22c71cec18
Check for text size
2014-09-22 23:17:44 +02:00
cc9cii
437fb774c5
Re-implemented subview minimum size setting.
2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
2014-09-23 06:30:41 +10:00
MiroslavR
608e1518a5
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce
Book formatter: Do not insert last page if it's empty, code cleanup
2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba
Book parser: Fix comparison between signed and unsigned integer expressions
2014-09-22 16:28:17 +02:00
cc9cii
c4f11785ec
Added a window size change easter egg.
2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d
Fixed checkboxes saving invalid values.
2014-09-22 18:50:48 +10:00
Marc Zinnschlag
aa7fc8ee47
fix for potential script problem during saved game loading
2014-09-22 10:12:07 +02:00
Marc Zinnschlag
5c8ef842b6
Merge branch 'edit'
2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e
minor fix
2014-09-22 09:53:07 +02:00
cc9cii
fc8d6da6a2
Added more shader settings.
2014-09-22 16:24:06 +10:00
cc9cii
71a3880884
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192
Fixed checkbox behaviour. Added some shader settings.
2014-09-22 07:50:35 +10:00
MiroslavR
51cd2678ae
Book formatter: Fix last block of text not displaying
2014-09-21 22:25:54 +02:00
Lukasz Gromanowski
c72369fafe
Simplified casting when comparing to AV_NOPTS_VALUE.
...
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 20:11:03 +02:00
MiroslavR
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
7ad6a94523
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:13:54 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
cc9cii
17a74da650
Cleaned up comments and dead code.
2014-09-21 21:10:18 +10:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
cc9cii
dbd1ab05d3
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
2014-09-21 20:55:52 +10:00
Marc Zinnschlag
e4b6f135b6
catch exceptions from adding local scripts
2014-09-21 12:43:19 +02:00
Marc Zinnschlag
89beecad8c
Merge remote-tracking branch 'scrawl/master'
2014-09-21 12:24:53 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
Lukasz Gromanowski
6987dd768a
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 09:52:31 +02:00
scrawl
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
Marc Zinnschlag
cf5c5cbce7
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
2014-09-20 14:13:42 +02:00
Marc Zinnschlag
9d316a8745
Merge branch 'records'
2014-09-20 13:59:45 +02:00
scrawl
023d7072f9
Don't play battle music for enemies out of AI processing range
2014-09-20 13:55:57 +02:00
scrawl
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
2014-09-20 13:50:23 +02:00
Marc Zinnschlag
8499ceb35d
set default value for topic when cloning info records
2014-09-20 13:30:36 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
Marc Zinnschlag
8ce87803c4
set default value for cell when cloning references
2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
2014-09-20 12:37:25 +02:00
Nikolay Kasyanov
9f7a8462d8
Fix build & OpenCS game runner code on OS X
2014-09-20 13:42:11 +04:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
Marc Zinnschlag
7733df239e
made CloneCommand a subclass of CreateCommand
2014-09-20 10:36:43 +02:00
scrawl
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2
Remove redundant includes
2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d
Merge remote-tracking branch 'scrawl/fontcolors'
2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
ab9d9c7001
Add magic effect flags from ESM files to esmtool
2014-09-19 08:09:40 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
cc9cii
5dfcd2ed01
Removed standard window size combobox. Rearranged widgets.
2014-09-19 08:29:06 +10:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
cc9cii
52354b14fc
Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.
2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f
fixed reference creator error handling
2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea
set refnum and increment refnum counter when creating a new reference
2014-09-18 12:25:17 +02:00
Marc Zinnschlag
33243c8c16
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
2014-09-18 11:37:23 +02:00
Marc Zinnschlag
144f6ca79a
Merge remote-tracking branch 'scrawl/master'
2014-09-18 09:22:33 +02:00
cc9cii
575780ec0d
Display format settings working.
2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299
Show status bar setting working (feature #854 ). Turns out signals were not needed, may need to clean up later.
2014-09-18 16:05:32 +10:00
Stanislav
313bdf4e78
fix
2014-09-18 10:25:33 +06:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
c19f89976e
Add missing Hit voice dialogue for friendly hits
2014-09-18 05:13:17 +02:00
scrawl
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
2014-09-18 04:26:12 +02:00
cc9cii
86636bd960
Mouse events to disabled objects implemented via a signal filter.
2014-09-18 12:23:41 +10:00
scrawl
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
2014-09-18 04:10:17 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
cc9cii
62d2811285
Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.
2014-09-18 07:52:54 +10:00
scrawl
09042ba6d9
Use object name instead of ID when available for tooltips
2014-09-17 13:03:12 +02:00
U-NSFW-50TH\cc9c
ca80a2b856
Merge remote-tracking branch 'upstream/master' into opencs-settings
2014-09-17 21:00:22 +10:00
scrawl
2eaceb71ba
Reject AiTravel destinations further than 7168 units away, as in vanilla MW ( Fixes #1911 )
2014-09-17 12:39:10 +02:00
Marc Zinnschlag
41275b0af3
Merge remote-tracking branch 'cc9cii/Bug-No-1869'
2014-09-17 09:20:59 +02:00
Marc Zinnschlag
b9973c4515
Merge remote-tracking branch 'scrawl/master'
2014-09-17 09:18:36 +02:00
cc9cii
9dc4af69c6
Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.
2014-09-17 17:13:21 +10:00
scrawl
441073b475
Remove ancient comment
2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6
Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep
2014-09-17 07:02:19 +02:00
scrawl
269c200c8f
Fix jump velocity mechanics ( Fixes #1708 )
2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845
Fix idlestorm animation conflict with torch animation
2014-09-17 07:02:19 +02:00
scrawl
4c285151a3
Fix incorrect movement animation for some creatures ( Fixes #1924 )
2014-09-17 07:02:10 +02:00
Stanislav
ebb223b2d3
Feature #1226 : fixes
2014-09-17 09:03:02 +06:00
cc9cii
cb15750e40
Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.
2014-09-17 06:29:11 +10:00
cc9cii
e3da37567b
Cleaned up and got some signals going.
2014-09-17 06:11:41 +10:00
Marc Zinnschlag
70275350de
rewrote command generation in GenericCreator
2014-09-16 13:28:11 +02:00
Marc Zinnschlag
b31c4e2bcd
Merge remote-tracking branch 'cc9cii/Bug-No-1301'
2014-09-16 12:52:12 +02:00
Marc Zinnschlag
90b45e09f7
added refnum column to references tables
2014-09-16 12:48:10 +02:00
Marc Zinnschlag
f5483e76cf
added refnum counter column to cells table
2014-09-16 12:30:17 +02:00
cc9cii
d679e0e012
Made more progress. Grey out disabled settings.
2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875
GUI added, but not yet functional.
2014-09-16 07:44:07 +10:00
Stanislav
8574d2330c
Feature #1226 : Request UniversalId editing from table column
2014-09-16 00:00:34 +06:00
Marc Zinnschlag
71c868aa94
Merge remote-tracking branch 'scrawl/master'
2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
cc9cii
ecb4154ac0
Fixed default settings logic and cleaned up comments.
2014-09-15 19:33:38 +10:00
scrawl
0c75c6bf1b
Improve spellcasting AI for Drain/Damage effects
2014-09-15 10:42:51 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
Marc Zinnschlag
3d8216ee17
fixed broken content file list in case of newly created addons
2014-09-15 09:51:39 +02:00
cc9cii
e4b836608c
Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows.
2014-09-15 06:08:56 +10:00
cc9cii
0ec20b23aa
Initial working version. Video/rendering options supported. No GUI yet.
2014-09-15 06:08:55 +10:00
Marc Zinnschlag
19f469c7db
Merge remote-tracking branch 'scrawl/master'
2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009
allow project scope scripts
2014-09-14 11:41:28 +02:00
Marc Zinnschlag
89000f6196
removed unused OmwLoader
2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
002b41ba51
Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)
2014-09-14 08:38:54 +02:00
scrawl
4b27950879
Don't apply race height to NPC collision shape ( Fixes #1487 )
2014-09-14 07:04:02 +02:00
scrawl
bd96764229
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
2014-09-14 03:54:50 +02:00
Ragora
b8851790a6
Covered forgotten old bound item checks
2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
2014-09-13 18:48:41 -04:00
scrawl
4426b03fa4
Remove some garbage
2014-09-13 22:21:37 +02:00
scrawl
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
scrawl
a42e60970b
Revert "delete death events on adding an actor to the scene"
...
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.
This reverts commit fd2c07a6f4
2014-09-13 20:57:25 +02:00
scrawl
8625764143
Give 100% of health back when Resurrecting an actor ( Fixes #1877 )
2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484
add project file to content file list when running OpenMW from OpenCS
2014-09-13 20:48:24 +02:00
Marc Zinnschlag
10fa205ced
fixed --data switch (was missing composing option)
2014-09-13 20:41:57 +02:00
scrawl
319f4e0547
Bind to scancodes instead of keycodes
2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22
Don't trigger any mouse button bindings while in the settings menu
2014-09-13 20:39:59 +02:00
scrawl
04c79d5f1e
Fix case issue when setting companion's profit on the script
2014-09-13 20:39:59 +02:00
scrawl
e54ba2c5d1
Fix broken dialogue Function_HealthPercent
2014-09-13 20:39:58 +02:00
Marc Zinnschlag
d4007ad89e
Merge remote-tracking branch 'mellotanica/master'
2014-09-13 18:56:15 +02:00
Marc Zinnschlag
1254198d90
add debug profiles to scene subviews view drag and drop
2014-09-13 18:54:29 +02:00
Marc Zinnschlag
3ed2edb7cb
rewrote run tool profile management
2014-09-13 18:53:35 +02:00
Marc Zinnschlag
882ef37ae3
Merge remote-tracking branch 'ragora/conjureditemsgmstcheck'
2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3
Merge remote-tracking branch 'ragora/fixmapresize'
2014-09-13 15:52:36 +02:00
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
Marek Kochanowicz
40edf15ab0
cleaning up the code
2014-07-31 12:18:24 +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
Marek Kochanowicz
c6194e7ea3
inserted additional class for nested collections
2014-07-30 22:08:55 +02:00
scrawl
0f1451babd
Add epsilon to armor class calculation
2014-07-30 20:26:47 +02:00
Marek Kochanowicz
13ee469b70
saving progress
2014-07-30 17:07:11 +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
Marek Kochanowicz
6a9c7c9f86
fix for bug 1672
2014-07-28 17:33:21 +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
Marek Kochanowicz
ade27293be
handling destination for guides
2014-07-25 17:11:18 +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
Marek Kochanowicz
39545670a8
Added spells table (and it works!)
2014-07-25 12:09:25 +02:00
Marek Kochanowicz
864b93e745
added enums for spells
2014-07-25 11:42:02 +02:00
Marc Zinnschlag
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +02:00
Marek Kochanowicz
cdac934315
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-07-25 11:13:52 +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
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4
Fix pinned widgets receiving mouse clicks in gamemode ( Fixes #1686 )
2014-07-24 18:04:44 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
2014-07-24 02:19:36 +02:00
scrawl
7ae9bbb1a5
Implement iCrimeThresholdMultiplier
2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea
Use separate function for fatigue restoration during resting/waiting
2014-07-24 02:17:44 +02:00
scrawl
103325bfb8
Change HUD enemy health bar to use actorId
2014-07-24 02:17:44 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
Marek Kochanowicz
a676f6bc2c
comments added
2014-07-23 20:33:52 +02:00
scrawl
ca45a63cf7
Close doors instantly when using Lock instruction
2014-07-22 17:55:54 +02:00
Marek Kochanowicz
72b129b90e
Code shuffling. Created CastableHelper to store actually usefull
...
function.
2014-07-22 17:44:56 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
gus
baf6cca051
modified tab to space
2014-07-22 13:32:15 +02:00
Marek Kochanowicz
9defb188ea
handle inventory in the actors
2014-07-22 13:08:32 +02:00
gus
195767db7f
link back to OGre Wiki for some copied past code
2014-07-22 12:25:31 +02:00
gus
546b44a3be
bugfixes
2014-07-22 12:10:58 +02:00
gus
1e7c4f26df
more compile fixes (damn you Visual studio)
2014-07-22 12:01:21 +02:00
gus
2092e5fe22
compile fixes
2014-07-22 11:49:45 +02:00
gus
875daed4ec
Merge branch 'master' of https://github.com/OpenMW/openmw.git into QtOGre
2014-07-22 11:09:53 +02:00
Marek Kochanowicz
24eb034ba3
major refactorisation
2014-07-22 10:27:45 +02:00
Marc Zinnschlag
91afc2ebe7
Merge remote-tracking branch 'mikesc/bug1482'
2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca
Merge remote-tracking branch 'miroslavr/master'
2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f
Merge remote-tracking branch 'lgro/aicombat'
2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a
Fix bug 1482:
...
- put powers on cooldown only when they are used succedsfully
2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
scrawl
c0645d4978
Increase death count immediately on death (Bug #1588 )
...
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc
Make NPCs react to being attacked by other actors ( Fixes #1588 )
2014-07-21 20:36:26 +02:00
gus
a5058625b3
clean up + toggle function for the billboard
2014-07-21 18:57:35 +02:00
gus
f8019b4a97
added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too.
2014-07-21 18:35:51 +02:00
scrawl
127add7623
Don't allow dialogue with werewolf NPCs
2014-07-21 18:19:45 +02:00
Marek Kochanowicz
dcd90faaef
moved add nested to the helper
2014-07-21 14:58:45 +02:00
Marek Kochanowicz
427d6efd19
Moved removeNestedRow responsibility to the helper.
2014-07-21 14:49:47 +02:00
Marek Kochanowicz
c018ca43ac
getting rid of the asserts
2014-07-21 14:44:48 +02:00
Marek Kochanowicz
cb004936e0
moved setNestedData to the helper as well
2014-07-21 14:34:48 +02:00
Marek Kochanowicz
6573e3f319
moved responsibility for getNestedData to the inventory helper
2014-07-21 14:24:54 +02:00
Marek Kochanowicz
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
2014-07-21 14:10:04 +02:00
Marc Zinnschlag
a9f9dec923
consider script blacklist in OpenCS verifier
2014-07-21 12:15:21 +02:00
Marek Kochanowicz
3dd2ca15da
Reduced code duplication through new common base class
2014-07-21 09:52:09 +02:00
Marc Zinnschlag
d87630b41a
blacklisting for scripts in OpenMW
2014-07-21 09:34:10 +02:00
scrawl
10d4da7994
Fix date time in journal entries being off by one day ( Fixes #1668 )
2014-07-21 01:17:01 +02:00
scrawl
5629803a08
Implement correct armor mitigation mechanics
2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59
Adjust combat mechanics
...
- Projectiles can not trigger critical hits
- Critical hits are only possible if the target is not in combat (Fixes #1669 )
- Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
Marek Kochanowicz
87eed066c2
undo works now
2014-07-20 22:39:39 +02:00
scrawl
90a96cd7d8
Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor
2014-07-20 22:34:20 +02:00
scrawl
1636fd66db
Don't add creature base damage to weapon damage (UESP was wrong)
2014-07-20 22:26:26 +02:00
Marek Kochanowicz
4d79034dbf
correctly handling the nestedTable for undo (but removing and adding
...
rows in proper QT way is still TODO)
2014-07-20 18:52:35 +02:00
scrawl
6d794dac69
Add missing messagebox for spell lock and unlock success
2014-07-20 17:09:55 +02:00
scrawl
9897f14c3c
Don't block when actor is paralyzed
2014-07-20 16:52:57 +02:00
scrawl
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f
Consider Shield spell effect for creature armor rating
2014-07-20 14:41:39 +02:00
scrawl
691ba02115
Reduce wepaon condition even if attack misses
2014-07-20 14:12:27 +02:00
MiroslavR
0f2305ae43
Clear selected spell when window manager is cleared
2014-07-20 13:07:47 +02:00
scrawl
63fd04882a
Make sure crime gold discounts don't reduce price to zero
2014-07-19 23:49:54 +02:00
MiroslavR
d5381e1bc4
Dynamically resize skill widgets to fit their contents ( Fixes #1610 )
2014-07-19 14:04:38 +02:00
Marek Kochanowicz
0017fc68ef
fixed ctor of nestedwrapper (missing initialization of member data field)
2014-07-19 13:08:28 +02:00
Marek Kochanowicz
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
2014-07-18 18:26:22 +02:00
Marc Zinnschlag
6a3ff211b1
automatically get target ID at InterpreterContext construction, if a reference is available
2014-07-18 09:57:47 +02:00
Marc Zinnschlag
4fb897f2f8
added missing getId functions to classes derived from MWWorld::Class
2014-07-18 09:56:58 +02:00
scrawl
d4ffd30f98
Implement Rank filter with no faction given ( Fixes #1660 )
2014-07-17 20:57:37 +02:00
scrawl
f9a39138cc
Add missing endline
2014-07-17 16:16:14 +02:00
scrawl
08ce6ed7fb
Attempt to restack item after repair or recharge ( Fixes #1656 )
2014-07-17 16:16:06 +02:00
Marc Zinnschlag
27c84d6cb7
the reference for a targeted script is now determined when needed instead of at the start of the script execution
2014-07-17 13:36:55 +02:00
Marek Kochanowicz
16292bf23e
removed useless todo statments.
2014-07-17 13:03:53 +02:00
Marek Kochanowicz
5671a4b8e2
corrected include to follow our standards.
2014-07-17 12:58:14 +02:00
Marek Kochanowicz
6e07568b43
Corrected syntax.
2014-07-17 12:56:51 +02:00
Marek Kochanowicz
ca73ce3fe2
trying to fix indending
2014-07-17 12:41:43 +02:00
Marc Zinnschlag
dba6a9ebff
run targeted scripts with an implicit reference based on the ID given
2014-07-17 09:15:41 +02:00
Marek Kochanowicz
f0c6ef185e
Nest columns directly, created NestedColumn class and NestColumn.
2014-07-16 13:13:22 +02:00
scrawl
20a0040bdb
Apply elemental shield magnitude to element resistance ( Closes #1121 )
2014-07-16 10:58:28 +02:00
scrawl
123157b216
Implement elemental shield damage to attacker (Feature #1121 )
2014-07-16 10:58:28 +02:00
scrawl
f43a10b7b9
Adjust disease contraction according to Hrnchamd's research
2014-07-16 10:58:21 +02:00
Marc Zinnschlag
75ab8de3d2
added opcode for running scripts with explicit references (targeted scripts)
2014-07-15 13:26:04 +02:00
Marc Zinnschlag
e9377ad5c4
include targeted script data in saved games
2014-07-15 13:05:38 +02:00
Marc Zinnschlag
8241ee59c3
modified GlobalScripts data structures to accommodate targeted script data
2014-07-15 12:59:02 +02:00
Marc Zinnschlag
1a1f5dfc4a
added tooltips to dialgoue subview buttons
2014-07-15 12:46:52 +02:00
scrawl
5839691530
Check for container organic flag before checking weight ( Fixes #1654 )
2014-07-14 17:27:36 +02:00
scrawl
6cd739678a
Fix dangling model pointer after reference cleanup ( Fixes #1653 )
2014-07-14 16:53:58 +02:00
Marc Zinnschlag
517b27e29a
Merge branch 'toolbar'
2014-07-14 14:18:08 +02:00
Marc Zinnschlag
0430558c3c
fixed focussed button in mode tool panel when panel is opened
2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38
new keyboard shortcut (T): move focus from toolbar to scene widget
2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856
new keyboard shortcut (T): move focus from scene widget to toolbar
2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c
when scene toolbar gains focus, focus first button
2014-07-14 11:06:12 +02:00
scrawl
7c7c71428a
Don't crash if certain class doesn't exist
2014-07-13 14:26:59 +02:00
Marc Zinnschlag
c2ea8f3f0a
added self-adjusting tooltips to the top-level toolbar buttons
2014-07-13 14:21:50 +02:00
Marek Kochanowicz
0252d021eb
removed pointless member field
2014-07-13 12:37:05 +02:00
Marc Zinnschlag
26f87f5d23
added navigation mode button tooltips
2014-07-13 12:15:05 +02:00
Marek Kochanowicz
4b4a72c3b6
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-07-13 10:52:39 +02:00
Marc Zinnschlag
e855e55318
added tooltip to user settings button on startup window
2014-07-13 10:52:33 +02:00
scrawl
c9150c9680
Initialize character skeleton to a suitable pose ( Fixes #1473 )
2014-07-13 10:40:48 +02:00
slothlife
d0e1210dd7
Fix for Bullet debug assert
...
After changing the vector comparison to squaredDistance, the threshold
for rejecting similar vectors needed to be readjusted.
2014-07-13 01:39:42 -05:00
scrawl
8b404ee255
Fix not being able to exit dialogue using Escape when a Goodbye link appears
2014-07-13 06:42:24 +02:00
Marc Zinnschlag
cae0c4a044
Merge remote-tracking branch 'scrawl/master'
2014-07-12 21:19:15 +02:00
scrawl
f2799ea1d9
Reset item model when reference is reset ( Fixes #1628 )
...
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
2014-07-12 18:53:22 +02:00
scrawl
40c3fa0dc1
Fix travis
2014-07-12 18:53:22 +02:00
scrawl
d63dd88113
Apply autocalc corrections to player starting spells
2014-07-12 18:53:16 +02:00
scrawl
fd3f109362
Fix underflow for NPCs with level 0
2014-07-12 18:53:16 +02:00
scrawl
a1639371d3
Fix rounding for skill/attribute autocalc
2014-07-12 18:53:16 +02:00
scrawl
83819b2894
Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences.
2014-07-12 18:53:15 +02:00
scrawl
479f248c1d
Use spell effect range type, not base effect (applied to spellcasting code)
2014-07-12 18:53:15 +02:00
scrawl
b4f8edc186
Use spell effect range type, not base effect
2014-07-12 18:53:15 +02:00
scrawl
1c41ce9b9d
Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)
2014-07-12 18:53:15 +02:00
scrawl
d91d599269
Disable quickload when in modal dialog ( Fixes #1641 )
2014-07-12 06:43:04 +02:00
scrawl
048d07b299
Show owner of doors in tooltip
2014-07-11 11:57:21 +02:00
scrawl
5fbce67b9d
Don't redraw ItemView if the size did not change
2014-07-11 04:30:44 +02:00
scrawl
53c70dbdaa
Exit dialogue when going to jail ( Fixes #1635 )
2014-07-11 04:25:56 +02:00
Marc Zinnschlag
490442cf62
added lighting mode tooltips
2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40
replaced custom toolbutton push flag with type enum
2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83
toolbar tooltip system
2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e
fixed scene subview focus problem
2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884
set focus when opening a toolbar panel
2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac
use custom button on toolbar (top level)
2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b
added push mode and icon-less push button constructor
2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1
removed text argument from button constructor, because toolbar buttons will always be icon only
2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878
return/enter activate the selected button
2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8
make buttons in mode panel act like radiobuttons
2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390
custom push button
2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5
SceneWidget::setLighting was missing an update call
2014-07-10 10:09:21 +02:00
scrawl
0704fa2b3d
Reset local rotation axis in SetAngle ( Fixes #1630 )
2014-07-09 10:23:01 +02:00
Marc Zinnschlag
3333f67830
removed a left-over marker
2014-07-08 12:53:25 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +02:00
scrawl
df80c436fb
Fix compile error for OPENMW_USE_FFMPEG=0
2014-07-08 10:30:46 +02:00
scrawl
742d008765
Fix initializing CharacterController with fists or spell equipped
2014-07-08 10:30:46 +02:00
scrawl
a3a8f4da70
More font hackery. Will it ever end?
...
Fixes #1606
2014-07-08 10:30:45 +02:00
scrawl
0a2d5d34bc
Cancel queued view mode switch when switching view mode ( Fixes #1618 )
2014-07-08 10:30:45 +02:00
scrawl
ee81698089
Always control movement by animation except for first person or in-air
2014-07-08 10:30:45 +02:00
Marc Zinnschlag
1548f4670a
drop part of resources drag and drop
2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d
more refactoring
2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c
added separate display type for colours
2014-07-08 09:08:01 +02:00
Marc Zinnschlag
b2ce94f28a
fixed exceptions
2014-07-08 08:56:28 +02:00
Marc Zinnschlag
b2c2342988
some refactoring (removing redundant code)
2014-07-08 08:53:39 +02:00
Marc Zinnschlag
c1bbefb840
enable dragging from resources tables
2014-07-07 15:20:05 +02:00
Marek Kochanowicz
72392ad68c
emit data changed signal when adding and removing the nested row
2014-07-07 12:22:04 +02:00
Marek Kochanowicz
d221486a14
Fixed problem in the idtable.
2014-07-07 12:16:53 +02:00
Marc Zinnschlag
df6996d4ae
filter resources files based on extension
2014-07-07 11:34:24 +02:00
Marek Kochanowicz
3262f8d774
make dtor virtual
2014-07-07 10:27:48 +02:00
Marek Kochanowicz
acc8432705
fixed segfault
2014-07-07 10:23:40 +02:00
Marc Zinnschlag
19828df799
added subviews for resources tables
2014-07-05 15:51:17 +02:00
Marc Zinnschlag
b2c957a56f
added resources tables
2014-07-05 15:50:47 +02:00
Marc Zinnschlag
42db9a5091
make modification column optional in table views
2014-07-05 15:50:17 +02:00
Marc Zinnschlag
4f6c7b0e84
resolved UniversalId naming ambiguity
2014-07-05 15:07:17 +02:00
Marc Zinnschlag
e171babd2f
added Feature_Constant to IdTable
2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
2014-07-04 13:25:56 +02:00
Marc Zinnschlag
63d0fdee7f
removed leftover data member
2014-07-04 12:48:18 +02:00
Marc Zinnschlag
879ab49e9c
added resources manager
2014-07-04 12:46:57 +02:00
Marc Zinnschlag
1ce60fa13b
Merge branch 'tables'
2014-07-03 12:03:21 +02:00
Marc Zinnschlag
1745335982
body part table fix: forgot to include body parts in ID listings
2014-07-03 12:03:01 +02:00
Marek Kochanowicz
851d2f061b
Removed qdebug calls (forgot about those).
2014-07-03 11:14:51 +02:00
Marc Zinnschlag
607445d40c
Merge branch 'editorfixes'
2014-07-03 10:34:23 +02:00
Marc Zinnschlag
9ce92302d7
interpret empty filter strings as no filter instead of a broken filter ( Fixes #1311 )
2014-07-03 10:22:39 +02:00
Marek Kochanowicz
0bfc408ea2
removed debug code
2014-07-02 14:10:11 +02:00
Marek Kochanowicz
bb675ff41d
Removing rows and undo works
2014-07-02 13:29:25 +02:00
Marek Kochanowicz
77afb754e5
adding new rows works
2014-07-02 13:13:03 +02:00
scrawl
6cd6578a88
Handle Deleted moved references (Bug #1613 )
2014-07-01 21:47:27 +02:00
scrawl
e666ddfe18
Fix list of moved references being discarded ( Fixes #1613 )
2014-07-01 21:42:11 +02:00
scrawl
df62c06acf
Print exterior grid position in betaComment
2014-07-01 21:41:23 +02:00
Marek Kochanowicz
c50cecdc64
Small cleanup
2014-07-01 21:13:27 +02:00
Marek Kochanowicz
fcd082c6a5
added option to add or remove rows
2014-07-01 20:52:27 +02:00
Marc Zinnschlag
37a2b48fa2
added missing type columns to body part table
2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49
added body part table
2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18
added other missing columns for enchantment table; fixed dialogue subviews for enchantment records
2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a
added enchantment type column to enchantment table
2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b
Merge branch 'editorfixes' into tables
2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6
added enchantments table
2014-06-30 20:40:34 +02:00
Marek Kochanowicz
172f1a1301
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-06-30 20:06:44 +02:00
Marek Kochanowicz
3ebc469f04
prepering for merge
2014-06-30 20:06:18 +02:00
Marc Zinnschlag
4f08efc4d7
added missing combat, magic and stealth columns for creatures (Feature #1312 )
2014-06-30 19:51:59 +02:00
scrawl
205e039a39
Allow modCurrent instructions to decrease below zero (Bug #1589 )
2014-06-30 17:58:08 +02:00
Marc Zinnschlag
a25321f07e
update paged scene view according to changes made to cell records
2014-06-30 17:57:38 +02:00
scrawl
2506c16bf5
Add a dummy GetStat function returning 0 ( Fixes #1589 )
2014-06-30 17:49:01 +02:00
Marc Zinnschlag
5fb2e1a877
do not render deleted exterior cells in scene view
2014-06-30 17:33:03 +02:00
Marek Kochanowicz
6dc199743c
store undoStack in the nestedtable
2014-06-30 16:03:38 +02:00
Marek Kochanowicz
c96d48fb91
Nested model supports editing now.
2014-06-30 14:12:57 +02:00
Marek Kochanowicz
5eac32e3d3
added nestedtable for displaying nested content.
2014-06-30 13:09:10 +02:00
Marc Zinnschlag
af59106533
for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files)
2014-06-30 12:35:34 +02:00
scrawl
85a1f9d37b
Fall back to resolution selected from list when switching to fullscreen ( Fixes #1599 )
2014-06-30 00:08:39 +02:00
Marek Kochanowicz
8c6a0d9a4f
created new files
2014-06-29 21:12:31 +02:00
scrawl
082b6125a9
Fix crash during spell creation when an effect targeting a skill/attribute doesn't have one assigned yet ( Fixes #1598 )
2014-06-29 17:02:29 +02:00
scrawl
5ec96c5394
Add missing visibility flags
2014-06-29 16:02:43 +02:00
scrawl
1de406cb6d
Catch exception from invalid scripts during save&load ( Fixes #1590 )
2014-06-29 16:02:43 +02:00
Marc Zinnschlag
b5650f5d4f
Merge branch 'cells'
2014-06-29 16:00:26 +02:00
Marc Zinnschlag
2fe2def64c
added cell rendering in paged worldspaces
2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8
added cell rendering in unpaged worldspaces
2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +02:00
Marc Zinnschlag
604509ac7e
Merge remote-tracking branch 'scrawl/master'
2014-06-29 10:34:48 +02:00
scrawl
e25fa6c157
Refactor non-distant land terrain path to a grid based implementation ( Fixes #1562 )
2014-06-29 02:42:36 +02:00
scrawl
4949aa1fbb
Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)
2014-06-28 18:21:56 +02:00
scrawl
10ef0a34d9
Update effects even when main animation is paused ( Fixes #1585 )
2014-06-28 17:54:14 +02:00
scrawl
f929004635
Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm)
2014-06-28 17:44:52 +02:00
scrawl
65e36793fc
Fix messagebox on crash showing wrong path
2014-06-28 15:31:55 +02:00
scrawl
3b2358888b
Attempt to fix player position after using coc/coe
2014-06-28 15:19:32 +02:00
scrawl
8e361bb879
Make targeted spells collide with water ( Fixes #1500 )
2014-06-28 14:49:07 +02:00
scrawl
92f5898b32
AiWander: Make sure we have 8 idle values ( Fixes #1583 )
...
The AiWander instruction may specify more (or less) than 8.
2014-06-28 14:22:27 +02:00
Marc Zinnschlag
c35b87de95
various Object class fixes
2014-06-28 11:25:28 +02:00
scrawl
523c2715e3
AiCombat: Handle Start to Min and Min to Max durations of 0 (found in Riekling animation)
2014-06-28 01:31:34 +02:00
scrawl
516014c071
Trigger hit on start key if there's no hit key ( Fixes #1574 )
2014-06-28 01:06:53 +02:00
scrawl
911bd0e340
Use walk animation as fallback if there's no run animation ( Fixes #1578 )
2014-06-28 00:07:13 +02:00
scrawl
78d02d97da
Find text keys in reverse (Bug #1578 )
2014-06-28 00:06:08 +02:00
scrawl
2451eead8a
Some additional wrapping for faction rank instructions
2014-06-27 20:07:19 +02:00
scrawl
7f26843dc3
Reset key focus when the key focus widget is hidden ( Fixes #1568 )
2014-06-27 19:35:41 +02:00
scrawl
37c85f0af4
Don't update object root controllers with no time source ( Fixes #1564 )
2014-06-27 19:35:41 +02:00
scrawl
6a900e0aad
Update weapon and shield controllers for creatures
2014-06-27 19:35:41 +02:00
Marc Zinnschlag
3541d03809
fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)
2014-06-27 12:29:23 +02:00
Marc Zinnschlag
099c406226
Merge branch 'objects'
2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f
make preview watch for changes in modification state of relevant records
2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024
disabled preview function for deleted records
2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09
fixed some function names
2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +02:00
Marc Zinnschlag
3100206b28
replaced an assert with an exception
2014-06-27 08:37:41 +02:00
scrawl
8b340ddd5e
Implement slower movement against storms ( Closes #41 )
2014-06-27 03:22:00 +02:00
scrawl
07d0f4458d
Rotate clouds/particles to come from red mountain ( Fixes #245 )
2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70
Make flying creatures fall when paralyzed ( Fixes #1494 )
2014-06-27 03:21:50 +02:00
scrawl
e19bbfd1b5
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text ( Fixes #1543 )
2014-06-26 20:49:22 +02:00
scrawl
865f4648b0
Fix flying creatures not falling on death
2014-06-26 17:15:07 +02:00
scrawl
44fd526c98
Don't show disposition bar for creatures
2014-06-26 15:36:19 +02:00
scrawl
4aab4e1c26
Ignore item condition when determining value, except in trade ( Fixes #1557 )
2014-06-26 14:59:33 +02:00
scrawl
869fa08a32
Fix disarming a trap when key is used ( Fixes #1556 )
2014-06-26 14:30:19 +02:00
scrawl
e5254ff8ef
Set render queue for rain
2014-06-26 14:26:53 +02:00
Marc Zinnschlag
06e89d8bd3
reduced loading batch size (making the the loading progress bars a bit more responsive
2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec
display record count in loading window
2014-06-26 11:41:21 +02:00
scrawl
7b1e1d03d8
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/sky.hpp
2014-06-26 04:29:03 +02:00
scrawl
697329f128
Fix crash for in_dagoth_bridge00.nif ( Fixes #1561 )
...
This one is causing trouble by using an unnamed node, will need some more work.
2014-06-26 03:33:09 +02:00
scrawl
15b486e149
Don't trigger changed flag if a script with no locals is configured
2014-06-26 01:21:15 +02:00
scrawl
2d17d8f61a
Savegame: start in (0,0) cell if player's cell no longer exists
...
This happens frequently when saves are loaded that were created in a different MW language.
2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99
CellRef uninitialized fixes
2014-06-25 19:52:14 +02:00
scrawl
f6a568c995
Implement rain (Feature #41 )
2014-06-25 18:20:21 +02:00
scrawl
09926a86cb
Fix comparing outdated listener position with up-to-date cell ( Fixes #1499 )
2014-06-25 18:10:26 +02:00
scrawl
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47
Merge remote-tracking branch 'scrawl/master'
2014-06-25 09:58:00 +02:00
scrawl
ec64f1a53a
Reset accumulation root when its animation finishes
...
Fixes a position flicker after standing up from knockdown.
2014-06-25 02:46:39 +02:00
scrawl
ee098de0a6
Don't ignore lighting values of particles not attached to a character
2014-06-25 01:14:21 +02:00
scrawl
b259c5def2
Make GetFactionReaction garbage argument optional
2014-06-25 01:12:57 +02:00
scrawl
3d9bdad8ba
Correct run speed for creatures (by Hrnchamd - Fixes #1136 )
2014-06-25 00:51:02 +02:00
scrawl
7f1d0fc2a2
Fix disposition for npcs in same faction, by Hrnchamd
2014-06-25 00:12:51 +02:00
scrawl
8a8ecce1e5
Fix some uninitialized data written to savegames
2014-06-25 00:11:25 +02:00
Marek Kochanowicz
a0146e2e28
Added undo for delete command
2014-06-24 19:34:02 +02:00
Marek Kochanowicz
d73f4cbd7b
added add nested command
2014-06-24 19:19:40 +02:00
Marek Kochanowicz
7b5bf637ab
Changes needed to add new nested row.
2014-06-24 19:03:29 +02:00
scrawl
693a097b21
Implement idlestorm animation (Feature #41 )
2014-06-24 18:37:38 +02:00
scrawl
36135293e8
Fix moving object from an inactive to another inactive cell
2014-06-24 15:29:36 +02:00
scrawl
b52977e44c
Add dummy Face implementation for now (Bug #1541 )
2014-06-24 15:09:13 +02:00
scrawl
36132e054a
Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41 )
2014-06-24 15:00:15 +02:00
Marek Kochanowicz
befdeb1889
use beginRemovRow when removing nested row.
2014-06-24 12:42:49 +02:00
Marek Kochanowicz
7430e1e1bb
Added delete nested rows command (undo still needs to be done)
2014-06-24 12:35:26 +02:00
Marek Kochanowicz
c45061614b
Added code to delete nestedRows
2014-06-24 12:21:40 +02:00
Marek Kochanowicz
88c5288eaf
Create removeNestedRow (for deleting rows of nested columns)
2014-06-24 10:22:42 +02:00
scrawl
1d46ac19ff
Fix being able to activate through terrain
2014-06-24 02:24:32 +02:00
scrawl
320ab1b2c1
Don't say voice when using startcombat for a dead actor ( Fixes #1542 )
2014-06-23 22:00:17 +02:00
scrawl
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
64a4c2785e
Fix water walking
2014-06-22 22:30:30 +02:00
scrawl
d296c6e9b7
Handle fog density values of 0 (Bug #1549 )
2014-06-22 22:30:29 +02:00
scrawl
cbec0ffaee
Exception fix
2014-06-22 22:30:29 +02:00
slothlife
ead801f2d0
Fix for compiling Win32 debug.
2014-06-21 21:15:41 -05:00
scrawl
e23a7694f3
Don't throw exception when using ModDisposition on creatures ( Fixes #1548 )
2014-06-22 00:34:32 +02:00
scrawl
e002acdeae
Physics: Create actor shapes outside of BulletNifLoader
...
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
2014-06-21 23:37:16 +02:00
scrawl
98329a94b4
Add case sensitivity workaround for spine bones ( Fixes #1547 )
2014-06-21 19:54:12 +02:00
scrawl
a4ce9d6a7f
Always show the script name when a script fails to compile
2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6
Implement toggleMenus
2014-06-20 18:51:00 +02:00
Marek Kochanowicz
894c98ee89
Added extra columnid type to use for ID of the inventory item
2014-06-20 14:22:40 +02:00
scrawl
ad0a182b7e
Improve error message for unknown cells
2014-06-19 20:08:53 +02:00
scrawl
091f9a8fdc
Optimize global map render slightly
2014-06-19 19:14:59 +02:00
scrawl
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
2014-06-19 19:03:12 +02:00
Marek Kochanowicz
a076798f8f
Quick and dirty prototype of actual nested header data implementation
2014-06-19 18:46:09 +02:00
Marek Kochanowicz
256b075914
getting rid of not needed abstract class
2014-06-19 16:11:31 +02:00
scrawl
11b05c352f
Fix exception when casting Bound Gloves spell
2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed
Merge remote-tracking branch 'scrawl/master'
2014-06-19 10:35:28 +02:00
scrawl
4648524df4
Improve getLOS (use eye level). Also, don't crash when used with non-actors.
2014-06-19 04:53:25 +02:00
scrawl
185ff279a3
Add missing sound effect for mages guild transport
2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8
Fix very slow movement on some creatures, e.g. rats (Bug #1136 )
...
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
2014-06-19 02:36:10 +02:00
scrawl
6760f4c897
Make cached GMSTs in MWClass::Npc/Creature safer
2014-06-19 02:09:46 +02:00
scrawl
4234c70232
Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers)
2014-06-19 02:00:40 +02:00
scrawl
d878456d0f
Don't add an extra path separator
2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a
Don't crash in StatsWindow for invalid faction rank values
...
PcRaiseRank: don't allow to raise rank beyond max rank
2014-06-18 23:50:55 +02:00
scrawl
2193977eec
Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway
...
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
2014-06-18 22:59:18 +02:00
scrawl
4e71db7081
Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.
2014-06-18 21:39:17 +02:00
Marek Kochanowicz
873cfcf447
implemented basic headerData (still work in progress)
2014-06-18 17:34:21 +02:00
scrawl
8a4227ec38
Heal player while in jail
2014-06-18 16:57:54 +02:00
scrawl
9a6737073f
Fix broken swimdeath in first person
2014-06-18 16:57:54 +02:00
scrawl
e95483c40f
Fix crash for on target spells cast by non-actors ( Fixes #1529 )
2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719
Make Weakness effects apply to all subsequent effects within the same spell ( Fixes #1150 )
2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39
Fix being able to steal undetected just after invisibility breaks
2014-06-18 16:57:53 +02:00
scrawl
80f66e2157
Fix crash when avformat_open_input fails ( Fixes #1522 )
2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55
Fix level up dialogue layout ( Fixes #1393 )
2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc
Disable QuickKeysMenu in werewolf form
2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956
Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked)
2014-06-18 16:57:53 +02:00
Marek Kochanowicz
b63f2f4cd5
Actually using new nestedmodel
2014-06-18 16:56:37 +02:00
scrawl
1dc9e151cb
Count werewolf kills ( Fixes #1525 )
2014-06-18 16:56:36 +02:00
Marek Kochanowicz
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c
Column is responsible for telling that it can nest columns now.
2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015
Nested table sits inside it's own layout now.
2014-06-17 20:12:14 +02:00
scrawl
1244da85df
Make Detect Life spell detect NPCs when in werewolf form ( Fixes #1527 )
2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c
Fix broken AI movement on Z axis
2014-06-17 15:25:54 +02:00
Marek Kochanowicz
5bee682bb3
modified: ../../view/world/dialoguesubview.cpp
2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5
Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
...
into NonTableFields
I have no idea what I'm doing
Conflicts:
apps/opencs/model/world/idtable.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/model/world/refidadapterimp.hpp
2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754
Merge branch 'dialog-fix' into NonTableFields
...
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marc Zinnschlag
2683aa9503
Merge remote-tracking branch 'filkry/bug640_luminescent_water'
2014-06-17 13:08:06 +02:00
Marek Kochanowicz
187fccc8cc
Merge branch 'dialog-fix' into NonTableFields
2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61
Trying to merge.
2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c
fixed base flag in content file loader code
2014-06-17 11:01:17 +02:00
Marek Kochanowicz
bbe7854968
Corrected formatting to follow our standard better.
2014-06-17 10:46:54 +02:00
scrawl
2477456f99
Implement Murder crimes and OnMurder instruction ( Fixes #1315 )
2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba
Add delay to sneak icon update and skill progress ( Fixes #1321 )
2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555
Use fFight<Crime> GMSTs to control attacks in response to crimes
2014-06-17 04:05:27 +02:00
scrawl
8ac019611d
Fix Potion use action removing the potion even when the action is not executed ( Fixes #1521 )
2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47
Fixed underwater issue
...
I had accidentally deleted some interpolation parameters.
2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9
WIP fix
...
Bug is fixed, but appears to have broken vision underwater. Notes:
+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
2014-06-16 17:08:02 -04:00
scrawl
28feb260eb
Implement disposition/distance based aggression ( Fixes #1520 )
2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7
Fix positionCell not properly teleporting actors from inactive to active cells ( Fixes #1516 )
2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42
Fix getDistance not detecting references in inactive cells properly
2014-06-16 20:05:47 +02:00
Marek Kochanowicz
d6288a8055
Remove unneded revert and delete slots
2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a
refactoring dialogue subview
2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae
Fixed complitaion.
2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb
Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix
2014-06-16 09:44:49 +02:00
scrawl
47bd170d7e
Crashcatcher: create temp file in /tmp, not working directory (which may not have write access)
2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9
Fix crash when stealing items with the owner not around ( Fixes #1512 )
2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0
Allow following NPCs to fast-travel ( Fixes #1501 )
2014-06-16 03:17:31 +02:00
scrawl
78f30e2970
Fix a journal layout bug
2014-06-16 02:52:25 +02:00
scrawl
345ba99c17
Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497 )
2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8
Fix weapon incorrectly showing when saving and loading with spell equipped
2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f
Clear MyGUI's clipboard, since we don't want to use it ( Fixes #1277 )
...
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71
Add items to player inventory upon drag start ( Fixes #1507 )
2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1
Attempt to open companion window if no greetings are found (Bug #1507 )
2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d
Make Bipedal creatures always able to walk and swim ( Fixes #1509 )
...
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e
Savegame: Store AiSettings and summoned creatures
...
CreatureStats state is now completely stored (Closes #1174 )
Also play VFX_Summon_Start and VFX_Summon_End visual effects.
2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f
Disable fProjectileThrownStoreChance when shooting at player ( Fixes #1490 )
2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce
Implement BetaComment instruction (dumps reference info)
2014-06-15 16:11:16 +02:00
scrawl
326c747508
Don't run scripts when in pause menu ( Fixes #1495 )
2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b
Clear message boxes in windowmanager cleanup ( Fixes #1496 )
2014-06-15 14:18:16 +02:00
scrawl
e288437885
Disable all other animations on death ( Fixes #1483 )
2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0
Sort using ciLess, not ciEqual
2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa
Don't allow scripted dialogue with dead actors ( Fixes #1493 )
2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18
Remove a squareroot in pathfinding
2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee
Move AiWander arrival check to time-critical section
2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614
Consider moved references in CellStore::listRefs
2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f
Fix incorrect trigger of change flag for static doors
2014-06-15 14:18:16 +02:00
scrawl
395f98e476
Fix triggering changed flag for all references when cell is visited
...
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.
Also clean up RefData interface slightly.
2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f
Don't clear AiSequence if there are no saved packages (eg for old savegames)
2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434
Merge remote-tracking branch 'mrcheko/master'
2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa
fix bug when you were able to kill somebody from large distance without
...
being spotted
2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96
fix http://bugs.openmw.org/issues/1340
...
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6
Use Ogre::Math::PI
2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac
Another way of getting M_PI
2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7
Fix missing M_PI define on Windows
2014-06-14 13:29:55 +02:00
scrawl
832f1a4857
Fix merge mistake
2014-06-14 02:31:01 +02:00
scrawl
0637cde267
Bug #1417 : Make sure to reset all position/rotation fields when placing items
2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e
Bug #1417 : Use fmod to wrap local rotations (more efficient and robust)
2014-06-13 23:40:35 +02:00
scrawl
54d8606b78
Fix logging fatal exceptions to cerr, and log them to openmw.log
2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196
Merge remote-tracking branch 'origin/master'
2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620
fix bug http://bugs.openmw.org/issues/1470
2014-06-13 23:22:00 +04:00
scrawl
3334078d4d
Add first person meshes to refraction render ( Fixes #1481 )
2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-06-13 19:31:33 +02:00
scrawl
8114f48469
Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame.
2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27
Merge remote-tracking branch 'upstream/master'
...
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case
Conflicts:
apps/openmw/mwmechanics/character.cpp
2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2
Savegame: Store death counter ( Fixes #1477 )
2014-06-13 02:26:53 +02:00
scrawl
797134aa51
Handle activation scripts in AiActivate ( Fixes #1478 )
2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe
Fix a sign error
2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8
Show base item value in tooltip, not real value ( Fixes #1469 )
2014-06-13 02:26:52 +02:00
scrawl
604d5ac000
Fix console reference label not resetting when loading save
2014-06-13 02:26:52 +02:00
mrcheko
df7213185f
warning fixes
2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070
Merge remote-tracking branch 'cc9cii/master'
2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6
For compiling with MSVC 2012
2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3
Cell merge fix (reference context position was not saved correctly)
2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
2014-06-11 19:47:42 +02:00
scrawl
013916fca3
Fix for broken physics in exteriors ( Fixes #1446 )
...
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7
Don't play the same music track twice in a row ( Fixes #746 )
2014-06-11 18:11:16 +02:00
scrawl
d60df66811
Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108 )
2014-06-11 16:56:41 +02:00
scrawl
73be457805
Merge ESM::Cell fields by subrecord
...
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +02:00
Marc Zinnschlag
2faeceacfa
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/main.cpp
2014-06-11 08:51:18 +02:00
scrawl
0f31e31088
Allow opening journal during dialogue ( Fixes #1460 )
2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8
Handle Quadratic and Linear attenuation independently ( Fixes #1456 )
2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e
Write logs in log directory
...
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec
split getStartTime
2014-06-11 00:20:46 +04:00
scrawl
07d20c212b
Fix crash activating quick key 1
2014-06-10 21:34:47 +02:00
scrawl
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b
Fix character selection caption when there is no character in settings.cfg
2014-06-10 19:01:18 +02:00
scrawl
5a955279bb
Fix main menu background showing when resizing window during load
2014-06-10 18:49:42 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
6ba112619a
Fix dropped items ending up inaccessible when standing in objects with no collision ( Fixes #1441 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
a90245147b
Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor ( Fixes #1423 )
2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1
Implement text replacement for journal topic responses ( Fixes #1429 )
2014-06-10 15:42:50 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
scrawl
4119038f1d
Remove an old workaround ( Fixes #1458 )
2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5
Combat music; some minor combat fixes
2014-06-10 14:20:29 +04:00
scrawl
65d5311037
Revert "Don't try to show exceptions in a message box if SDL was not initialized"
...
According to SDL docs, "This function may be called at any time, even before SDL_Init()".
Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.
This reverts commit 39eea24dc3
2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490
Don't list non-usable items in QuickKeysMenu selection ( Fixes #1427 )
2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc
Savegame dialog: Grey out buttons if no save is selected
2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
2014-06-10 02:27:38 +02:00
scrawl
881ae33b74
Don't allow Creatures with no movement abilities to move ( Fixes #1457 )
2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4
Move video skip detection to WindowManager
...
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
2014-06-10 01:57:54 +02:00
scrawl
7721e54191
Use descriptive names for save files and character folders ( Fixes #1449 )
2014-06-10 00:22:00 +02:00
scrawl
e796fa2313
Add another french morrowind font workaround ( Fixes #1447 )
2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef
old bug + comment fix
2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067
merge openmw master
2014-06-09 22:37:49 +04:00
Marek Kochanowicz
8763309a1b
reformatting to make code easier to read
2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9
check if index is valid before attempting to use it
2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac
correcting problems
2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644
Merge remote-tracking branch 'master/refs' into dialog-fix
...
Conflicts:
CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/world/dialoguesubview.cpp
2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3
subview does not store row number anymore
2014-06-09 11:37:48 +02:00
Marek Kochanowicz
21a1f6f4ae
working on the issue
2014-06-09 10:35:39 +02:00
Marek Kochanowicz
29231b8fc9
starting new branch
2014-06-09 10:26:53 +02:00
scrawl
1bab74a98d
Fix punishment for stealing 0 value items ( Fixes #1435 )
2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3
Change npc training skills to prefer skills with lowest ID if skill values are the same ( Fixes #1445 )
2014-06-09 03:40:14 +02:00
scrawl
a3752da79f
Store Always Run control state in settings
2014-06-08 19:50:39 +02:00
mrcheko
67abc60264
aiming to moving target in ranged combat ai
...
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
2014-06-08 20:59:26 +04:00
Marc Zinnschlag
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02:00
Marc Zinnschlag
b717e3fcb8
Merge remote-tracking branch 'filkry/bug1196jumpdialog'
2014-06-08 11:25:34 +02:00
scrawl
d2dca27067
Correct wrong assertions ( Fixes #1425 )
2014-06-08 11:25:10 +02:00
scrawl
b9dadff5a3
Recognize DELE subrecords at the end of the record ( Fixes #1414 )
2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d
Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )
2014-06-08 11:22:37 +02:00
scrawl
69855097ca
Fix an always true condition (Bug #1355 )
2014-06-08 11:22:37 +02:00
scrawl
b470596206
Handle failed savegame file operations ( Fixes #1413 )
2014-06-08 11:22:37 +02:00
scrawl
2ec324c80b
Consider all splash screens in the Splash folder ( Fixes #1416 )
2014-06-08 11:22:37 +02:00
scrawl
927ae00454
Fix code that stopped animation immediately after starting it, due to thinking it has completed ( Fixes #1370 )
2014-06-08 11:22:37 +02:00
slothlife
51c45796b1
Fix physics to not trigger Bullet assert in Debug
...
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02:00
Fil Krynicki
1d3a220d94
Added A_Use command to player controls.
2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Marc Zinnschlag
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02:00
Marc Zinnschlag
0668019c86
Merge remote-tracking branch 'scrawl/master'
2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6
Fix warning
2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd
Remove unused map
2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5
Don't reserve Pauldron parts for robes ( Fixes #1396 )
2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e
Fix for Bug #1409
2014-06-06 15:13:25 +02:00
scrawl
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
2014-06-06 15:08:44 +02:00
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
scrawl
40d6c8abf7
Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )
2014-06-06 02:24:51 +02:00
scrawl
d442853b3e
Allow opposite gender's parts as fallback ( Fixes #1404 )
2014-06-06 01:30:23 +02:00
scrawl
c36decb855
Fix being able to place items on top of actors ( Fixes #1403 )
2014-06-06 00:43:24 +02:00
scrawl
3d103f3785
Don't block hits when in hand-to-hand combat (shield not visible)
2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4
Don't use armor mitigation for fall damage
2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9
Fix AiCombat being incorrectly added to player ( Fixes #1356 )
2014-06-05 21:51:57 +02:00
scrawl
1173957e56
Fix item weight displaying as 1e+3 for Stendarr's Hammer
2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6
Add missing padding for item tooltip magic effects
2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1
Fix forced switch to third person on death not always working
...
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab
Fix crash when loading a savegame after dying ( Fixes #1389 )
2014-06-05 17:01:22 +02:00
scrawl
4e235516c3
Work around missing character in french morrowind font (Bug #1390 )
2014-06-05 16:16:16 +02:00
scrawl
85c9871178
Use question mark for not found glyphs in the font
2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9
Fix not reacting to quit request while video is playing
2014-06-05 15:52:02 +02:00
scrawl
c0f1449004
Cycle with equipped items if all slots are occupied ( Fixes #1395 )
2014-06-05 14:54:07 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
00775035af
Add missing hasItemHealth for lockpicks/probes ( Fixes #1385 )
2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f
Fix overlapping text in SpellWindow when the window is too small
2014-06-03 01:12:31 +02:00
scrawl
d777739425
Fix a crash on exit when projectiles were active
2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95
Fix for dereferencing past end of mGuiModes.
2014-06-02 17:21:13 -05:00
scrawl
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31
Re-enable collision when an actor is resurrected
2014-06-02 20:45:25 +02:00
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +02:00
scrawl
996e49c534
Change CharacterManager to use list instead of vector
...
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
2014-06-02 20:24:35 +02:00
scrawl
68afac6a19
Fix large size_t being truncated to int
2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c
Merge remote-tracking branch 'slothlife/cmake-fixes'
2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0
Properly handle exceptions when saving the game
...
Add message boxes when an exception occurs while loading or saving the game
2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869
Silence a clang warning
...
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
2014-06-02 10:30:44 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a
Fix loading a savegame when some of its content files were disabled
...
Fixes #1380
2014-06-01 23:11:38 +02:00
Marc Zinnschlag
538aa6607e
Merge remote-tracking branch 'scrawl/master'
2014-06-01 10:25:53 +02:00
Fil Krynicki
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86
1196/1217 fix
...
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
2014-05-31 19:51:21 -04:00
scrawl
dcc0e2d105
When dialogue goodbye is forced, allow using either the red link or the goodbye button
...
Fixes #1373
2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4
Fix trade exploit
...
Using the Max Sale button it was possible to "invert" the buying/selling state.
2014-05-31 18:28:00 +02:00
scrawl
865486604f
Make trade disposition changes temporary again, as in vanilla
2014-05-31 13:57:07 +02:00
scrawl
a1bdf20958
Make trade balance label editable
2014-05-31 13:53:36 +02:00
scrawl
de7fcf0beb
Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item)
...
Fixes #1368
2014-05-31 13:45:47 +02:00
scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02:00
Rohit Nirmal
4f4a37896e
Check if player's CellStore is non-NULL before configuring fog.
...
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
2014-05-30 22:37:13 -05:00
Fil Krynicki
6cc6172779
Update in response to comments.
...
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
2014-05-30 15:12:57 -04:00
scrawl
8761aa5795
Loop main menu video when it's finished playing
2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29
Small fix for menu background
2014-05-30 14:28:04 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548
silenced two warnings
2014-05-30 10:18:05 +02:00
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +02:00
pvdk
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
2014-05-30 02:50:17 +02:00
pvdk
0cc7c06262
Ensure the launcher is not shown when the wizard is run
2014-05-30 02:41:09 +02:00
pvdk
6348af586e
Fixed some problems with the launcher and the wizard
2014-05-30 02:12:48 +02:00
scrawl
b81c7d05c6
Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless)
...
Can still be used by editing the config file, however.
2014-05-29 23:16:36 +02:00
pvdk
a390dde818
Fixed importing configurations of existing installations
2014-05-29 21:17:49 +02:00
