Rob Cutmore
d28e7db65c
Fix tooltip spelling errors in WorldspaceWidget
2016-01-31 08:45:05 -05:00
Alexander "Ace" Olofsson
b3e985fca2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2016-01-30 07:31:00 +01:00
Alexander "Ace" Olofsson
776c715ccd
Move NoTraverseCallback to mwrender/util.hpp
2016-01-29 23:21:58 +01:00
Rob Cutmore
d43315fe4e
Add script editor line wrapping (Feature #2926 )
...
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
2016-01-28 06:28:31 -05:00
Rob Cutmore
4caf44f061
Remove unused code in apps/opencs/view/world/table files
2016-01-26 07:48:55 -05:00
Marc Zinnschlag
1b7a0e5d64
Merge branch 'buttons'
2016-01-26 11:32:26 +01:00
Marc Zinnschlag
1d0ef97bf6
added select all of same ID item to selection mode button menu
2016-01-26 11:31:37 +01:00
Marc Zinnschlag
d5ef40aeb7
minor improvements to wording of instance selection menu items
2016-01-26 10:51:47 +01:00
scrawl
aec8c38461
Move observer_ptr include where it belongs
2016-01-25 21:03:33 +01:00
scrawl
fc6fe9acfb
Do not crash ModVertexAlphaVisitor when there are no vertex colors
2016-01-25 18:52:20 +01:00
Marc Zinnschlag
a89859aeb7
Merge remote-tracking branch 't6/patch-freebsd'
2016-01-25 16:26:58 +01:00
Marc Zinnschlag
39e1b06101
fixed deletion of objects that are selected (was leaving a node behind)
2016-01-25 16:18:55 +01:00
Marc Zinnschlag
790367b980
fixed object removal via setting state to delete
2016-01-25 16:12:20 +01:00
Marc Zinnschlag
c1f0aa7260
added delete selection item to selection mode button menu
2016-01-25 14:55:02 +01:00
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
2016-01-25 14:13:16 +01:00
Rob Cutmore
fbca094dda
Fix input validation in StartScriptCreator
2016-01-24 20:15:27 -05:00
Rob Cutmore
b93b97575e
Improve start script creation ( Fixes #3024 )
...
Improved start script creation by updating input to be a drop target
and adding auto-completion.
2016-01-24 11:54:53 -05:00
scrawl
b0431833a1
Fix some defects reported by Coverity CI
2016-01-21 16:08:04 +01:00
scrawl
f0971ee8ad
Implement Fixme script instruction
2016-01-20 04:07:07 +01:00
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
2016-01-19 22:11:46 +01:00
scrawl
ce9a18fb87
Merge pull request #879 from jordan-ayers/bugfix/1544
...
Improve Drop Command - Bugfix/1544
2016-01-19 15:02:51 +01:00
Marc Zinnschlag
45e6974266
added select all and clear selection features
2016-01-19 14:25:20 +01:00
Marc Zinnschlag
4a02563708
Merge branch 'master' into buttons
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-19 13:59:24 +01:00
Marc Zinnschlag
ecbcd6b171
allow mode buttons to setup the context menu
2016-01-19 12:52:30 +01:00
Marc Zinnschlag
eee972a1a4
added scene tool mode context menu feature
2016-01-19 12:47:11 +01:00
Marc Zinnschlag
0305ae3693
added selection mode UI
2016-01-19 12:17:13 +01:00
Jordan Ayers
5699cf7f09
Barter: Leave unsold projectiles equipped.
2016-01-18 20:00:18 -06:00
Jordan Ayers
1ff49cc637
Improve Drop command behavior. ( Fixes #1544 )
2016-01-18 19:58:19 -06:00
Jordan Ayers
c82d9a1e87
Adjust ContainerStore / InventoryStore to allow partial unequip of items.
2016-01-18 19:56:35 -06:00
Aesylwinn
bbda5fe634
Removed hints from error messages and fixed naming to match conventions
2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba
gmst verifier
2016-01-17 21:55:03 -05:00
Rob Cutmore
08b469c0d0
Remove unused forward declarations in filedialog.hpp
2016-01-17 14:18:49 -05:00
Rob Cutmore
21d13a48fa
Make setup method of MainDialog class private
2016-01-16 06:43:45 -05:00
Marc Zinnschlag
ddb606a9fa
Merge remote-tracking branch 'rcutmore/cleanup-unused-code'
2016-01-16 10:54:16 +01:00
Rob Cutmore
a5411c1ec2
Remove unused code
2016-01-15 20:51:39 -05:00
mrcheko
b304e98568
implement ActionWeapon::getCombatRange (move logic from AiCombat)
2016-01-15 21:49:27 +03:00
scrawl
87beb73970
Correction
2016-01-15 16:34:57 +01:00
scrawl
fbf07133ea
Document usage of node masks
2016-01-15 16:31:24 +01:00
scrawl
18320b2cd0
Move the Button enum to WorldSpaceWidget
2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
Marc Zinnschlag
c1901069be
added instance mode sub-modes
2016-01-15 12:07:25 +01:00
scrawl
4f2a031f4e
Improve error message
2016-01-14 18:34:47 +01:00
scrawl
0b84b3c2cf
Don't crash when region weather chances don't add to 100
...
The invalid weather ID was resulting in out-of-bounds vector access later in the code.
2016-01-14 17:41:39 +01:00
scrawl
091ca9743e
Do not write LandData twice ( Fixes #3140 )
2016-01-14 16:41:50 +01:00
Marc Zinnschlag
e07be2d912
Merge branch 'drop'
2016-01-14 13:36:51 +01:00
Marc Zinnschlag
55627c0853
handling drops into cells that do not exist or are not shown
2016-01-14 13:20:01 +01:00
Marc Zinnschlag
6eba647a9d
added accessor function for cell selection in paged worldspace
2016-01-14 13:19:37 +01:00
Jordan Ayers
2ce2e8a1e7
Add missing OOB slot check to InventoryStore.
2016-01-12 21:35:23 -06:00
scrawl
ef1a1125e0
Fix an error in restocking logic ( Fixes #3131 )
2016-01-12 17:10:23 +01:00
scrawl
4e6a60672d
When a spell explodes on an actor do not apply it to that actor twice ( Fixes #3142 )
2016-01-12 00:40:09 +01:00
scrawl
458a305bff
OpenCS: add lighting mask
2016-01-11 23:14:43 +01:00
scrawl
7f967153ef
OpenCS: create light sources
2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3
OpenCS: add a mask for particle systems
2016-01-11 23:10:16 +01:00
scrawl
ad2145b463
OpenCS: use a separate enum for the toggle buttons
2016-01-11 23:10:16 +01:00
scrawl
3089aeccc4
Factor out SceneUtil::addLight
2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0
Move configureLight to a separate file
2016-01-11 23:10:16 +01:00
scrawl
fb849014bd
Pass the fallback map to CSMWorld::Data
2016-01-11 23:10:16 +01:00
scrawl
11496b8075
Read fallback settings in OpenCS
2016-01-11 23:10:16 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
scrawl
f315a4386f
Accept an implicit reference in Journal ( Fixes #3135 )
2016-01-11 23:07:01 +01:00
scrawl
ef20962fc5
Disable fog of war rendering on the HUD map by default
2016-01-11 22:58:08 +01:00
scrawl
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
4690fd3f22
Change the local map exploration radius to better match the original engine
2016-01-11 22:57:57 +01:00
scrawl
4f8f166f69
Fix GetPcInJail to work as in the original engine
2016-01-11 22:57:25 +01:00
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
2016-01-11 22:57:16 +01:00
Marc Zinnschlag
5b9d6cce98
made drop distance configurable
2016-01-11 09:03:02 +01:00
Marc Zinnschlag
7dd7be7f0e
make scenes drop target for referenceables
2016-01-10 08:56:15 +01:00
Marc Zinnschlag
466f91db67
Fixed wrong GMST name for newly created game files ( Fixes #3132 )
2016-01-06 13:10:09 +01:00
scrawl
745b29a995
Remove a debugging leftover
2016-01-05 17:01:21 +01:00
scrawl
d9d6228c94
Implement PageDisplay::_updateView ( Fixes #3125 )
2016-01-05 16:54:09 +01:00
scrawl
5952498e9e
Explicitely cast a size_t to int
2016-01-05 16:53:51 +01:00
scrawl
446c714727
Fix a possible memory leak in error case
2016-01-04 20:39:08 +01:00
scrawl
e6619c5306
Rebuild actor animations on resurrection ( Fixes #3124 )
...
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
2016-01-04 20:27:38 +01:00
scrawl
daa94cc50e
Fix cppcheck warnings
2016-01-03 20:19:38 +01:00
mrcheko
bcb1f4ed05
refactor AiCombat: remove all pathfinding code, adopt new version of
...
AiPackage::pathTo;
fix couple of warnings;
2016-01-03 15:33:52 +03:00
Poncho
b1020dcd42
Use correct direction multipliers during awareness check
2016-01-02 12:24:39 -06:00
scrawl
1905f0bf2d
Add support for placing BodyParts in a cell (Bug #3118 )
2016-01-02 01:30:06 +01:00
scrawl
a9f0f30bb8
Reject conditions testing agaist Choice when not currently in a choice ( Fixes #3117 )
2016-01-01 23:55:52 +01:00
mrcheko
b960b0af93
rewrite pathTo for clearer logic; reapply Scrawl's aifollow threshold
2016-01-01 16:41:45 +03:00
scrawl
0333c40047
Fix typo in SameRace dialogue function (function was inverted, Fixes #3116 )
2016-01-01 02:59:55 +01:00
scrawl
6fde02ea42
LocalScripts: initialize mIter
2016-01-01 02:59:55 +01:00
scrawl
7f7e8c63bf
Correct path to gamecontrollerdb.txt ( Fixes #3112 )
2015-12-31 00:37:47 +01:00
mrcheko
d7d5cc6689
Merge remote-tracking branch 'upstream/master' into pathfinding
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aifollow.cpp
apps/openmw/mwmechanics/aipackage.cpp
apps/openmw/mwmechanics/aipackage.hpp
apps/openmw/mwmechanics/aiwander.cpp
apps/openmw/mwmechanics/pathfinding.hpp
Ogre::Vector3->osg::Vec3f; REACTION_INTERVAL->AI_REACTION_TIME; MakeOgreVec3->MakeOsgVec3
2015-12-29 19:15:40 +03:00
scrawl
63b9b075aa
Do not allow soul trapping the same creature more than once ( Fixes #3102 )
2015-12-26 18:47:22 +01:00
scrawl
0bec6e5fbe
Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation
2015-12-26 18:45:09 +01:00
scrawl
6b67911658
Unset DrawState_Spell when becoming a werewolf
2015-12-26 18:26:55 +01:00
scrawl
f052c05018
Move werewolf functions from World to MechanicsManager
2015-12-26 18:23:13 +01:00
scrawl
53334d08a2
Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves ( Fixes #3100 )
2015-12-26 18:15:57 +01:00
Alexander "Ace" Olofsson
d3da51bbb2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-26 00:30:51 +01:00
scrawl
a1e163ed20
Correct an error in the timestamp subtracting logic ( Fixes #3105 )
2015-12-26 00:26:13 +01:00
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6
Make Qt5 happy
2015-12-24 02:48:00 +01:00
Marc Zinnschlag
2162f21550
Merge branch 'drop'
2015-12-20 10:18:05 +01:00
Aesylwinn
9bd14215d7
Expanded inventory check to creatures and NPCs
2015-12-19 22:02:39 -05:00
Aesylwinn
4c14117761
Added checks to verifier for container inventories
2015-12-19 20:03:00 -05:00
scrawl
db7b80b503
Revert "Accept a ConstPtr in ItemPtr tooltips"
...
This reverts commit 41c8ec56e0
.
Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
2015-12-19 22:52:35 +01:00
scrawl
2176ac592c
Call updateDialogueGlobals before dialogue starts ( Fixes #3034 )
2015-12-19 21:58:49 +01:00
scrawl
5ac226f519
Another collision mask fix
2015-12-19 17:02:57 +01:00
scrawl
e5d9ee30f4
Add count argument to copyObjectToCell
...
Fixes the gold bug introduced in c9ca5bc946
2015-12-19 16:48:32 +01:00
scrawl
41c8ec56e0
Accept a ConstPtr in ItemPtr tooltips
2015-12-19 16:37:26 +01:00
scrawl
5a7bbbd508
Accept a ConstPtr in ToolTips::setFocusObject
2015-12-19 16:34:26 +01:00
scrawl
32d5dece58
Add count argument to getToolTipInfo
2015-12-19 16:29:07 +01:00
scrawl
0d4729dcd5
Use the const version of CustomData::as*
2015-12-19 16:19:52 +01:00
scrawl
16e3699739
Fix collision mask in castSphere
2015-12-19 16:18:12 +01:00
scrawl
b0894ea20d
Accept a ConstPtr in hasToolTip
2015-12-19 16:15:45 +01:00
scrawl
29d0f448b4
Add const version of World::getAnimation
2015-12-19 16:15:45 +01:00
scrawl
51c77c5045
Accept a ConstPtr in getDoorState
2015-12-19 16:15:45 +01:00
scrawl
7a2ca5580a
Accept a ConstPtr in RippleSimulation
2015-12-19 15:51:41 +01:00
scrawl
53f4b92426
AiEscort do not follow target through doors
...
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
2015-12-19 15:15:44 +01:00
scrawl
2c51e7345f
Use a separate collision type for doors ( Fixes #1962 )
2015-12-18 18:32:42 +01:00
scrawl
604b5d24e9
Use a ConstPtr in SoundManager
2015-12-18 18:11:30 +01:00
scrawl
a0fb31e3b1
Accept a ConstPtr in getLOS
2015-12-18 18:03:47 +01:00
scrawl
029d467ea5
Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy
2015-12-18 18:00:18 +01:00
scrawl
388aed1748
Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions
2015-12-18 17:56:48 +01:00
scrawl
ed101ad35a
Remove redundant getPlayerAnimation function
2015-12-18 17:44:57 +01:00
scrawl
c9ca5bc946
Accept a ConstPtr in placeObject
2015-12-18 17:42:59 +01:00
scrawl
6c505ca06f
Accept a ConstPtr in getHitContact
2015-12-18 17:38:21 +01:00
scrawl
0796f49c17
Accept a ConstPtr in various physics getters
2015-12-18 17:36:14 +01:00
scrawl
795032621c
Use a ConstPtr for the ActorMap and ObjectMap
2015-12-18 17:30:39 +01:00
scrawl
7a8a7e3dd6
Add const version of getAnimation
2015-12-18 17:21:51 +01:00
scrawl
7a4aac1842
Use a ConstPtr for the PtrAnimationMap
2015-12-18 17:20:29 +01:00
scrawl
553132cb51
Accept a ConstPtr in launchProjectile
2015-12-18 17:13:54 +01:00
scrawl
8f9fc87565
Accept a ConstPtr in LocalScripts::setIgnore
2015-12-18 17:09:11 +01:00
scrawl
1212c07266
Pass a string by reference
2015-12-18 17:08:26 +01:00
scrawl
f35ab12979
Accept a ConstPtr in InventoryStore::isEquipped
2015-12-18 17:06:58 +01:00
scrawl
3856f931db
Accept a ConstPtr in ContainerStore::addNewStack
2015-12-18 17:04:54 +01:00
scrawl
e1c6261fee
Accept a ConstPtr in ContainerStore::getType
2015-12-18 17:03:49 +01:00
scrawl
edde5bd065
Accept a ConstPtr in ContainerStore::stacks
2015-12-18 17:01:21 +01:00
scrawl
04f7a8f8eb
Remove redundant getId function
2015-12-18 16:58:38 +01:00
scrawl
266fbbef48
Accept a ConstPtr in canLock
2015-12-18 16:50:32 +01:00
scrawl
c43f80633a
Accept a ConstPtr in getEnchantmentPoints
2015-12-18 16:48:19 +01:00
scrawl
303521002d
Accept a ConstPtr in adjustScale
2015-12-18 16:46:02 +01:00
scrawl
09bdb0ad4b
Accept a ConstPtr in getServices
2015-12-18 16:44:35 +01:00
scrawl
648ee6e7fb
Accept a ConstPtr in applyEnchantment
2015-12-18 16:43:11 +01:00
scrawl
3c98f8dde3
Accept a ConstPtr in isPersistent
2015-12-18 16:41:37 +01:00
scrawl
3fe3091275
Accept a ConstPtr in isEssential
2015-12-18 16:39:35 +01:00
scrawl
4a47fc32fa
Accept a ConstPtr in getBloodTexture
2015-12-18 16:39:08 +01:00
scrawl
2bd8d60e9f
Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank
2015-12-18 16:33:54 +01:00
scrawl
2ac92012e8
Accept a ConstPtr in isClass
2015-12-18 16:29:30 +01:00
scrawl
5b082be79f
Accept a ConstPtr in getBaseGold
2015-12-18 16:28:20 +01:00
scrawl
da7ebfde99
Accept a ConstPtr in copyToCell
2015-12-18 16:27:18 +01:00
scrawl
954186fe1e
Accept a ConstPtr in canFly, canSwim & canWalk
2015-12-18 16:27:18 +01:00
scrawl
b09bdd6af5
Accept a ConstPtr in isBipedal
2015-12-18 16:27:18 +01:00
scrawl
92a3acfa56
Accept a ConstPtr in getBaseFightRating
2015-12-18 16:12:35 +01:00
scrawl
d120f76031
Accept a ConstPtr in getSound
2015-12-18 16:11:03 +01:00
scrawl
d77f785cbc
Accept a ConstPtr in get*SoundId
2015-12-18 16:09:54 +01:00
scrawl
dc92fefd2b
Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth
2015-12-18 16:06:31 +01:00
scrawl
e0bb284804
Accept a ConstPtr in getWeight
2015-12-18 16:00:50 +01:00
scrawl
0047a2d330
Accept a ConstPtr in canSell
2015-12-18 15:58:45 +01:00
scrawl
2bc851c7d3
Accept a ConstPtr in getEnchantment
2015-12-18 15:56:45 +01:00
scrawl
beb8805a12
Accept a ConstPtr in getInventoryIcon
2015-12-18 15:53:47 +01:00
scrawl
f258c5c508
Accept a ConstPtr in getModel
2015-12-18 15:51:05 +01:00
scrawl
d9bbd83b09
Accept a ConstPtr in getToolTipInfo
...
Accept a ConstPtr in functions used by getToolTipInfo
2015-12-18 15:47:16 +01:00
scrawl
d3d6a69eea
Merge pull request #862 from scrawl/const
...
ConstPtr
2015-12-18 15:20:34 +01:00
scrawl
bc50587e71
Remove comment
2015-12-18 14:33:15 +01:00
Marc Zinnschlag
102397067c
added interface for per edit-mode drop handling
2015-12-18 14:04:53 +01:00
Marc Zinnschlag
37a72d1ea6
reject unsuitable drops to WorldspaceWidget earlier
2015-12-18 12:38:45 +01:00
scrawl
b2add6470b
Missing include fix
2015-12-18 02:58:38 +01:00
scrawl
1c8244276d
Exception handling improvements (Bug #3090 )
2015-12-18 02:36:34 +01:00
scrawl
a344183247
Comment fix
2015-12-18 02:34:42 +01:00
scrawl
ed3486e816
Improve const-correctness in writeAdditionalState
2015-12-18 00:19:06 +01:00
scrawl
b48445dea7
Accept a ConstPtr in getScript
2015-12-18 00:12:03 +01:00
scrawl
eb51e2838f
Utilize the mHasCustomData flag in writeAdditionalState
2015-12-18 00:07:40 +01:00
scrawl
19d87c78f2
Add CellStore::forEachConst
2015-12-17 23:59:18 +01:00
scrawl
d4eba794c3
Add ConstPtr
2015-12-17 23:34:52 +01:00
scrawl
c9d02c67c0
Remove unneeded const_cast in TerrainStorage
2015-12-17 23:33:47 +01:00
scrawl
2fe2f53b02
Set the changed flag in CellStore::search ( Fixes #3089 )
2015-12-17 22:37:41 +01:00
scrawl
04b6571d7d
Fix logic for scripting access of deleted objects
2015-12-17 20:34:50 +01:00
scrawl
e564c26314
Fix deleted objects being accessible in the Cells cache
2015-12-17 20:18:15 +01:00
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
2015-12-17 20:17:38 +01:00
scrawl
689dea4cb3
Add instant spell effects to the actor's magic effect list
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&start=20#p36208
2015-12-17 19:49:37 +01:00
scrawl
d6bcb7906d
Fix crash in a warning message
2015-12-17 16:11:20 +01:00
Marc Zinnschlag
6b626c2954
spelling fixes
2015-12-17 13:06:37 +01:00
scrawl
fce43854bc
Fix last commit
2015-12-17 03:50:15 +01:00
scrawl
0a723ab075
Animation: do not assume the object root is a Group
2015-12-17 03:48:11 +01:00
scrawl
31c3324705
Don't assume the emitter node is a Group ( Fixes #3082 )
...
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
2015-12-17 03:38:26 +01:00
scrawl
8222c78cf2
Do not filter creature dialogue by NPC-only conditions ( Fixes #3086 )
2015-12-16 01:30:04 +01:00
scrawl
d5a2586f38
LoadingScreen: add support for important labels
...
Used in saveGame so the player can be sure whether or not the game was saved.
Fixes #3074
2015-12-15 21:16:20 +01:00
scrawl
67883feaae
LoadingScreen: ensure values are within progress range
2015-12-15 21:05:35 +01:00
scrawl
625644e917
LoadingScreen: documentation updates
2015-12-15 21:03:56 +01:00
scrawl
152f1d625d
LoadingScreen: remove unused declarations
2015-12-15 20:54:21 +01:00
scrawl
ccbba5e926
LoadingScreen: remove indicateProgress, not used
2015-12-15 20:52:23 +01:00
scrawl
375caf037d
Don't applyInstantEffect when magnitude is zero
2015-12-15 20:46:05 +01:00
scrawl
4af376133b
Don't tick effects when duration is zero
2015-12-15 20:41:00 +01:00
scrawl
6ee7c61667
CSMPrefs: fix deadlock in toColor()
2015-12-15 19:33:28 +01:00
scrawl
4553db7b43
Merge pull request #861 from scrawl/soundcrash
...
Fix crash when running out of sound sources
2015-12-15 18:23:03 +01:00
scrawl
6a749e77f2
Fix crash when running out of sound sources
2015-12-15 15:12:48 +01:00
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
2015-12-15 14:58:04 +01:00
Marc Zinnschlag
be19da189a
fixed user settings not being saved when last document window is closed while user settings window is still open
2015-12-15 14:56:29 +01:00
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
2015-12-15 14:51:25 +01:00
Marc Zinnschlag
c646533448
removed old user settings system
2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144
final batch of changing over user settings usage to the new system
2015-12-15 12:44:04 +01:00
Marc Zinnschlag
44925e9fc8
fixed records settings (Text Only wasn't updating)
2015-12-15 12:26:08 +01:00
Marc Zinnschlag
591564566c
made user settings access thread-safe
2015-12-15 12:19:48 +01:00
Marc Zinnschlag
ecbd68a19b
third batch of changing over user settings usage to the new system
2015-12-15 10:40:00 +01:00
Chris Robinson
cddea4a99c
Start underwater sound after updating sounds
...
In between the startUpdate/finishUpdate calls, changes are deferred so that
they can happen all at once. This includes starting sounds, so when the
underwater sound is started it will be immediately checked to see if it's
playing. Since it's not yet playing, it'll be seen as stopped and get cleaned
up before ever playing.
2015-12-14 14:05:01 -08:00
Marc Zinnschlag
a3a2c2f476
second batch of changing over user settings usage to the new system
2015-12-14 17:38:33 +01:00
Marc Zinnschlag
346052a67a
Merge remote-tracking branch 'scrawl/containerscript_fix'
2015-12-14 14:19:05 +01:00
scrawl
572786bff2
Instant effects that were added by a permanent ability are applied every frame
...
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&p=36120#p36121
2015-12-14 03:27:49 +01:00
scrawl
271fcb80c6
Remove container scripts before deleting container
2015-12-14 02:57:55 +01:00
Chris Robinson
8c364cd818
Remove left over declaration
2015-12-13 17:13:36 -08:00
Chris Robinson
12eda97e64
Merge remote-tracking branch 'main/master'
2015-12-13 17:06:04 -08:00
Chris Robinson
f1faeeae3a
Use separate config options for min and mag texture filters
2015-12-13 17:05:19 -08:00
scrawl
2737aabe93
Pc functions apply to creature dialogue ( Fixes #3078 )
2015-12-14 01:52:13 +01:00
Chris Robinson
5c0a847eaf
Combine some duplicate code
2015-12-13 16:51:27 -08:00
scrawl
fb9f5f8fe8
Fix typo
2015-12-14 01:36:53 +01:00
Chris Robinson
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
2015-12-13 16:02:09 -08:00
Chris Robinson
646092ce3a
Add warnings when loading unknown texture options
2015-12-13 15:20:59 -08:00
Chris Robinson
fb6abb53ae
Simplify the in-game texture options
...
This makes it behave like it originally did, although the config options remain
expanded.
2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13
Separate and expand texture filtering options
2015-12-13 11:25:01 -08:00
scrawl
a7e0562e1c
Fix improper handling of multiple AiFollow packages with the same target ( Fixes #3077 )
2015-12-13 17:42:11 +01:00
scrawl
64424e7262
Move keyframe loading out of SceneManager to new KeyframeManager
2015-12-13 15:31:07 +01:00
scrawl
359b0b3772
Rename for clarity
2015-12-12 22:37:23 +01:00
scrawl
18cce3a6f9
Don't reset delete flag when loading reference from a save game ( Fixes #2724 )
2015-12-12 22:34:59 +01:00
scrawl
850092a5e5
Store: be consistent about struct / class usage
...
Don't inherit a struct from a class, and vice versa.
2015-12-12 22:34:59 +01:00
Marc Zinnschlag
cf9fa0e0e9
first batch of changing over user settings usage to the new system
2015-12-12 14:49:16 +01:00
Marc Zinnschlag
0ffe4290fb
workaround for MOC's lack of namespace awareness
2015-12-12 12:05:56 +01:00
Marc Zinnschlag
04a11679fb
added category update function
2015-12-12 11:58:53 +01:00
Chris Robinson
f47f0a996f
Stop the object's old say sound before playing the new one
2015-12-11 15:49:45 -08:00
Chris Robinson
7fc2df153a
Rename stopSound/stopStream to finishSound/finishStream
...
Since they're also used to clean up output resources, not just stopping.
2015-12-11 15:13:14 -08:00
scrawl
cc2315a0de
Minor fix
2015-12-11 16:59:13 +01:00
scrawl
b856460f86
ESMStore: fill mIds in setUp()
2015-12-11 16:55:28 +01:00
scrawl
ed27f0da25
Merge pull request #854 from kcat/master
...
Play NPC voices from the head position
2015-12-11 16:21:06 +01:00
Marc Zinnschlag
3a5238bebc
changed the settingChanged signature to accommodate queued connections
2015-12-11 12:06:20 +01:00
Marc Zinnschlag
8245b9e439
added interface for querying settings
2015-12-11 11:50:06 +01:00
Marc Zinnschlag
31b105ad9e
improved settings layout
2015-12-11 11:32:55 +01:00
Marc Zinnschlag
a907b4ab15
made Setting class non-abstract
2015-12-11 11:22:15 +01:00
Marc Zinnschlag
73ffdd5ac5
added colour settings
2015-12-11 11:15:14 +01:00
Chris Robinson
808f701013
Use the actor's Head position for Say streams
2015-12-10 17:48:45 -08:00
Chris Robinson
a47bdecac7
Add missing include
...
Since Ptr is used directly in the header, a forward declaration isn't good
enough.
2015-12-10 17:47:55 -08:00
Chris Robinson
a00a4bce77
Avoid some unnecessary indirection
2015-12-10 16:33:27 -08:00
scrawl
f1f82af64e
Fix improper swimming animations in first person mode
2015-12-11 01:24:42 +01:00
Marc Zinnschlag
590d6eba9b
added enum settings
2015-12-10 17:33:14 +01:00
Marc Zinnschlag
8050eba83b
added a few comments
2015-12-10 13:33:44 +01:00
Marc Zinnschlag
b0fb6d56f1
added bool settings
2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647
added double settings
2015-12-10 10:58:38 +01:00
scrawl
9bc6f2d5f6
Fix water ripples
2015-12-09 20:35:51 +01:00
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
2015-12-09 20:12:45 +01:00
MatthewRock
ddd4004c95
Fix: remove space
2015-12-09 18:26:33 +01:00
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
2015-12-09 18:24:35 +01:00
scrawl
a8c287c831
Print detected game controllers to the log file
2015-12-09 14:33:02 +01:00
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
2015-12-09 14:10:57 +01:00
scrawl
6f98982bc2
Make sure that health is >= 1 when resurrecting the player ( Fixes #2972 )
2015-12-09 01:52:20 +01:00
scrawl
05f1fbf593
WindowManager: explicitely pass the ESMStore
...
Fixes potential crash when the loading screen layout tries to retrieve a GMST value via #{GMST} syntax before the World has been created.
Possibly related to Bug #2854 .
2015-12-09 01:09:09 +01:00
scrawl
a699b4128a
Add isInCell checks to PlaceAt and PlaceItem ( Fixes #2873 )
...
Avoids the game crashing when a script calls these functions before the player has been moved to the starting location.
2015-12-09 00:49:50 +01:00
scrawl
34f48d63f3
Apply spell absorption once per effect ( Fixes #2942 )
2015-12-09 00:35:54 +01:00
scrawl
bc1f7499ab
Do not allow deleting the player object ( Fixes #2982 )
2015-12-09 00:26:39 +01:00
MatthewRock
b0e6a52595
Replace ancestor with parent
2015-12-08 22:45:16 +01:00
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
2015-12-08 22:39:11 +01:00
scrawl
2f9b404094
InstallationPage: properly exit the QThread ( Fixes #2210 )
2015-12-08 21:41:35 +01:00
scrawl
1264651af7
Fix coverity defects
2015-12-08 21:12:05 +01:00
Marc Zinnschlag
c61d717e41
added integer settings
2015-12-08 17:21:58 +01:00
scrawl
e69750905a
Fix gcc warning about function casts
2015-12-08 16:51:50 +01:00
scrawl
bd68ebac62
GetEffect fix
2015-12-08 15:24:02 +01:00
scrawl
3890afd6f5
Merge pull request #843 from kcat/master
...
Add HRTF options and fix an incorrect SoundID
2015-12-08 13:59:15 +01:00
Marc Zinnschlag
c158224314
fixed a faulty include
2015-12-08 12:09:53 +01:00
Marc Zinnschlag
5e40b4d2e8
page switching mechanism
2015-12-08 12:04:45 +01:00
Marc Zinnschlag
0dc3d10112
some simplification
2015-12-08 09:56:42 +01:00
Marc Zinnschlag
071ba3a4df
Merge remote-tracking branch 'scrawl/werewolf'
2015-12-08 09:28:35 +01:00
scrawl
07b064f616
Rename to lowerCaseInPlace
2015-12-07 22:49:15 +01:00
scrawl
e3d3380c8c
Remove return value for in-place toLowerStr
2015-12-07 22:43:08 +01:00
scrawl
4dd4c5394b
Broken lower-casing fix
2015-12-07 22:30:37 +01:00
scrawl
42d68eb7fb
Build fix
2015-12-07 22:29:57 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
1a654fa451
Reset locale after strftime() call
2015-12-07 21:24:30 +01:00
scrawl
152f415b9a
Change texture coordinates when falling back to player_hit_01
2015-12-07 18:32:58 +01:00
scrawl
998ef36837
Setting fix
2015-12-07 18:04:23 +01:00
scrawl
e520d37c87
Override the field of view for first person meshes ( Fixes #858 , Fixes #3051 )
2015-12-07 16:29:30 +01:00
scrawl
9621b66b78
Move field of view setting to Camera section
2015-12-07 16:23:06 +01:00
scrawl
136a425cec
Use the Werewolf field of view override ( Fixes #3064 )
...
Need to re-run the settings importer for the feature to work.
2015-12-07 16:11:47 +01:00
scrawl
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
2015-12-07 15:33:04 +01:00
scrawl
5981e1cbb3
Don't create the werewolf overlay if its texture is not available
...
Avoiding a warning in the log when Bloodmoon is not installed
2015-12-07 14:41:33 +01:00
scrawl
621347b20f
Remove moved ref handling from listRefs()
...
Not needed since we now load cells when a reference is moved there.
2015-12-07 03:55:26 +01:00
scrawl
1875aa4a18
Restore getNearbyDoor
2015-12-07 03:53:46 +01:00
scrawl
f9dd549bff
Restore FindContainerVisitor
2015-12-07 03:47:40 +01:00
scrawl
1f543b4d79
Apply the AiTravel maxRange to AiEscort as well ( Fixes #2697 )
2015-12-07 00:26:17 +01:00
scrawl
65b5cbe3f7
AiEscortCell complains if no cell was given or cell does not exist
2015-12-06 23:42:58 +01:00
scrawl
965bea45c0
AiEscort makes the actor side with target in fights (Bug #2697 )
...
Also will follow the player through teleport doors.
2015-12-06 23:38:51 +01:00
scrawl
4e678ce6b3
Handle mCellId in AiEscort
2015-12-06 23:38:51 +01:00
scrawl
45a609bc54
Improve PositionCell warning message
2015-12-06 22:37:04 +01:00
scrawl
4b0ecaa0a0
Fix physics bug
2015-12-06 22:10:01 +01:00
scrawl
51b892195b
Restore getReadOnlyDoors()
2015-12-06 21:58:25 +01:00
scrawl
abcf91be5b
Port over more game logic to the visitor pattern
2015-12-06 20:43:50 +01:00
scrawl
9ea475d00c
Port LocalScripts::addCell to new CellStore interfaces
2015-12-06 20:33:22 +01:00
scrawl
a517f4f9ba
Add CellStore::forEachType to help with porting over game logic to the new interfaces
2015-12-06 20:32:39 +01:00
scrawl
0af33b5abd
Throw exception if moveTo() is passed an object not part of *this
2015-12-06 20:05:13 +01:00
scrawl
176a3c16f4
Resolve moved references loaded from a save game
2015-12-06 20:00:24 +01:00
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
2015-12-06 19:11:25 +01:00
scrawl
2219231230
Missing updateMergedRefs()
2015-12-06 18:46:49 +01:00
scrawl
138957c49a
Special case objects with no refnum
2015-12-06 18:43:52 +01:00
scrawl
5e99a3eda6
Rename CellStore Functor to Visitor
2015-12-06 18:13:04 +01:00
scrawl
2301080c63
Load CellStore when an object is moved there
2015-12-06 18:04:48 +01:00
scrawl
811df1e97b
Pass the ESM reader list to CellStore constructor
2015-12-06 18:03:55 +01:00
Paul Cercueil
0765ff3ba2
mwrender: Add missing includes
...
Those missing includes were causing the build to fail when compiled with
USE_GLES set.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 16:01:21 +01:00
Marc Zinnschlag
b37a2ac09c
user settings categories
2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
2015-12-06 11:18:31 +01:00
Chris Robinson
91cd6be11b
Use the correct SoundId for NPC "land" sounds
2015-12-05 18:00:28 -08:00
Chris Robinson
c75303b652
Add an option to select and enable HRTF
2015-12-05 17:14:53 -08:00
Marc Zinnschlag
03a0b1fbfd
Merge remote-tracking branch 'origin/master'
2015-12-05 15:41:20 +01:00
scrawl
53158d29b1
stopSound crash fix
2015-12-05 01:54:16 +01:00
scrawl
66bcd2fd68
Write save games to a memory stream first
...
Two motivations for doing this:
- If the user chooses to overwrite existing save file, and there is an exception during the save process, the existing file will not be lost.
- Many small writes to a file are slow. Very slow. Writing to memory first then writing the completed file to disk appears to be ~500% faster.
2015-12-05 01:15:54 +01:00
scrawl
67a6a8f5d4
Make projectiles receive lighting
2015-12-05 00:44:18 +01:00
scrawl
6181594251
Disable freezeOnCull for magic projectile particles
2015-12-05 00:33:01 +01:00
scrawl
a8938589f6
Magic projectiles rotate during flight
2015-12-05 00:33:01 +01:00
scrawl
3f93af4181
Projectiles interact with the water surface ( Fixes #2986 )
2015-12-04 23:28:11 +01:00
scrawl
3dcefd17fc
Fix CellStore::count()
2015-12-04 20:03:14 +01:00
scrawl
3aa53f3cb4
Object cell movement tracker works. Savegame handling is still missing and some game functionality is still stubbed out.
2015-12-04 19:46:02 +01:00
scrawl
64b4926127
Add reference moving logic - untested
2015-12-04 18:29:41 +01:00
scrawl
7a983340bf
Add comment
2015-12-04 18:29:41 +01:00
scrawl
fc449233be
Restore support for inserting objects into a cell
2015-12-04 18:29:41 +01:00
scrawl
0975f60d59
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
2015-12-04 18:29:41 +01:00
Marc Zinnschlag
49b37ce8bf
Merge remote-tracking branch 'scrawl/geteffect'
2015-12-04 10:42:22 +01:00
scrawl
8e9571d155
Double buffer the light StateAttributes and StateSets
...
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
f22982d251
Merge pull request #835 from sandstranger/opengles1
...
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
5f349b9a6e
Support effects with attribute/skill argument in OpGetEffect
2015-12-03 21:12:58 +01:00
scrawl
1ec338f19d
Don't attempt to load external keyframes for non-NIF files
2015-12-03 20:11:28 +01:00
scrawl
795f6d77f2
Cache the Animation's Skeleton
2015-12-03 20:06:00 +01:00
Marc Zinnschlag
e0c9265148
Merge remote-tracking branch 'origin/master'
2015-12-03 15:56:24 +01:00
scrawl
389b168d5f
Restore OpGetWaterLevel to vanilla behaviour
2015-12-03 15:48:27 +01:00
scrawl
d0c6b407b4
Fix isUnderwater checks being off by one for exterior cells
2015-12-03 15:16:50 +01:00
scrawl
86881bcf39
In first person mode, attach sound listener to the camera
2015-12-03 15:16:20 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
Chris Robinson
f19f1c47c8
Fix playing pending voices without a Ptr
2015-12-02 16:09:25 -08:00
Chris Robinson
2face3d0a9
Combine duplicate code
2015-12-02 16:09:25 -08:00
Chris Robinson
1407366e51
Use a premade SoundStream object for the output's streamSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
2ee3265b66
Use a premade Sound object for the output's playSound functions
2015-12-02 16:09:25 -08:00
Chris Robinson
53718a5ca0
Use a typedef for the sound instance handle
2015-12-02 16:09:25 -08:00
Chris Robinson
3a39a92b93
Keep track of audio tracks
2015-12-02 16:09:24 -08:00
Chris Robinson
2883cdba5c
Initialize the Sound object before modifying the pitch variable
2015-12-02 16:09:24 -08:00
Chris Robinson
a6db96b2d8
Update sound and stream parameters
2015-12-02 16:09:24 -08:00
Chris Robinson
4bd235284b
Rename a couple members to avoid confusion
2015-12-02 16:09:24 -08:00
Chris Robinson
1ce3e7f5b9
Use a separate type for streams
...
They're basically the same, but it's to help avoid accidents with passing non-
streaming sounds to the stream functions, or vice-versa.
2015-12-02 16:09:24 -08:00
Chris Robinson
816015d6e6
Avoid inheriting from Sound for sound types
2015-12-02 16:09:24 -08:00
sandstranger
b0b3192520
delete bad symbol
2015-12-02 22:50:54 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
3d12b2ca9d
Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager.
2015-12-02 14:59:32 +01:00
scrawl
c912310c52
Don't add persuasion results to the journal
2015-12-01 16:16:21 +01:00
scrawl
2327a41826
Fix journal freeze
2015-12-01 16:09:05 +01:00
scrawl
ba5433391f
Merge pull request #831 from ace13/win-fix
...
Fix windows builds
2015-12-01 01:03:16 +01:00
Alexander "Ace" Olofsson
24340bff95
Add a space
2015-11-30 17:47:36 +01:00
Alexander "Ace" Olofsson
6823298516
Different way to solve the type deduction issue
2015-11-30 17:42:25 +01:00
Alexander "Ace" Olofsson
a69e751089
Revert "Fix windows builds"
...
This reverts commit b085c09f86
.
2015-11-30 17:38:46 +01:00
scrawl
f5f3d18b8e
Add comment
2015-11-30 17:19:27 +01:00
scrawl
576d5111a5
Prefer Intersector::PROJECTION over Intersector::WINDOW
2015-11-30 17:04:45 +01:00
scrawl
14b143231c
Don't crash OpGetTarget when the target disappeared ( Fixes #3048 )
2015-11-30 15:26:43 +01:00
Alexander "Ace" Olofsson
b085c09f86
Fix windows builds
...
Can't instantiate a container (at least with MSVC) without knowing the exact size of the object being stored, forward-declares only work with pointers.
I couldn't see a simple way to remove the forward declare, so pointers and memory management it is.
2015-11-30 13:36:15 +01:00
Marc Zinnschlag
3a81bed001
Merge remote-tracking branch 'origin/master'
2015-11-30 12:12:18 +01:00
Marc Zinnschlag
7cc8fbfb3c
Merge remote-tracking branch 'scrawl/dynamic_cast2'
2015-11-30 12:11:00 +01:00
scrawl
0655abcd8b
Fix some character preview raycasting issues (Bug #2769 )
2015-11-30 05:43:36 +01:00
scrawl
8fb328ef4f
Fix updating of character preview size in InventoryWindow::setGuiMode
2015-11-30 05:43:36 +01:00
scrawl
d2290a8183
Don't crash when Water_SurfaceFrameCount is 0
2015-11-30 00:41:26 +01:00
scrawl
d5a738bd39
Apply 27e669296e
(locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
2015-11-29 19:56:43 +01:00
scrawl
cd4a1ffd16
Fast version of dynamic_cast for MWClass
2015-11-29 14:26:52 +01:00
Marc Zinnschlag
20a076bdba
Merge remote-tracking branch 'origin/master'
2015-11-29 09:34:41 +01:00
Marc Zinnschlag
6df626ad71
Merge remote-tracking branch 'scrawl/crashcatcher'
2015-11-29 09:23:14 +01:00
scrawl
db71634a2d
Allow replacing of interactive message boxes ( Fixes #3040 )
2015-11-28 19:15:54 +01:00
scrawl
c9bfe01120
Fix applying of weather changes after serving a jail sentence
2015-11-28 17:57:35 +01:00
Marc Zinnschlag
6facce9d13
Merge remote-tracking branch 'origin/master'
2015-11-28 10:02:37 +01:00
Marc Zinnschlag
ff5582e318
Merge remote-tracking branch 'scrawl/ltex'
2015-11-28 09:51:57 +01:00
scrawl
a1fa1b2b2e
Don't attempt to open an empty texture
2015-11-28 06:01:24 +01:00
scrawl
d97dda05c9
Don't attempt to play unset weather sounds
2015-11-28 05:55:36 +01:00
scrawl
93a76e2f56
Revert debce0fb80
, use a sleep() to work around the X11 bug
...
Problem with debce0fb80
is the crashed process won't be killed until the user accepts the message box, and it's harder to get to the message box when the window is in full screen or the cursor is locked.
2015-11-28 05:42:05 +01:00
scrawl
debce0fb80
crashcatcher: show the message box before killing crashed process
...
This change fixes a random X server lock-up that I get about 1 in 10 times when a crash is caught. I'm presuming it's an X server bug since faulty applications shouldn't be able to crash or freeze the X server under any circumstances.
2015-11-28 05:14:30 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
scrawl
4687c4baad
Do not assert() for invalid land data in plugins (Bug #3037 )
...
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
2015-11-27 21:57:15 +01:00
scrawl
5b8fd79b4b
Fix crash when exception is thrown in startNewGame()
2015-11-27 21:38:57 +01:00
scrawl
177a6f4a68
Launcher: ensure to clear previous settings when reloading settings
2015-11-27 20:52:29 +01:00
scrawl
ace4cfc0a8
Fix 'duplicate setting' errors when running installation wizard
2015-11-27 20:32:45 +01:00
scrawl
89783e047b
Fix typo
2015-11-27 19:40:31 +01:00
Chris Robinson
4ee409af84
Load loudness data asynchronously
...
Currently abuses the output audio streams' background processing thread to do
the work, since there's no generalized threaded processing mechanism.
2015-11-27 09:47:14 -08:00
Chris Robinson
0f05ccf72a
Use a non-recursive mutex and properly end the streaming thrread
2015-11-27 08:13:23 -08:00
Chris Robinson
b5ed2e65f8
Add a method to get the sound stream delay
...
This helps avoid a lock during the movie player's read method, since it needs
to sync with the current playback position which would otherwise need to get
the movie decoder's current position.
2015-11-27 06:01:50 -08:00
Chris Robinson
f3c035907c
Rename Sound::update to Sound::applyUpdates
2015-11-27 04:55:17 -08:00
Chris Robinson
9568aa6a84
Use a condition variable to wake up the audio stream thread
...
This should make starting streams a bit more responsive, and allows us to do
more in it that really shouldn't wait for its next wake up.
2015-11-27 04:30:09 -08:00
Chris Robinson
4a078725d4
Play player voices locally
2015-11-27 02:57:44 -08:00
Chris Robinson
449eca4fb4
Properly mark streams as 2D or 3D
2015-11-27 02:36:33 -08:00
Chris Robinson
21bb2e9314
Use a deque for loudness buffers with a map lookup
...
Similar to Sound_Buffer, this allows individual Sound_Loudness objects to
retain a constant pointer when new ones are inserted on to the end.
2015-11-27 02:01:18 -08:00
Chris Robinson
5f8a09df97
Play player sounds (except footsteps) local to the listener
2015-11-27 02:01:18 -08:00
Chris Robinson
82f3651f81
Treat the sound offset as the offset in seconds
2015-11-27 02:01:17 -08:00
Chris Robinson
8b7587f9a6
Track whether a sound is 3D
2015-11-27 02:01:17 -08:00
Chris Robinson
fc912b135f
Avoid unnecessarily friending classes
2015-11-27 02:01:17 -08:00
Marc Zinnschlag
7cc950ed64
Merge remote-tracking branch 'origin/master'
2015-11-27 10:34:22 +01:00
Marc Zinnschlag
b3532b6274
Merge remote-tracking branch 'scrawl/spells'
2015-11-27 10:21:17 +01:00
scrawl
44dd62067e
Remove some unnecessary per-frame store searches
2015-11-27 02:13:56 +01:00
scrawl
783594033a
Optimize MWMechanics::Spells
...
Use pointers as map keys instead of string IDs. Resolves a nasty performance bottleneck on functions like hasCommonDisease() that previously had to look up all contained spells from the ESM store on every call. hasCommonDisease() is called hundreds of times per frame by the AI target update since it's used to calculate target disposition.
The total cost of hasCommonDisease() was 2.7% of the frame loop, now it's negligible.
2015-11-27 01:07:15 +01:00
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
2015-11-26 23:56:32 +01:00
scrawl
984c455027
Fix Show Owned option affecting tooltips that are not objects ( Fixes #3036 )
2015-11-26 18:23:39 +01:00
scrawl
2ffcc2a2b4
Fix incorrect path encoding handling in debug message
2015-11-26 17:34:22 +01:00
scrawl
bcca1beb69
Merge branch 'configwriter' into HEAD
2015-11-26 17:17:26 +01:00
scrawl
d894d54e41
Improve path conversions
2015-11-26 17:15:28 +01:00
scrawl
84aceedfa2
Add comment
2015-11-26 17:15:12 +01:00
scrawl
325d208b4a
Fix incorrect error message
2015-11-26 17:13:13 +01:00
scrawl
3747843c92
Use QString::toInt instead of atoi
2015-11-26 17:07:20 +01:00
cfcohen
c26463fd91
Should have coded it the way scrawl said, since it's cleaner.
2015-11-26 10:52:20 -05:00
cfcohen
a9c9cc5508
Remove unnecessary copy of mEngineSettings in mInitialSettings.
2015-11-26 10:42:43 -05:00
Chris Robinson
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
2015-11-26 02:13:37 -08:00
Chris Robinson
8715add72f
Store sound buffers in a deque that's filled in as needed
...
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
2015-11-26 01:26:33 -08:00
cfcohen
046538984c
Fix duplicate filename in what() message. Use newly create cfgError
...
utility function consistently throughout code.
2015-11-26 01:49:14 -05:00
cfcohen
7605912ece
Merge branch 'master' of https://github.com/OpenMW/openmw into config_writer_changes
2015-11-26 00:57:21 -05:00
cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
2015-11-25 21:30:04 -05:00
scrawl
8a3ec14bc6
Revert "Merge remote-tracking branch 'sandstranger/opengles'"
...
This reverts commit cc9cab6fd1
, reversing
changes made to da856eed95
.
2015-11-25 19:22:48 +01:00
Marc Zinnschlag
ef68e2aec4
Merge remote-tracking branch 'origin/master'
2015-11-25 19:18:17 +01:00
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
Marc Zinnschlag
cc9cab6fd1
Merge remote-tracking branch 'sandstranger/opengles'
2015-11-25 19:15:53 +01:00
cfcohen
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
2015-11-25 13:08:53 -05:00
Chris Robinson
8f08ca9cba
Revert "Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting"
...
This reverts commit 0d4fea896c
.
2015-11-25 06:06:27 -08:00
Chris Robinson
04f885d8cc
Rename mReferences to mUses
2015-11-25 04:24:27 -08:00
Chris Robinson
0d4fea896c
Avoid unsafe sizeof(x)/sizeof(x[0]) constructs for array counting
2015-11-25 04:24:27 -08:00
Chris Robinson
a1bdb544db
Avoid an unnecessary string copy
2015-11-25 04:24:27 -08:00
Chris Robinson
aac903484c
Remove a really unnecessary method
2015-11-25 04:24:26 -08:00
Chris Robinson
73448c72f6
Replace Play_NoTrack with playManualSound3D, and rename the latter
2015-11-25 04:24:26 -08:00
Chris Robinson
caae305ddd
Use a sorted list for unused buffers
...
Helps ensure the buffers being unloaded due to cache limits are not likely to
be needed anytime soon.
2015-11-25 04:24:26 -08:00
Chris Robinson
669b7a2295
Batch update changes together, when possible
...
Certain OpenAL implementations, including Rapture3D, Creative's hardware
drivers, and more recent versions of OpenAL Soft, can batch together changes so
that they all occur at once, avoiding potential discontinuities with one sound
being changed before another, or the listeenr being changed before sounds are.
On other implementaitons, this is a no-op and maintains existing behavior.
2015-11-25 04:24:26 -08:00
Chris Robinson
ea70b0baee
Don't store the buffer in the sound struct
2015-11-25 04:24:25 -08:00
Chris Robinson
fd7d58fe7e
Reset the sound handle back to null after unloading
2015-11-25 04:24:25 -08:00
Chris Robinson
4801661b34
Stop all sounds of the given id
2015-11-25 04:24:25 -08:00
Chris Robinson
8a69f676ec
Remove some duplicate code
2015-11-25 04:24:25 -08:00
Chris Robinson
45628316f8
Remove an unnecessary check
2015-11-25 04:24:25 -08:00
Chris Robinson
574c1923fe
Clear unused buffers after unloading them all
2015-11-25 04:24:25 -08:00
Chris Robinson
5ad772c3b3
Fix streaming sound time
2015-11-25 04:24:25 -08:00
Chris Robinson
3ce6aee98b
Return a decoder from the loadVoice function
2015-11-25 04:24:25 -08:00
Chris Robinson
24f8c78fca
Store sound buffer references by index instead of string
2015-11-25 04:24:24 -08:00
Chris Robinson
f7218f5a25
Use proper mutex mechanisms and don't check al errors in the stream thread
2015-11-25 04:24:24 -08:00
Chris Robinson
f9e18cd966
Prepare all Sound_Buffer objects when one is needed
...
This simply sets up the Sound record data to be used by the sound output. The
actual audio buffers, stored in the Sound_Handle, are still loaded on-demand.
2015-11-25 04:24:24 -08:00
Chris Robinson
6c3953766e
Use separate lists for the sound name and its buffer
...
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
2015-11-25 04:24:24 -08:00
Chris Robinson
fbfcc4050f
Stream voice clips
...
Voices tend to be a bit long, and not individually replayed often. So it's
better to stream them instead of loading theminto a sound buffer. The loudness
data is very small, though, so that can be kept buffered indefinitely.
2015-11-25 04:24:24 -08:00
Chris Robinson
eee6a19e31
Add a method to stream sounds in 3D
2015-11-25 04:24:24 -08:00
Chris Robinson
f1a1dc8408
Pass relevant sound parameters to the OpenAL_SoundStream constructor
2015-11-25 04:24:24 -08:00
Chris Robinson
83721092f2
Refactor the audio streaming code to be a bit saner
2015-11-25 04:24:23 -08:00
Chris Robinson
16f72886e9
Use separate lists for openal sounds and streams
2015-11-25 04:24:23 -08:00
Chris Robinson
0f33f41d8d
Actually unload sounds when running over
2015-11-25 04:24:23 -08:00
Chris Robinson
22a6811425
Limit the sound buffer cache to 15MB
2015-11-25 04:24:23 -08:00
Chris Robinson
0b2747098c
Keep track of unused sound buffers
2015-11-25 04:24:23 -08:00
Chris Robinson
4073495070
Add some missing sound handling
2015-11-25 04:24:23 -08:00
Chris Robinson
e362896817
Combine some duplicate code
2015-11-25 04:24:23 -08:00
Chris Robinson
febc7b510a
Remove an unneeded method
2015-11-25 04:24:23 -08:00
Chris Robinson
3fdc3c4ea9
Use a separate map for say sounds
...
Also restores lip movement
2015-11-25 04:24:22 -08:00
Chris Robinson
9d0018e1bc
Reorder active sound data to make lookup by Ptr better
2015-11-25 04:24:22 -08:00
Chris Robinson
495e138907
Load sound loudness and store it with the Sound_Buffer
...
Still not used for say yet, though
2015-11-25 04:24:22 -08:00
Chris Robinson
f4c22ec49e
Hold a separate list for voice sound buffers
...
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
2015-11-25 04:24:22 -08:00
Chris Robinson
4571218827
Load the sound as needed and pass it directly to the play methods
...
This breaks say sounds, loudness handling, and the cache limit. Fixes are
forthcoming.
2015-11-25 04:24:22 -08:00
Chris Robinson
e2beefd8b5
Store info calculated from the ESM::Sound record
2015-11-25 04:24:22 -08:00
scrawl
edfcb45ad7
Fix crash when onPcEquip script removes the equipped item ( Fixes #3016 )
2015-11-24 22:55:17 +01:00
sandstranger
69acacefff
openmw building on Android with Opengl es
2015-11-23 20:28:35 +03:00
Marc Zinnschlag
da856eed95
Merge remote-tracking branch 'origin/master'
2015-11-23 18:17:36 +01:00
scrawl
3fe38e3556
Remove unused setting
2015-11-23 03:26:21 +01:00
scrawl
71cd57a3b5
Optimize World::getTimeStamp
...
World::getTimeStamp was searching through the globals store on every call. Not a big issue, but slow enough to show up in the profiler.
2015-11-22 23:55:21 +01:00
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
2015-11-22 19:54:26 +01:00
cfcohen
b507d5da5d
One more tooltip fix. This one in the review dialog with Socucius Ergalla.
2015-11-22 00:50:36 -05:00
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
2015-11-21 14:28:40 +01:00
Marc Zinnschlag
f5c61ee616
remember script error panel height per scriptsubview
2015-11-21 14:19:14 +01:00
Marc Zinnschlag
26640d17eb
do not adjust error panel height if panal was already open
2015-11-21 12:52:32 +01:00
Marc Zinnschlag
1093a53cf9
hide script error list when there are no errors ( Fixes #2867 )
2015-11-21 12:45:11 +01:00
Marc Zinnschlag
b74b274ac0
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
2015-11-21 12:14:57 +01:00
Marc Zinnschlag
e0e9e7f8c2
adjusted startup warning message for recent improvements regarding loading/saving
2015-11-21 11:56:24 +01:00
Marc Zinnschlag
8da04bf76f
Merge remote-tracking branch 'scrawl/master'
2015-11-21 09:15:46 +01:00
scrawl
1b1d9a7a9c
Fixed another tooltip
2015-11-21 02:05:27 +01:00
cfcohen
cf4f3d9ebc
Correct tooltip for Magicka in stats window.
2015-11-20 14:57:42 -05:00
scrawl
43de13fa99
Do not allow resting on lava
2015-11-20 19:22:31 +01:00
scrawl
2d302aef99
Implement stayOutside script variable
2015-11-20 05:05:43 +01:00
scrawl
27617468c8
Fix the collision shape not updating when scaling an object via script
2015-11-20 03:29:58 +01:00
scrawl
5f143dee2d
Fix lighting incontinuity at nightfall and sunrise
2015-11-20 03:22:35 +01:00
scrawl
61314e1db1
Fix bounding box of bullet debug drawer
2015-11-20 03:04:03 +01:00
scrawl
706b1d4c28
Disable culling of ClipNode
2015-11-20 02:22:37 +01:00
scrawl
cbf344663f
animateCollisionShape checks if the shape is really animated
2015-11-20 00:17:07 +01:00
scrawl
894477849a
Store animated collision objects in a separate container
2015-11-19 23:33:08 +01:00
scrawl
8c268f239e
Set the object node scale before inserting model
...
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
2015-11-19 15:57:12 +01:00
scrawl
ccc721ba3f
Print the OpenMW version to the logfile
2015-11-19 02:56:42 +01:00
scrawl
f08cfa19ea
Fix SoundManager::isPlaying to consider multiple entries with the same Ptr/id
...
Now it returns true if *any* sounds matching the given Ptr and id are playing. The previous behaviour was causing problems with "zombie" sounds (sounds that have finished playing, but weren't removed from the map yet) making the isPlaying method return false even though there's another legitimately playing sound in the map.
2015-11-19 01:06:51 +01:00
scrawl
a49058721e
Use a contactTest for collision script functions
...
The previous method didn't work for stationary actors. This change fixes the grinder in "Sotha Sil, Dome of Kasia" not registering collisions if the player stands still. (Fixes #1934 )
2015-11-18 21:20:12 +01:00
scrawl
9fce428929
ContactTestResultCallback: do not rely on col1 being the object tested against
...
Unsure why, but in some cases col0 and col1 are swapped.
2015-11-18 20:41:49 +01:00
scrawl
3453353091
AiCombat distance check takes into account collision box ( Fixes #1699 )
2015-11-18 19:00:43 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
Marc Zinnschlag
5de9a5e840
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
2015-11-17 09:04:07 +01:00
scrawl
e62470d674
Auto-generate the collision shape for native mesh formats
2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac
Move BulletShapeManager and BulletShape to resource/
2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682
Support for loading .osg mesh format
2015-11-16 23:26:43 +01:00
scrawl
71d9e7dc52
Read Ambient Loop Sound ID and Rain Loop Sound ID from the INI file
2015-11-16 02:21:45 +01:00
scrawl
e9e12d396d
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-15 21:37:32 +01:00
scrawl
0f347eccbf
Flip the origin of global map texture
...
Now it's consistent with the overlay texture.
2015-11-15 21:36:41 +01:00
scrawl
8b7bdcd127
Fix the global map overlay viewport (Bug #3018 )
2015-11-15 21:32:34 +01:00
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
2015-11-15 16:04:52 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Alexander "Ace" Olofsson
d2a4175804
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
2015-11-14 16:02:42 +01:00
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4e3bbe01b6
OS X: disable glTexStorage2D
because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
2015-11-14 13:50:01 +01:00
scrawl
0ec56d321a
Remove unneeded using namespace
2015-11-14 03:01:40 +01:00
scrawl
05498ad592
Refactor: InputManager no longer depends on Engine
2015-11-14 03:01:24 +01:00
scrawl
aae1aa3708
Adjust tests to work with esm_rewrite branch.
2015-11-14 00:27:59 +01:00
scrawl
f91aae2350
Tests: add record overwrite test
2015-11-14 00:27:59 +01:00
scrawl
1e817a976f
Tests: add record deletion test
2015-11-14 00:27:59 +01:00
scrawl
771193bae8
Tests: add content_diagnostics_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
38c155c579
Tests: add dialogue_merging_test (requires some data files)
2015-11-14 00:27:59 +01:00
scrawl
d0d8c2eded
Delete empty test
2015-11-14 00:27:59 +01:00
scrawl
9116c701d5
esmtool fix
2015-11-14 00:27:59 +01:00
scrawl
1402a16702
SceneWidget: change the threading model to DrawThreadPerContext
...
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
2015-11-13 21:00:51 +01:00
Marc Zinnschlag
c312162b57
Merge branch 'openmw-37'
2015-11-13 14:24:57 +01:00
Marc Zinnschlag
fa9ebc50a2
Merge remote-tracking branch 'origin/master'
2015-11-13 13:34:03 +01:00
Marc Zinnschlag
b0d79ee790
Merge branch 'tooltip'
2015-11-13 11:40:10 +01:00
Marc Zinnschlag
63ee37d914
added 3D scene tooltips
2015-11-13 11:39:57 +01:00
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
2015-11-13 01:34:36 +01:00
scrawl
8cd41f0ed4
Increase the ray distance for dropObjectOnGround ( Fixes #3010 )
2015-11-12 23:05:44 +01:00
scrawl
9897400d97
Restore the previous key focus widget after playing video
2015-11-12 19:03:24 +01:00
Emmanuel Anne
af7b5e636e
improves InterpreterContext::updatePtr
...
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
2015-11-12 17:53:17 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
Marc Zinnschlag
8b01f1f6fb
added instance tooltips
2015-11-12 15:09:43 +01:00
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
2015-11-12 15:06:37 +01:00
scrawl
19cd987208
Fix Ptr updates in PositionCell
...
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
2015-11-12 14:32:39 +01:00
scrawl
9e3eb8291f
Rotations: fix the rotation order for doors
2015-11-12 02:09:00 +01:00
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
2015-11-12 01:44:29 +01:00
scrawl
3647af8d73
Rotations: use different rotation order when object is rotated via script ( Fixes #2062 )
2015-11-12 01:44:00 +01:00
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
2015-11-12 01:16:37 +01:00
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
2015-11-12 01:09:39 +01:00
scrawl
6405049add
Rotations: move doors via Rotation rather than LocalRotation
...
Now LocalRotation is unneeded, will remove in next commit.
2015-11-12 00:58:29 +01:00
scrawl
8aacbc398f
Rotations: don't wrap the angle values for non-actors
...
It's not really necessary, and just complicates logic elsewhere. Neither does vanilla MW do it. As well, the question is if wrapping to [-PI, PI] or [0, 2*PI] would be the desired range.
2015-11-12 00:52:36 +01:00
scrawl
a68fd791c8
Remove a stray method declaration
2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe
Style fix
2015-11-11 17:23:47 +01:00
scrawl
02148a43f5
Node mask fix
2015-11-11 17:22:31 +01:00
scrawl
0a52ee17c3
Fix Drawable removal issues
2015-11-11 17:04:06 +01:00
scrawl
afa590bddb
Leak fix
2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
2015-11-11 01:47:26 +01:00
scrawl
2e9805fa0e
Leak fix
2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +01:00
MatthewRock
a662a00c62
Fixing bug for merchant
2015-11-10 19:18:02 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35
Place Drawables directly in the scene graph when built with OSG 3.4
...
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.
There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5
Refactor lighting mask
2015-11-10 17:23:12 +01:00
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
2015-11-10 17:00:33 +01:00
scrawl
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
2015-11-10 01:01:41 +01:00
scrawl
3c338b9da9
ObstacleCheck: tweak the stuck detection parameters
...
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
2015-11-09 20:35:31 +01:00
scrawl
d233bc483d
ObstacleCheck: fix evasion issue
...
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
2015-11-09 20:35:31 +01:00
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
2015-11-09 20:35:31 +01:00
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
2015-11-09 20:17:21 +01:00
scrawl
1b52749ae1
Adjust third person camera height based on character height
2015-11-09 17:42:35 +01:00
scrawl
b89945804c
BookPage: implement hit test with margin for error
2015-11-09 02:57:49 +01:00
scrawl
055841e721
Improve cloud lighting
2015-11-09 02:22:40 +01:00
scrawl
f0a1434578
Dead actors underwater will float to the surface
2015-11-08 20:58:00 +01:00
scrawl
66925be440
Partially revert 682f30ef9c
...
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
2015-11-08 19:59:33 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
2015-11-08 18:30:21 +01:00
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
2015-11-08 18:30:21 +01:00
scrawl
6c12c9a467
Layer renaming fix
2015-11-07 19:45:30 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
2407f393ce
Fix double update traversal in screenshot function
2015-11-06 23:14:27 +01:00
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
2015-11-06 23:14:27 +01:00
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
2015-11-05 01:18:01 +01:00
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
2015-11-04 20:34:50 +01:00
scrawl
1cf1c944b7
Don't attempt to render weather particles on the refraction and reflection textures
2015-11-03 23:20:17 +01:00
scrawl
209fa52883
Hide weather particles underwater ( Fixes #2701 )
2015-11-03 23:15:43 +01:00
scrawl
e3b30baff9
clipFudge fix
2015-11-03 23:10:52 +01:00
scrawl
682f30ef9c
Fix incorrect uses of PhysicsSystem::getHalfExtents
...
Did not account for translation of collision box (mMeshTranslation in actor.cpp)
2015-11-03 19:05:36 +01:00
scrawl
46e07e4b19
Head tracking: fall back to target collision box center if the target has no head node
2015-11-03 18:27:15 +01:00
scrawl
a5f8ffb83d
aimToTarget: Fix the collision box translation not being taken into account
2015-11-03 18:15:47 +01:00
scrawl
de97a8a3da
Do not allow disabling the player object
2015-11-03 17:53:57 +01:00
scrawl
b72d5c5190
Don't play idlestorm animation when swimming
2015-11-03 17:48:35 +01:00
scrawl
c0a81030bb
Make use of INI settings for the simple water
2015-11-03 02:24:50 +01:00
scrawl
30c828dff0
Include cleanup
2015-11-03 02:17:42 +01:00
scrawl
8e8f72408d
Use diffuse/ambient lighting for the simple water
2015-11-03 02:12:00 +01:00
scrawl
380256977b
Fix another renderBin issue with the weather particles
...
Depth sorting w.r.t. the rest of the scene was broken
2015-11-03 01:53:38 +01:00
scrawl
9902dfc9ef
Comment
2015-11-03 01:53:22 +01:00
scrawl
ad016da31d
Enable fog on weather particles
2015-11-03 01:42:37 +01:00
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
2015-11-02 23:38:34 +01:00
scrawl
d6f45c3390
Fix the renderbin for weather particles
...
Regression from commit 2ee6b41887
2015-11-02 21:51:01 +01:00
scrawl
bd1f3493d7
Fix weather particles not being cleared when changing from one particle effect to another
2015-11-02 21:35:03 +01:00
Marc Zinnschlag
ab2df963e9
Merge remote-tracking branch 'origin/master'
2015-11-02 08:40:40 +01:00
scrawl
0348b8df1c
Fix applying of plane height in ClipCullNode ( Fixes #2985 )
2015-11-02 01:23:21 +01:00
scrawl
3f988327c7
Destructor fix
2015-11-02 00:57:59 +01:00
scrawl
913bbe347b
Don't check the extension string every frame
2015-11-02 00:52:20 +01:00
scrawl
c60388afb6
Add fudge factor to move the water mesh away from camera when the camera gets too close
2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc
Render the water plane with GL_DEPTH_CLAMP if supported ( Fixes #996 )
2015-11-02 00:29:09 +01:00
scrawl
802620a86b
Use TimeOfDayInterpolator for Land Fog Depth
...
Fixes the sudden fog jump at nightfall.
2015-11-01 23:03:16 +01:00
scrawl
45bf3e6788
Create TimeOfDayInterpolator class to refactor time handling in WeatherManager
2015-11-01 22:59:26 +01:00
scrawl
8da4530957
Use INI-imported underwater fog settings ( Fixes #2907 , Fixes #1511 )
2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560
Use the correct scale for actor swim height ( Fixes #2833 )
2015-11-01 21:45:58 +01:00
cc9cii
7f477e2fae
Fix include file issue.
2015-11-02 06:57:24 +11:00
cc9cii
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
2015-11-02 06:43:20 +11:00
cc9cii
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
2015-11-01 11:23:28 +11:00
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
2015-10-31 20:45:16 +11:00
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
2015-10-31 20:42:42 +11:00
scrawl
7b817ba010
Fix the node masks of water cameras being reset (Bug #2984 )
...
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
2015-10-31 03:14:05 +01:00
scrawl
93f4d31cf9
Raytest mask fix ( Fixes #2984 )
2015-10-31 01:30:02 +01:00
scrawl
b9b154a015
Minor cleanup
2015-10-31 00:01:12 +01:00
scrawl
d90fa977e8
GL_DEPTH_COMPONEN24 fix
2015-10-29 13:52:48 +01:00
Marc Zinnschlag
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
2015-10-29 11:27:01 +01:00
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
2015-10-29 11:20:06 +01:00
Marc Zinnschlag
133e04a38e
Merge remote-tracking branch 'cc9cii/edit-ingredient'
2015-10-29 10:26:53 +01:00
scrawl
7692ae175a
Disable sun rendering on the reflection camera
...
Not needed, we have specular highlights.
2015-10-29 01:17:23 +01:00
scrawl
9b8e45fc01
Fix ripple particles z-fighting with the water surface
2015-10-29 00:28:09 +01:00
scrawl
d394b0793f
waterLevel fix
2015-10-29 00:27:42 +01:00
scrawl
c9d7078b4b
Water: add texture quality setting to the settings window
2015-10-29 00:27:42 +01:00
scrawl
8433e0679f
Water: connect to settings window
2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573
Water code cleanup
2015-10-29 00:25:24 +01:00
scrawl
11c997d09d
Water: move reflection code to a new class
2015-10-29 00:25:24 +01:00
scrawl
ebdf25ccb9
Water: move refraction code to a new class
2015-10-29 00:25:24 +01:00
scrawl
7bbdb13138
Remove debug code
2015-10-29 00:25:24 +01:00
scrawl
6ba9f561ea
Use simple water for the local map
2015-10-29 00:25:24 +01:00
scrawl
09631385c3
Use boost ifstream for water resources
2015-10-29 00:25:24 +01:00
scrawl
d485dd0782
Water: fix world UV coords
2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37
Water: pass the near and far planes
2015-10-29 00:25:24 +01:00
scrawl
37c9c12962
Water: clipping plane offset
2015-10-29 00:25:23 +01:00
scrawl
700a0099c3
Remove debug code
2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
2015-10-29 00:25:23 +01:00
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
2015-10-28 23:33:24 +11:00
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
2015-10-28 20:52:07 +11:00
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
2015-10-28 20:30:30 +11:00
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
2015-10-28 11:49:24 +11:00
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
2015-10-28 11:30:36 +11:00
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
2015-10-28 11:18:48 +11:00
Marc Zinnschlag
843225996c
get modifiers from event instead of from the application
2015-10-27 15:43:52 +01:00
Marc Zinnschlag
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
2015-10-27 15:30:51 +01:00
Marc Zinnschlag
f3ee3f5be1
Do not call base class event functions in WorldspaceWidget
...
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
2015-10-27 15:25:46 +01:00
Marc Zinnschlag
6c65081643
Merge branch 'marker'
2015-10-26 14:27:29 +01:00
scrawl
944e6d0844
Fix adjustment of inventory preview size when guimode changes ( Fixes #2973 )
2015-10-26 14:26:02 +01:00
scrawl
515c52211e
Disable mipmaps for temporary screenshot texture
2015-10-25 18:28:50 +01:00
Marc Zinnschlag
e34af4c4b5
handle primary and secondary edit button clicks on cell arrows
2015-10-25 15:16:22 +01:00
scrawl
7b954e8cc3
Remove unnecessary dependency on MWScrollBar
2015-10-24 16:04:08 +02:00
scrawl
ef5838df7e
SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras
2015-10-24 15:46:15 +02:00
scrawl
69f234d97b
Small delay before the loading screen shows
...
Kinda irritating to have the loading bar pop up for a fraction of a second.
2015-10-23 16:50:08 +02:00
scrawl
6ef139e1d7
Implement a custom RenderBin for first person models ( Fixes #1612 )
2015-10-19 22:17:04 +02:00
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
2015-10-18 21:40:16 +02:00
scrawl
04df656f54
Remove some junk
2015-10-18 21:39:53 +02:00
Marc Zinnschlag
8f0d7ec1ec
Merge remote-tracking branch 'artemutin/longStringEditor'
2015-10-16 09:15:48 +02:00
artemutin@yandex.ru
eae36f8005
Fixed filter reapplication on Description column change and on State
...
column change.
Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
2015-10-16 11:32:22 +10:00
Marc Zinnschlag
361634489e
properly handle cells that don't exist
2015-10-15 14:46:08 +02:00
artemutin@yandex.ru
33e12a99fa
If table dont use any filter, filter update now dont cause a reapply of empty filter
2015-10-14 21:22:28 +10:00
Marc Zinnschlag
90036e23b3
Merge remote-tracking branch 'scrawl/enchantment_error'
2015-10-14 09:33:51 +02:00
scrawl
8459a79a2c
Fix AI being able to open locked doors ( Fixes #2948 )
2015-10-13 19:05:17 +02:00
scrawl
f36d463617
Enchantment error handling fix ( Fixes #2959 )
...
Catch errors about missing enchantments before they propagate up the stack and interrupt the whole frame update.
2015-10-13 18:15:39 +02:00
scrawl
ee450471fd
Disable head controller for non-bipedal creatures ( Fixes #2843 , Fixes #2966 )
2015-10-13 17:55:57 +02:00
Marc Zinnschlag
773df6fd22
some OSG fixes
2015-10-13 16:53:40 +02:00
scrawl
a88d56148b
Read the Sun Glare Fader ini settings
2015-10-13 16:35:31 +02:00
Marc Zinnschlag
68115c4e8a
(somewhat) improved the colour scheme
2015-10-13 16:15:53 +02:00
Marc Zinnschlag
0b1d6bddc8
merged primitives arrays
2015-10-13 16:11:47 +02:00
Marc Zinnschlag
6e140c9cb1
proper shape for cell arrows (kinda)
2015-10-13 11:43:33 +02:00
Marc Zinnschlag
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
2015-10-12 18:00:44 +02:00
Marc Zinnschlag
b81ee606c8
use CellCoordinates instead of a pair of ints for cell coordinates
2015-10-12 14:31:55 +02:00
Marc Zinnschlag
0d35938794
basic cell arrow rendering (shape is a placeholder)
2015-10-12 14:12:01 +02:00
Marc Zinnschlag
3b39572274
Merge remote-tracking branch 'artemutin/scriptSearchRedirect'
2015-10-09 17:15:11 +02:00
artemutin@yandex.ru
4ca7b26609
Stream error handling, and other minor changes.
2015-10-09 21:57:02 +10:00
Marc Zinnschlag
a134b87e5b
Merge remote-tracking branch 'cc9cii/aiwander-fix'
2015-10-09 09:48:03 +02:00
cc9cii
64821b0785
Disable toolbar context menu. Should resolve bug #2953 .
2015-10-09 06:29:50 +11:00
artemutin@yandex.ru
e7a3f059aa
Implemented line and col calculations in scriptsubview
2015-10-09 00:29:18 +10:00
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
2015-10-08 14:01:29 +02:00
cc9cii
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
2015-10-08 12:47:23 +11:00
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
2015-10-08 12:35:09 +11:00
Emmanuel Anne
944dfa5372
a light without the carry flag can't be equipped !
...
it fixes Antares big mod teaching disciplines, it adds a light which should
not be equipped to npcs which have learnt something.
2015-10-07 12:28:25 +02:00
Marc Zinnschlag
379d13c7b9
Merge remote-tracking branch 'scrawl/unstack_script'
2015-10-07 08:12:02 +02:00
Marc Zinnschlag
7e7215b3b3
Merge remote-tracking branch 'scrawl/master'
2015-10-07 08:09:27 +02:00
scrawl
91bf5ae237
Add new script instance when a container item is unstacked (Bug #2962 )
2015-10-07 02:43:21 +02:00
Marc Zinnschlag
231935356a
Merge remote-tracking branch 'origin/master'
2015-10-06 14:30:45 +02:00
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
2015-10-06 14:30:32 +02:00
scrawl
7b6fe149f2
getSpellSuccessChance return 0 for used powers ( Fixes #2944 )
2015-10-05 15:41:43 +02:00
scrawl
77cb438714
Fix potential case smashing issue
2015-10-05 15:41:07 +02:00
scrawl
029a86267b
Merge pull request #781 from artemutin/magickaRecalculation
...
Fix to https://bugs.openmw.org/issues/2914
2015-10-05 15:32:37 +02:00
artemutin@yandex.ru
ec4fff588d
uncomment updateActor call in buildPlayer for magicka recalc
2015-10-05 23:07:13 +10:00
Alexander "Ace" Olofsson
b4132faaea
Update editmode.cpp
...
Fixes builds on Windows
2015-10-04 16:27:05 +02:00
Rohit Nirmal
0a8e2c0b21
Fix building OpenCS with Qt 5.
2015-10-03 00:07:08 -05:00
Marc Zinnschlag
6ef2319eb8
Merge branch 'sceneinput'
2015-10-02 15:07:01 +02:00
Marc Zinnschlag
4b0fa370e3
made WorldspaceWidget::getDocument public (EditModes will need the document later)
2015-10-02 15:06:42 +02:00
Marc Zinnschlag
323f8bb29f
sensitivity settings
2015-10-01 13:42:21 +02:00
Marc Zinnschlag
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
2015-10-01 13:19:48 +02:00
Marc Zinnschlag
0a5bfb2107
added framework for drag operations
2015-10-01 12:46:01 +02:00
artemutin@yandex.ru
ecce3a1975
Add StartScriptCreator to a factory manager.
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
903cd3322b
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
e672880f64
Fix namespace, add file to CMakeLists.txt
2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
3f27c85630
Added StartScriptCreator class with redefined getErrors method.
2015-09-30 09:46:51 +10:00
Marc Zinnschlag
8e87b48866
handle context-sensitive select mode in instance editing
2015-09-29 16:07:14 +02:00
Marc Zinnschlag
2cb106f6ad
added missing flagAsModified calls
2015-09-29 16:06:55 +02:00
Marc Zinnschlag
f28fa9fc16
clear instance selection on select click on nothing/something that isn't an instance
2015-09-29 13:53:47 +02:00
Marc Zinnschlag
319e3f24a3
on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet)
2015-09-29 13:48:04 +02:00
Marc Zinnschlag
981a8a2cc2
delegated editing and selection functions to mode objects
2015-09-27 16:18:22 +02:00
Marc Zinnschlag
9bf27c7e37
moved edit mode handling from SceneSubView to WorldspaceWidget
2015-09-27 14:38:12 +02:00
Marc Zinnschlag
5d9863aec1
removed a redundant check
2015-09-27 11:34:14 +02:00
Marc Zinnschlag
7bbc475bda
apply button mapping
2015-09-26 18:01:49 +02:00
Marc Zinnschlag
501ae6372d
factored out mouse picking into a separate function
2015-09-26 17:51:41 +02:00
Marc Zinnschlag
3844c94975
bit masking fix
2015-09-26 17:39:55 +02:00
Marc Zinnschlag
72bb33c2c4
filter mouse interaction by interaction mask
2015-09-26 12:24:41 +02:00
Marc Zinnschlag
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
2015-09-26 12:18:18 +02:00
Marc Zinnschlag
748b13b45b
renamed ObjectHolder into ObjectTag
2015-09-26 12:05:44 +02:00
Marc Zinnschlag
9279ae4ba0
Merge remote-tracking branch 'zelurker/removed_items'
2015-09-26 11:24:56 +02:00
Marc Zinnschlag
bebd442b49
Merge remote-tracking branch 'scrawl/godmode'
2015-09-26 11:23:33 +02:00
Emmanuel Anne
6ec8f9123e
Merge branch 'master' of https://github.com/OpenMW/openmw into removed_items
2015-09-26 09:24:56 +02:00
scrawl
899e35591c
Escape MyGUI markup codes in console output
2015-09-26 02:08:23 +02:00
scrawl
387624e158
Add a threshold to AiFollow distance
...
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
2015-09-26 02:02:50 +02:00
scrawl
b9c6a6862a
Don't reset god mode, scripts enabled and sky enabled flags when loading a save game
...
These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
2015-09-26 01:49:58 +02:00
Emmanuel Anne
2fff6b06cc
removed items by mods do not break cell loading
...
like fortify intelligence potions removed by sris_alchemy which break the
loading of the firewatch mages guild
2015-09-25 14:23:49 +02:00
Marc Zinnschlag
d46eeb04cd
removed a left-over debugging statement
2015-09-25 14:16:41 +02:00
Marc Zinnschlag
5c34a02058
store mouse bindings in WorldspaceWidget
2015-09-25 13:11:40 +02:00
Marc Zinnschlag
d597bef2cd
refined selection related user settings
2015-09-25 10:58:20 +02:00
Marc Zinnschlag
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
2015-09-24 16:07:39 +02:00
Marc Zinnschlag
3ada08af90
store lock state and pass it on to edit mode
2015-09-24 16:07:17 +02:00
Alexander "Ace" Olofsson
caa119f13c
Fix instantiation on non-Visual Studio
2015-09-24 15:55:38 +02:00
Marc Zinnschlag
b2cb5f0374
pass on user settings updates to potentially interested parties within a scene subview
2015-09-24 15:51:16 +02:00
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
2015-09-24 15:21:42 +02:00
scrawl
12b8fcf0bf
OpenCS: Fix camera position retrieval in WorldspaceWidget
2015-09-23 23:37:09 +02:00
Marc Zinnschlag
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
2015-09-22 15:36:00 +02:00
Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
2015-09-22 08:33:33 +02:00
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87
Minor cleanup
2015-09-21 17:50:36 +02:00
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05
Remove dead code
2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71
Add the full-screen sun glare effect
2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
2015-09-21 17:20:08 +02:00
scrawl
d191a52847
Create occlusion query nodes for the sun flash
2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
2015-09-21 17:19:53 +02:00
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
2015-09-21 15:32:18 +02:00
Marc Zinnschlag
41191ea367
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-09-20 09:50:18 +02:00
scrawl
8de3ce90a7
Add comments for weather IDs
2015-09-19 18:04:24 +02:00
Marc Zinnschlag
1566f3568d
Merge remote-tracking branch 'origin/master'
2015-09-19 11:27:35 +02:00
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
2015-09-19 16:14:00 +12:00
dteviot
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
2015-09-18 21:30:02 +02:00
scrawl
18d0cae801
OpenCS: Select objects with the right mouse button
2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83
OpenCS: Add selection outline effect to CSVRender::Object
2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b
OpenCS: Remove margin around the render window
2015-09-18 18:29:22 +02:00
Marc Zinnschlag
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
2015-09-17 14:54:29 +02:00
Marc Zinnschlag
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f
more cleanup
2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb
removed some left-over signal slot stuff that shouldn't have been there in the first place
2015-09-17 11:27:55 +02:00
Marc Zinnschlag
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
2015-09-17 09:24:11 +02:00
scrawl
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6
durations in tooltips : water walking effects is seen differently
...
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583
add duration to spell icons too
...
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce
show duration of light sources in tooltip
...
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f
Move setAlpha from NpcAnimation to Animation ( Fixes #2917 )
2015-09-16 16:15:55 +02:00
scrawl
126960261f
Keep playing IdleSneak on the lower body when casting spells / using weapons
2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae
Add convenience operator [] to AnimPriority
2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7
Use the actual sneak state to determine visibility of indicator ( Fixes #2915 )
2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307
Merge branch 'localvarfix'
2015-09-15 14:01:45 +02:00
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
2015-09-15 13:58:07 +02:00
Marc Zinnschlag
82cb16b83c
Merge remote-tracking branch 'cc9cii/opencs-edit-creature'
2015-09-15 09:14:56 +02:00
dteviot
0feae19140
AiCombat use evadeObstacles() from AiPackage.
2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
cc9cii
1365b8edd1
Fix typo.
2015-09-12 11:18:07 +10:00
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
2015-09-12 10:15:32 +10:00
cc9cii
5a5e1a3b22
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
2015-09-12 10:00:23 +10:00
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
2015-09-12 09:33:11 +10:00
cc9cii
258b2ba29a
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
2015-09-12 09:04:43 +10:00
Marc Zinnschlag
0ff786bebd
Merge remote-tracking branch 'origin/master'
2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
2015-09-11 13:02:24 +02:00
Marc Zinnschlag
23fde87816
fixed an indexing error
2015-09-11 10:50:19 +02:00
dteviot
10eabc9d51
actorutil.hpp includes mwworld/ptr.hpp
...
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
Marc Zinnschlag
584a7a66b9
various minor fixes
2015-09-10 12:41:31 +02:00
dteviot
6f97187bb6
Fix travis warning about no newline at end of file.
2015-09-10 22:26:33 +12:00
dteviot
573a14993a
Moved isActorNearInactiveCell() logic to own function.
...
Also, triggers when actor is near edge of cell, not when less than 1/2 way to edge.
2015-09-10 21:53:31 +12:00
dteviot
e9c796166a
Added MWMechanics::isPlayerInCombat()
2015-09-10 18:48:34 +12:00
scrawl
cd0f8e556b
Merge pull request #753 from slothlife/thunderstorm-support
...
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
slothlife
29d74f0249
Improve thunderstorm support.
...
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
2015-09-08 22:05:33 -05:00
Marc Zinnschlag
09ec60fe2a
handle missing land texture records properly during merge
2015-09-08 16:01:34 +02:00
Marc Zinnschlag
73f6efddcc
fixed a texture indexing bug (only affects the editor)
2015-09-08 15:33:15 +02:00
Marc Zinnschlag
353d6973e2
Merge remote-tracking branch 'origin/master'
2015-09-08 08:27:00 +02:00
scrawl
b98a076055
Add documentation for ACTN ess-record (activation flags)
2015-09-07 23:27:14 +02:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
scrawl
5aa33fde43
Include cleanup
2015-09-07 22:16:15 +02:00
scrawl
e5d54fb539
Check for actor being the player in various actions
2015-09-07 22:15:17 +02:00
scrawl
fd48c1d6f4
Make the Equip script function "use" items (drink potion, use alchemy, etc)
2015-09-07 22:09:08 +02:00
scrawl
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
dteviot
96e3933ee9
Fixed bug in smoothTurn()
...
Now correctly handles changing direction from 178 to -178 degrees.
2015-09-06 17:39:48 +12:00
scrawl
acbea2461b
Fix a typo
2015-09-04 23:27:33 +02:00
scrawl
d11952c48a
Stop rendering when the window is minimized
2015-09-04 03:44:14 +02:00
Marc Zinnschlag
a8dc1c1198
merge land tables
2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
b3fdf92d2b
more const-ness fixes
2015-08-31 16:08:19 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
69045d7ec9
additional safety check for land texture listing merge stage
2015-08-31 11:10:58 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
Marc Zinnschlag
a8bee25757
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-08-31 09:18:36 +02:00
Marc Zinnschlag
4b7a034cf9
Merge remote-tracking branch 'slothlife/weather-transition-fix'
2015-08-31 09:03:04 +02:00
scrawl
8aaba0af6f
Fix journal page navigation bug introduced by 7dd09dd637
( Fixes #2899 )
2015-08-30 17:38:21 +02:00
Marc Zinnschlag
890bbb6b11
merge land texture tables
2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba
fixed merge stage order; added proper initialisation
2015-08-30 11:08:56 +02:00
dteviot
1dfe438a5d
reduce "reset if stuck" AiWander timeout.
...
Now is about 14 seconds, instead of 300.
2015-08-30 16:43:35 +12:00
dteviot
39c2ba8efe
Pathfinding bugfix.
...
Observed at Ebonheart (coe 1, -13). Especially at the western tower. Guards try to walk though tower door.
Cause: buildPath() adds destination (even when unreachable) when only using single node from pathgrid.
2015-08-30 16:12:51 +12:00
dteviot
f2c9b9351f
Try going right and left to "unstick" actor.
2015-08-30 10:06:09 +12:00
dteviot
31d82b6b0c
Unifiy evadeObstacles() logic between AiWander and AiPackage
...
Can't use same code, but logic is now same.
2015-08-30 08:32:47 +12:00
dteviot
f59e918a3b
removed useless code.
...
zTurn ignores turns < 0.0087 radians.
2015-08-29 17:34:33 +12:00
dteviot
0677799839
movement logic in AiPackage uses ObstacleCheck.
2015-08-29 17:21:18 +12:00
slothlife
2b48a20b76
Fix weather transition bugs
2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a
Remove redundant fast forward check
2015-08-28 18:04:22 -05:00
Marc Zinnschlag
45e7522aa6
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-28 16:09:18 +02:00
dteviot
300c48329d
Creature::isFlagBitSet() changed to free function.
2015-08-28 18:38:05 +12:00
slothlife
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
2015-08-27 14:53:52 -05:00
slothlife
cd8ec5c11e
Improve checking for older weather records
2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
dteviot
95d2d82abf
extracted isFlagBitSet()
2015-08-27 18:36:46 +12:00
slothlife
c907ed517d
Remove C++11 explicit on conversion operator
2015-08-26 23:34:15 -05:00
slothlife
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
2015-08-26 22:59:21 -05:00
Marc Zinnschlag
a97a632aa7
merge references tables
2015-08-26 17:21:24 +02:00
Marc Zinnschlag
a9f9a8d58e
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-26 15:59:28 +02:00
Marc Zinnschlag
845cafd61c
fixed record state issues after merge
2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8
merge referenceables table
2015-08-25 11:54:16 +02:00
Marc Zinnschlag
9cf793c0b5
silenced a warning
2015-08-25 11:39:43 +02:00
Marc Zinnschlag
40753aa9a3
simplifying merge stage
2015-08-25 08:43:03 +02:00
dteviot
541d7fb4fb
Fixed assorted issues
...
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
Marc Zinnschlag
8f7f29943a
Merge remote-tracking branch 'jordan-ayers/topic/dead-code'
2015-08-24 15:13:53 +02:00
Jordan Ayers
cd5bef958f
Remove dead code from alchemywindow.
...
Also align some braces.
2015-08-24 07:43:30 -05:00
dteviot
bb54bbd273
Pulled duplicated functions into common base class
2015-08-24 19:54:02 +12:00
scrawl
b509a18065
Remove code setting PcRace ( Fixes #2886 )
...
This is already handled by the RaceCheck script.
2015-08-23 14:30:23 +02:00
Marc Zinnschlag
16dda281ce
made merge operation more fluent
2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e
added info tables and pathgrid table to merge operation
2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
2015-08-23 12:37:45 +02:00
Marc Zinnschlag
e76401d5ea
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
2015-08-23 12:15:19 +02:00
Marc Zinnschlag
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-08-23 12:11:30 +02:00
Marc Zinnschlag
562f5cdec1
Merge remote-tracking branch 'scrawl/editor_saving'
2015-08-23 12:07:29 +02:00
scrawl
542c648e69
Fix incorrect assignment of PcRace, need to sort race IDs ( Fixes #2884 )
2015-08-22 22:53:06 +02:00
Stanislav Bas
ba4b7df99d
Add missing includes to columnimp.hpp
2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d
Inform about State change (not a whole row) when modifying a table value
2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf
Fix the ESM::LandTexture NAME being discarded on loading
2015-08-22 13:10:54 +02:00
scrawl
031d64d0d3
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
2015-08-22 12:57:39 +02:00
Marc Zinnschlag
50ec8b10f5
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-22 10:37:43 +02:00
Stanislav Bas
b7295e2632
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51
Remove enum names for AiWanderRepeat column
2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd
ModifyCommand uses a proper name of a modified nested value
2015-08-21 21:47:29 +03:00
Stanislav Bas
d038ac2da0
Sort tables by ID in the ascending order initially
2015-08-21 21:38:28 +03:00
scrawl
ba8e4c22aa
Avoid using loops to wrap angle values ( Fixes #2882 )
2015-08-21 20:17:42 +02:00
scrawl
52d8bc555c
Add missing checks to see if spell still exists when loading a savegame (Bug #2883 )
2015-08-21 14:24:49 +02:00
Marc Zinnschlag
3902513e65
merge id collections
2015-08-21 14:02:32 +02:00
dteviot
5dd0ad6841
Fixed rest of travis errors.
2015-08-21 22:41:31 +12:00
dteviot
3fa5c6a0e7
fixed travis build failure
2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb
replaced FLT_MAX with numeric_limits.
2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb
removed incorrect optimization.
...
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c
Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'
2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f
Correctly handle disjoint pathgrid ( Fixes #2871 )
...
Bugfix:
When
1. Cell has multiple subgrids (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101
extracted common sub-expressions.
2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc
Removed unused cmake import
2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4
Removed long int parameter
2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf
Updated parameter name to reflect units
2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1
Time played displayed in save/load menus
2015-08-19 10:05:08 -04:00
Marc Zinnschlag
9918b57341
Merge remote-tracking branch 'origin/master'
2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48
NPCs scream when they die
2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e
Make an error message slightly more helpful
2015-08-19 01:24:54 +02:00
scrawl
681183df31
Restore handling of fog depth == 0 values (Bug #1549 )
2015-08-19 01:13:14 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
dca08b0b42
Remove a firing assert ( Fixes #2871 )
2015-08-18 14:51:32 +02:00
Marc Zinnschlag
e888fd7034
Merge remote-tracking branch 'scrawl/delete_noop'
2015-08-17 18:21:56 +02:00
Marc Zinnschlag
4f4429151f
Merge remote-tracking branch 'scrawl/editor_flickertypo'
2015-08-17 14:11:46 +02:00
Marc Zinnschlag
3992125b61
Merge remote-tracking branch 'scrawl/master'
2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e
Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft'
2015-08-17 14:04:56 +02:00
Marc Zinnschlag
b5f3f0522a
Merge remote-tracking branch 'slothlife/weather-settings-fix'
2015-08-17 14:03:54 +02:00
scrawl
b583a2ec33
Make SetDelete a no-op for items in containers ( Fixes #2864 )
2015-08-17 00:06:26 +02:00
Jordan Ayers
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
2015-08-16 16:56:44 -05:00
scrawl
d1e1c0f38b
Editor: fix a typo in ESM::Light flag mappings
2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9
copy meta data from game file when merging
2015-08-16 18:27:17 +02:00
scrawl
9fad33cd14
Don't reset the item model's sort/filter options in updatePlayer ( Fixes #2863 )
2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25
Remove an unused function
2015-08-16 17:40:20 +02:00
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
2015-08-16 15:24:48 +02:00
Marc Zinnschlag
5558962b14
Merge remote-tracking branch 'scrawl/editor_creatureflag'
2015-08-16 10:13:11 +02:00
Marc Zinnschlag
8bb28c3236
Merge remote-tracking branch 'corristo/osx-hidpi'
2015-08-16 10:06:38 +02:00
dteviot
4d9d8a060d
Pathing bugfix.
...
When path contains one one point from path grid, point is no longer being discarded.
2015-08-16 18:56:28 +12:00
dteviot
942a987d52
centralize the world/cell coordinate conversion logic.
2015-08-16 18:55:02 +12:00
dteviot
5049c9ab6a
removed unnecessary tests.
2015-08-16 17:41:33 +12:00
slothlife
3d419a612a
Corrected some weather transition calculations
...
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
2015-08-15 23:38:49 -05:00
scrawl
8426d376f0
Use separate touch spell raycasts for actors and objects ( Fixes #2849 )
2015-08-16 02:06:04 +02:00
scrawl
afb3d94ba4
Fix cell names in the save/load menu not being localised ( Fixes #2840 )
2015-08-16 01:55:14 +02:00
scrawl
c25dacb480
Fix "Level" string in the save/load menu not being localised (Bug #2840 )
2015-08-16 01:53:58 +02:00
scrawl
8241976368
Don't attempt to play non-existing hit animations ( Fixes #2856 )
2015-08-15 23:27:37 +02:00
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
scrawl
7dd09dd637
Fix being able to flip journal pages with the mousewheel when the options overlay is active ( Fixes #2855 )
2015-08-15 20:44:15 +02:00
scrawl
58cd2b1a84
Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? ( Fixes #2148 )
2015-08-15 19:01:21 +02:00
scrawl
e36ebc77d5
Editor: remove creature flag of unknown purpose from the UI
2015-08-15 18:39:00 +02:00
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
2015-08-15 16:09:53 +02:00
scrawl
d76fb2d266
Apply disintegrate only to weapons and armor ( Fixes #2853 )
2015-08-14 13:38:39 +02:00
Marc Zinnschlag
5aeabe22f0
Merge remote-tracking branch 'dteviot/PathfindingRefactor'
2015-08-14 10:13:04 +02:00
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
2015-08-13 17:08:21 +02:00
scrawl
1e18a73b1c
Don't play magic effect sounds & visual effects for unsuitable targets ( Fixes #2811 )
2015-08-13 17:08:21 +02:00
scrawl
211deeb63e
Don't attempt to lock or unlock unsuitable objects ( Fixes #2826 )
2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563
Properly apply changes when backing out of chargen dialogs ( Fixes #2627 )
2015-08-13 17:08:21 +02:00
scrawl
86f0e505e9
Add a fixPosition for the --start exterior cell ( Fixes #2790 )
2015-08-13 17:08:20 +02:00
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
2015-08-13 17:01:25 +02:00
Marc Zinnschlag
d8655f2ff8
forgot to connect merge operation signals
2015-08-13 14:49:32 +02:00
Marc Zinnschlag
e2377396a7
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
2015-08-13 12:03:20 +02:00
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
2015-08-13 10:15:27 +02:00
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
2015-08-11 21:46:54 -05:00
dteviot
55e3aaaa35
made variable const.
2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc
Removed tests that are not necessary.
2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593
extracted function stopAttack().
2015-08-09 14:29:38 +12:00
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
2015-08-09 14:20:55 +12:00
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e
2015-08-09 14:06:52 +12:00
Marc Zinnschlag
708cacdec4
disable merge menu item when a merge is already in progress
2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
2015-08-08 10:50:38 +02:00
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
2015-08-08 10:47:46 +02:00
Marc Zinnschlag
be6a85c7aa
Merge remote-tracking branch 'emperorarthur/nif_tester_updates'
2015-08-08 10:47:12 +02:00
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
2015-08-08 10:42:02 +02:00
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
2015-08-08 10:35:58 +02:00
Arthur Moore
20078c41c3
Removed now unneeded script
2015-08-07 20:53:43 -04:00
Arthur Moore
c7b97ee9ba
Cleaned up niftest's output
...
A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
2015-08-07 20:52:34 -04:00
Arthur Moore
3d78ee0c2b
niftest now scans BSA files in directories for nif errors
...
The program is explicit so the user knows exactly where the bad file is.
2015-08-07 20:52:25 -04:00
Arthur Moore
6a6da42b85
Updated niftest's help message
2015-08-07 20:52:04 -04:00
Arthur Moore
efadce3e90
Have niftest handle directories as well
...
Note: BSA files within the directory must be passed manually.
2015-08-07 20:51:44 -04:00
Arthur Moore
865491d101
Added a help message to niftest
...
Now using the boost argument parser.
2015-08-07 20:51:25 -04:00
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
2015-08-07 15:34:01 +02:00
scrawl
52dbb24bb9
Merge pull request #708 from slothlife/sky-render-fixes
...
Fix several sky rendering bugs, maybe also #639
2015-08-07 12:47:51 +02:00
slothlife
3235cecddf
Use Glare View for visibility of celestial bodies
...
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
2015-08-06 14:17:42 +03:00
Marc Zinnschlag
4fd3097c1c
improved adjuster widget problem reporting
2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-08-06 08:45:38 +02:00
slothlife
238ae419a3
Fix use of incorrect material for Sun
2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
2015-08-05 21:03:21 -05:00
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
2015-08-06 02:54:47 +02:00
slothlife
ea2f88a355
Fix several sky rendering bugs, maybe also #639
...
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
taras.kudryavtsev
8ae7c63c45
#2730 and #2725
2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289
Don't allow empty value of School field in Magic Effects table
2015-08-04 16:19:00 +03:00
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68
Removed redundant if.
2015-08-04 18:17:08 +12:00
dteviot
4256e151b1
Fixed error in deciding type of attack
2015-08-04 18:15:58 +12:00
dteviot
21e249cb92
pass parameters as const &
2015-08-04 18:14:36 +12:00
Stanislav Bas
8da9eecea7
Correct comparison of enum values in IdTableProxyModel
2015-08-03 19:24:00 +03:00
Stanislav Bas
0ea4d1981a
Add magic effect verifier
2015-08-03 19:08:01 +03:00
Marc Zinnschlag
06f170a8e1
Merge remote-tracking branch 'origin/master'
2015-08-03 10:52:32 +02:00
Marc Zinnschlag
9ba85f697c
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
2015-08-03 10:42:06 +02:00
Stanislav Bas
6b3de5c720
Activate editing of nested table cells by a double click
2015-08-02 22:53:40 +03:00
Stanislav Bas
1590a04d03
Close EditWidget when a proper row removed
2015-08-02 22:39:41 +03:00
Stanislav Bas
33042c1464
Restore Modified status of a record when adding/removing nested rows
2015-08-02 21:52:55 +03:00
scrawl
664ae079db
Improve setting of culling mask for the savegame screenshot camera
2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6
Fix NotifyDrawCompletedCallback in single threaded mode
2015-08-02 17:57:50 +02:00