Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
10 years ago
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
10 years ago
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
10 years ago
dteviot
55e3aaaa35
made variable const.
10 years ago
dteviot
e42a2478dc
Removed tests that are not necessary.
10 years ago
dteviot
2b9e22f593
extracted function stopAttack().
10 years ago
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
10 years ago
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
10 years ago
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
10 years ago
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
10 years ago
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
10 years ago
Marc Zinnschlag
708cacdec4
disable merge menu item when a merge is already in progress
10 years ago
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
10 years ago
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
10 years ago
Marc Zinnschlag
be6a85c7aa
Merge remote-tracking branch 'emperorarthur/nif_tester_updates'
10 years ago
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
10 years ago
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
10 years ago
Arthur Moore
20078c41c3
Removed now unneeded script
10 years ago
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
10 years ago
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.
10 years ago
Arthur Moore
6a6da42b85
Updated niftest's help message
10 years ago
Arthur Moore
efadce3e90
Have niftest handle directories as well
...
Note: BSA files within the directory must be passed manually.
10 years ago
Arthur Moore
865491d101
Added a help message to niftest
...
Now using the boost argument parser.
10 years ago
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
10 years ago
scrawl
52dbb24bb9
Merge pull request #708 from slothlife/sky-render-fixes
...
Fix several sky rendering bugs, maybe also #639
10 years ago
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.
10 years ago
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
10 years ago
Marc Zinnschlag
4fd3097c1c
improved adjuster widget problem reporting
10 years ago
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
10 years ago
Marc Zinnschlag
469a896ca1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
10 years ago
slothlife
238ae419a3
Fix use of incorrect material for Sun
10 years ago
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
10 years ago
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
10 years ago
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.
10 years ago
taras.kudryavtsev
8ae7c63c45
#2730 and #2725
10 years ago
Stanislav Bas
cbc8309289
Don't allow empty value of School field in Magic Effects table
10 years ago
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
10 years ago
dteviot
ad9bab0b68
Removed redundant if.
10 years ago
dteviot
4256e151b1
Fixed error in deciding type of attack
10 years ago
dteviot
21e249cb92
pass parameters as const &
10 years ago
Stanislav Bas
8da9eecea7
Correct comparison of enum values in IdTableProxyModel
10 years ago
Stanislav Bas
0ea4d1981a
Add magic effect verifier
10 years ago
Marc Zinnschlag
06f170a8e1
Merge remote-tracking branch 'origin/master'
10 years ago
Marc Zinnschlag
9ba85f697c
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
10 years ago
Stanislav Bas
6b3de5c720
Activate editing of nested table cells by a double click
10 years ago
Stanislav Bas
1590a04d03
Close EditWidget when a proper row removed
10 years ago
Stanislav Bas
33042c1464
Restore Modified status of a record when adding/removing nested rows
10 years ago
scrawl
664ae079db
Improve setting of culling mask for the savegame screenshot camera
10 years ago
scrawl
88c61ed2b6
Fix NotifyDrawCompletedCallback in single threaded mode
10 years ago
Stanislav Bas
25b653e316
Inform about Modified status change when modifying a value of a model
10 years ago
Stanislav Bas
afb36b73eb
Proper index for Modified column in ModifyCommand
10 years ago
Marc Zinnschlag
e73c115ff5
Merge remote-tracking branch 'origin/master'
10 years ago
Marc Zinnschlag
529041f6f6
Merge remote-tracking branch 'slothlife/moon-settings'
10 years ago
Marc Zinnschlag
9ee3f1bfe7
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
10 years ago
slothlife
0244a9b329
Correct moon texture with respect to trajectory
10 years ago
Marc Zinnschlag
9392e426c0
Merge remote-tracking branch 'origin/master' into mergetool
10 years ago
Marc Zinnschlag
15e8275443
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
10 years ago
Arthur Moore
08d5aaf0fc
Remove more comments
10 years ago
Arthur Moore
6fce49bfb5
Don't warn twice when unable to play an idle animation
10 years ago
Arthur Moore
61c3835637
Don't try to play animations we know are bad
...
Prevents log spam
10 years ago
scrawl
7644a46ded
Creatures with no movement should not attempt to start combat ( Fixes #2786 )
10 years ago
scrawl
f326b8e5d2
Fix weapon animations playing on the lowerbody when swimming
10 years ago
scrawl
e8cbdcfb1e
Play swimming animation fallback on the upper body when possible
10 years ago
scrawl
1f755a2bc0
Don't use a shared Material in AlphaFader
10 years ago
slothlife
67a63cc662
Add some const correctness to MoonModel
10 years ago
Arthur Moore
5ea596f38d
Refactor onChooseActionStatePerFrameActions
...
This prevents playIdle errors from tyring to play idleAnimation 0
10 years ago
Arthur Moore
f69de1f263
Alert the user if trying to play a non-idle animation
...
Continue to propagate success/failure up the call stack.
10 years ago
Arthur Moore
5e6fcc2aef
Alert the user if attempting to play an animation fails
...
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
10 years ago
Marc Zinnschlag
6a9218ee07
replaced State_Compiling (not requried anymore) with State_Merging
10 years ago
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
10 years ago
slothlife
a4e1630ec2
Remove unreferenced member in MoonModel
10 years ago
slothlife
8dc7e158c6
Fix forward declaration of MoonState
10 years ago
slothlife
24ba54f4fe
Implement accurate moon settings ( fixes #672 )
10 years ago
Arthur Moore
2a653e45fd
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
10 years ago
Marc Zinnschlag
2c1cee38b4
Merge remote-tracking branch 'smbas/feature-extended-configurator'
10 years ago
scrawl
7ba399fc92
Change a message to upper case spelling
...
More consistent with other loading messages
10 years ago
Stanislav Bas
03c2e11961
Update to upstream/master. Resolve merge conflicts
10 years ago
Marc Zinnschlag
420503d5fc
Merge remote-tracking branch 'smbas/fix-bug-2728'
10 years ago
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
10 years ago
Stanislav Bas
812fffbadc
Don't inform about a nested row addition in proxy models for top-level tables
10 years ago
Stanislav Bas
2471e4d67a
Rework Table to use rowAdded() signal of a proxy model
10 years ago
Stanislav Bas
86b7d2a43d
Inform about a row addition after re-sorting in InfoTableProxyModel
10 years ago
Stanislav Bas
37fd733deb
Create a custom signal to inform about a row addition in IdTableProxyModel
10 years ago
Marc Zinnschlag
b2fdfbcfe4
Merge remote-tracking branch 'pkubik/distance-setting'
10 years ago
dteviot
04aee1fe20
extracted function reactionTimeActions().
10 years ago
dteviot
c7aacaee70
extracted function returnToStartLocation().
10 years ago
dteviot
5e519ef550
extract function isPackageFinished().
10 years ago
dteviot
ad0d807103
extracted function reactionTimeActions().
10 years ago
dteviot
9c0e3d6c28
extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions().
10 years ago
dteviot
76f95eafe7
extract function onWalkingStatePerFrameActions().
10 years ago
dteviot
5ec310dfba
extract function onIdleStatePerFrameActions().
10 years ago
dteviot
b3d5b47fea
extracted function UpdateActorsMovement().
10 years ago
scrawl
dff84adf7e
Fix weapon animation priority
10 years ago
dteviot
aba7225817
Removed some duplicated operations.
10 years ago
scrawl
41996b0aad
Don't play turning animations in first person mode
10 years ago
scrawl
e0ee2fc01b
Adjust the movement animation speed every frame ( Fixes #1921 )
10 years ago
Stanislav Bas
c088cd4fa9
Proper index creation for nested data
10 years ago
scrawl
278076e609
Include cleanup
10 years ago
scrawl
3bca3e73d4
Fix GetWeaponDrawn and GetSpellReadied script functions for creatures
10 years ago
scrawl
b3f5ac5dbb
Include cleanup
10 years ago
scrawl
e6b28d84f0
Outdated comment fix
10 years ago
scrawl
3f3c3d0ad3
Remove an already resolved todo comment
10 years ago
scrawl
4f6e5345cc
Include cleanup
10 years ago
Pawel Kubik
47922f6c35
Changed a settings variable responsible for number of loaded exterior cells.
10 years ago
scrawl
7f66339790
Remove a redundant function
10 years ago
scrawl
71bc22401f
Include cleanup
10 years ago
Marc Zinnschlag
fcf9ae42f4
Merge remote-tracking branch 'smbas/fix-table-proxy-bugs'
10 years ago
Rohit Nirmal
6d2d32485f
Fix building OpenCS with Qt 5.
10 years ago
Stanislav Bas
f5b1447c92
IdTableProxyModel refreshes the filter when the source model data or rows changed
10 years ago
Stanislav Bas
a7b3248ee7
Proper sorting of columns with enum values
10 years ago
scrawl
7e4e59efb9
Fix excessive auto-equipping in InventoryStore::removeItem ( Fixes #2792 )
10 years ago
scrawl
7900631d51
Print the missing player cell to error output
10 years ago
scrawl
8286dc6c5a
Player followers don't report crimes ( Fixes #2457 )
10 years ago
Marc Zinnschlag
6e3032efc1
Merge remote-tracking branch 'koncord/fix-gold-beh'
10 years ago
Koncord
6c3c85f0d4
Fix indent
...
Remove misc.hpp in containerstore.cpp
10 years ago
Marc Zinnschlag
f3d3cbc58b
Merge remote-tracking branch 'dteviot/refactoringAiWander'
10 years ago
Marc Zinnschlag
d2cd151f77
Merge remote-tracking branch 'kunesj/master'
10 years ago
dteviot
2a4d35b98c
fixed "comma at end of enumerator list" warning.
10 years ago
Koncord
7a86c8d8b6
Fix OpAddItem, OpGetItemCount and OpRemoveItem.
10 years ago
Koncord
a24df8cb66
Revert addImp() and remove()
...
add isGold() in MWWorld::Class
10 years ago
Koncord
9485aa5e44
Fix "removeitem gold_100" behavior
10 years ago
Koncord
aefcd1ad07
Fix "additem gold_100" behavior
10 years ago
Koncord
75e5023590
fix code duplication
10 years ago
Jiří Kuneš
a14a3c82de
added description of new syntax to the onRetrieveTag function comment
10 years ago
Marc Zinnschlag
9b3d5c958f
Merge remote-tracking branch 'scrawl/music'
10 years ago
Marc Zinnschlag
137d5e2586
Merge remote-tracking branch 'scrawl/master'
10 years ago
dteviot
00eef585af
renamed mPlayedIdle to mIdleAnimation.
10 years ago
dteviot
22f49128cc
replaced multiple booleans with single state variable.
10 years ago
dteviot
1ed6e95c07
Got rid of some radians to degrees to radians conversions.
10 years ago
dteviot
3ebe9fb34f
renamed mRotate to mTurnActorGivingGreetingToFacePlayer
10 years ago
scrawl
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
10 years ago
scrawl
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
10 years ago
Jiří Kuneš
a5b4e087c5
define owned colours in settings.cfg
10 years ago
Jiří Kuneš
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
10 years ago
scrawl
278a078e9d
Unify magic effect tick functions
...
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
10 years ago
scrawl
77f1387da8
Include cleanup
10 years ago
Marc Zinnschlag
833ad5a2b4
Merge remote-tracking branch 'origin/master'
10 years ago
Marc Zinnschlag
cdfa3006a3
incorrect sBribe GMSTs for new omwgame files ( Fixes #2785 )
10 years ago
Marc Zinnschlag
b2ab0122ab
Merge branch 'scriptbuttons'
10 years ago
Jiří Kuneš
75f5972898
show owned - better settings
10 years ago
Marc Zinnschlag
f1ac440b78
do not allow editing of deleted scripts
10 years ago
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
10 years ago
Marc Zinnschlag
8763a3b3c3
make compilation delay configurable via a user setting
10 years ago
scrawl
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
10 years ago
Marc Zinnschlag
73b6df8280
put script compilation in script subview behind a timer
10 years ago
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
Marc Zinnschlag
e921552053
Merge remote-tracking branch 'scrawl/opencs'
10 years ago
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
964cd44e96
Merge remote-tracking branch 'kunesj/master'
10 years ago
slothlife
f8f0380413
Fix for loading window icon on Windows
10 years ago
scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
10 years ago
scrawl
a33ca75742
Pass AnimPriority by const reference
10 years ago
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
scrawl
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
10 years ago
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
10 years ago
Jiří Kuneš
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
10 years ago
Jiří Kuneš
e68b388d16
removed setCrosshairOwned from windowmanager
10 years ago
Jiří Kuneš
c019f8e23d
use correct mechanics manager
10 years ago
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
10 years ago
Jiří Kuneš
66edae9b93
change collor of crosshair
10 years ago
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
10 years ago
Marc Zinnschlag
5febb96012
do not try to jump to source location for errors that do not have a source location
10 years ago
Marc Zinnschlag
f665919046
consider column when jumping to error in source text
10 years ago
Marc Zinnschlag
0abd29a3b4
jump to line in source text when clicking on an error in error table
10 years ago
Marc Zinnschlag
100af80388
made error table read only
10 years ago
Marc Zinnschlag
56ed0926bd
improved error table layout
10 years ago
Marc Zinnschlag
eab1ec9160
consider script warning settings for script subview
10 years ago
scrawl
91d71d0fcd
Disable MyGUI's scrollbar autorepeat ( Fixes #2779 )
...
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
10 years ago
scrawl
660e7f5d89
Don't update animation states in skipAnim mode ( Fixes #2782 )
10 years ago
scrawl
cc59493cb2
Don't restart the jump animation when equipping a different weapon ( Fixes #2286 )
10 years ago
scrawl
b5c79738f1
Fix enchantments casting more than once per button press, broken by a1432b0255
10 years ago
scrawl
f6f82d433c
Fix bug with loop key assignment
...
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.
This fixes incorrect playing of the jump animation, one aspect of Bug #2286 .
10 years ago
Marc Zinnschlag
9b12b4f1e2
refactored mapping from message severity enum to string
10 years ago
Marc Zinnschlag
2d8a78726d
improved error reporting
10 years ago
Marc Zinnschlag
2016ff773f
display script errors in script subview
10 years ago
scrawl
f8d360190d
Remove an unneeded virtual
10 years ago
scrawl
992b770315
Don't set OnPcEquip for items that failed to equip ( Fixes #2776 )
10 years ago
scrawl
17ada63fcb
Don't play turning animations on the upperbody when in first person mode ( Fixes #2287 )
10 years ago
scrawl
3656851750
Remove the now unused changeBlendMask
10 years ago
scrawl
83cceeee72
Use the extended animation priority for Block animations, allow starting attacks during a block animation ( Fixes #2761 )
10 years ago
scrawl
cf14d1748c
Use the extended animation priority for Hit animations
10 years ago
scrawl
50db6ed396
Use the extended animation priority for weapon animations
10 years ago
scrawl
e93a578f23
Extend the animation priority system to one priority value per bone group / distinct blend mask
10 years ago
scrawl
335ef97cf5
Rename Animation::Group to Animation::BlendMask
...
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
10 years ago
Marc Zinnschlag
df027b3498
hooked up script subview buttons to bottom box (enables add and clone)
10 years ago
Marc Zinnschlag
cf1fb76bb4
fixed deleted button sensitivity state
10 years ago
Marc Zinnschlag
0860c27b03
improving consistency of subview layouts
10 years ago
Marc Zinnschlag
2202973c24
replaced the script subview status bar with a bottom box (including a status bar)
10 years ago
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
10 years ago
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
10 years ago
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
10 years ago
Marc Zinnschlag
fc6c14614b
added user settings option to toggle toolbars in single-record subviews
10 years ago
Marc Zinnschlag
749eff5259
renaming a few user settings categories
10 years ago
Marc Zinnschlag
d22f8703e5
Merge remote-tracking branch 'dteviot/refactoringAiWander'
10 years ago
dteviot
ddeabcdfbe
Removed unused field that was giving compiler warning.
10 years ago
dteviot
e294cd95cd
extracted function playIdleDialogueRandomly()
10 years ago
dteviot
22059d68f6
Remove duplicated code.
10 years ago
dteviot
0b089a5564
extracted function evadeObstacles()
10 years ago
dteviot
1ef78b1e56
extracted playGreetingIfPlayerGetsTooClose()
10 years ago
dteviot
df421fce92
extracted function setPathToAnAllowedNode()
10 years ago
dteviot
b508846a64
Renamed mStoredAvailableNodes to mPopulateAvailableNodes.
...
Don't call getAllowedNodes() needlessly.
10 years ago
Marc Zinnschlag
b97a4cee44
added button bar to script subview
10 years ago
Marc Zinnschlag
dacb93c57f
Merge remote-tracking branch 'scrawl/coverity_scan'
10 years ago
scrawl
0ed3e3e489
Fix cout/cerr mixup
10 years ago
scrawl
24ae1d5ace
Fix some issues found by coverity
10 years ago
scrawl
667c80fb2a
Add brackets around a correct expression to fix coverity warning
10 years ago
scrawl
ebdd5dc993
Fix code that I forgot to uncomment (thanks coverity)
10 years ago
Alexander "Ace" Olofsson
12f413ba9b
Don't instantiate specialized templates
...
This fixes the VS2012 build issue
10 years ago
Marc Zinnschlag
ba9a9d16bb
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
10 years ago
scrawl
f12619b86a
Implement fStromWindSpeed ( Fixes #2764 )
10 years ago
Alexander "Ace" Olofsson
b3b55a5842
Explicitly instantiate MWWorld::Store
10 years ago
Alexander "Ace" Olofsson
b1cc74dd9a
Explicity instantiate MWMechanics::Stat
10 years ago
Marc Zinnschlag
87a089d6b6
Merge remote-tracking branch 'dteviot/Bug2726'
10 years ago
dteviot
f1774ee7c3
Fixed compile failing on OSX and Linux.
10 years ago
dteviot
52cf8541f5
End point tolerance restored to 64 units.
...
Corrected problem pointed out by Scrawl.
Destination needs tolerance of 64 to avoid overcrowding.
10 years ago
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
10 years ago
dteviot
40a925ad37
Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726
10 years ago
MiroslavR
13f289d1a5
Fix calculation of selected blocks in ScriptEdit
10 years ago
Marc Zinnschlag
e89614a35d
Merge remote-tracking branch 'origin/master'
10 years ago
Marc Zinnschlag
88f1220a77
Merge remote-tracking branch 'dteviot/Bug2726'
10 years ago
scrawl
49c07de773
Merge pull request #643 from ace13/win-build-fix
...
Fix build error and a pair of warnings
10 years ago
Alexander "Ace" Olofsson
aaaee74a4d
Fix the comments
10 years ago
Stanislav Bas
47d21ff4b3
Add edit locking to ExtendedCommandConfigurator
10 years ago
Stanislav Bas
3c6bc74062
Close the extended configurator when all respective records were removed outside
10 years ago
Marc Zinnschlag
e0781a5d70
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
6c5dc5c7a0
Merge remote-tracking branch 'smbas/fix-cell-creating'
10 years ago
Stanislav Bas
ceb3dea55c
Rewording of the user setting for extended configuration
10 years ago
scrawl
531bca1273
Add a threshold for changing aicombat targets ( Fixes #2755 )
10 years ago
Stanislav Bas
6162a46fbe
Update to upstream/master. Resolve the merge conflict
10 years ago
Marc Zinnschlag
432384d280
Merge remote-tracking branch 'scrawl/aicombat'
10 years ago
Marc Zinnschlag
ea1ddb5c9f
Merge remote-tracking branch 'smbas/feature-dialogue-edit-id'
10 years ago
Stanislav Bas
3ffa0aa185
Count of nested columns can be retrieved for a collection with no records
10 years ago
dteviot
1239667cb4
AiWander uses points between PathGrid points ( Fixes #1317 )
...
When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.
10 years ago
dteviot
eb2aa965b9
Extracted function SetCurrentNodeToClosestAllowedNode()
10 years ago
dteviot
76f20b8b20
fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.
10 years ago
dteviot
0095737c40
Use correct type of variable. Remove unnecessary casts.
10 years ago
dteviot
f942db2b27
Simplified code.
10 years ago
dteviot
9a02a85a24
Pulled duplicate code into function.
10 years ago
scrawl
c90841d649
Fix head tracking for NPCs
10 years ago
Stanislav Bas
4fbd24206b
ExtendedCommandConfigurator: layout changes
10 years ago
Stanislav Bas
880bc31ddf
TableBottomBox: Creator/Configurator can be closed via Escape
10 years ago
Stanislav Bas
c1b06538dc
Add Edit 'ID' action for nested fields
10 years ago
Stanislav Bas
30fd711a47
TableEditIdAction: prevent creation of a UniversalId with Type_None
10 years ago
Stanislav Bas
86dc5a2c67
Add Edit 'ID' action for nested tables
10 years ago
Stanislav Bas
464e674a81
Rework Table (view) code to use a TableEditIdAction
10 years ago
Stanislav Bas
6b34845168
Create a separate class for Edit 'ID' action to use in tables' context menus
10 years ago
dteviot
fae93e3d82
Bugfix: was not resetting mStuckCount.
10 years ago
dteviot
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
10 years ago
dteviot
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
10 years ago
scrawl
6bcea21e14
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876 )
10 years ago
Stanislav Bas
1f826476ff
Fix build error
10 years ago
Stanislav Bas
ff3c9a6fb2
ExtendedCommandConfigurator: the perform button is now the default for the widget
10 years ago
Stanislav Bas
e664ef7578
ExtendedCommandConfigurator: the perform button takes the name of the command that is executed
10 years ago
Stanislav Bas
05cc130212
The configuration panel gets a focus when opening
10 years ago
Stanislav Bas
95d16b24c0
ExtendedCommandConfigurator: disable the perform button when all tables are unchecked
10 years ago
Stanislav Bas
260f6f22ae
TableBottomBox adjusts its size according to the current widget size
10 years ago
Stanislav Bas
d73fd471c3
IdContextMenu: don't add Edit action if it's already in the context menu
10 years ago
Stanislav Bas
61ab0ba482
Prevent the Edit 'ID' action for the current ID of the dialogue subview
10 years ago
Stanislav Bas
149cb9d004
IdContextMenu: if the ID field is empty show the standard context menu (if available)
10 years ago
Stanislav Bas
e8e34f37dd
Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)
10 years ago
Stanislav Bas
47b66b57ae
Create a context menu handler for dialogue editors with ID information
10 years ago
Marc Zinnschlag
382cdb8c60
implemented sorting in report views ( Fixes #2540 )
10 years ago
scrawl
a7bd050928
Accurate attack timings in AiCombat
10 years ago
scrawl
741e5db862
Fix for non-bipedal creatures that use weapons, e.g. rieklings
10 years ago
scrawl
2385938485
Fix a typo
10 years ago
scrawl
82740c1645
Remove completely broken code
10 years ago
scrawl
d07b176b36
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
10 years ago
scrawl
520a832a9a
Remove an already resolved todo comment
10 years ago
Stanislav Bas
12bf3694bd
Rework widget layout of ExtendedCommandConfigurator
10 years ago
scrawl
6724585777
Light magic effect
...
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364 )
10 years ago
scrawl
bf9c62fa42
Fix for some coverity scan defects
10 years ago
scrawl
dcb8fbc69c
Accurate handling of fog depth/density ( Fixes #2752 )
10 years ago
Stanislav Bas
b8772c6902
Add the ability to configure extended commands for tables
10 years ago
Stanislav Bas
fcf69555f4
Add the user setting for enabling the configuration of extended commands
10 years ago
scrawl
6691891bee
Include cleanup
10 years ago
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
10 years ago
scrawl
519fb9482a
Minor cleanup
10 years ago
Stanislav Bas
ba762ec1c1
Add the configuration widget to the bottom box
10 years ago
Stanislav Bas
1949fe4bf9
Add the configuration widget for extended commands
10 years ago
Marc Zinnschlag
dafb1b5fa9
Merge remote-tracking branch 'smbas/master'
10 years ago
Stanislav Bas
1afa22f443
Add the RecordType column to the MetaData table
10 years ago
Alexander "Ace" Olofsson
5d24091364
Fix build error and a pair of warnings
...
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
10 years ago
scrawl
2065e0fa2d
Use the correct format specifier for ess-imported savegames
10 years ago
scrawl
20d03c7e39
Refuse loading save games of unknown format
10 years ago
scrawl
a081d402c5
Use the format field instead of version field
10 years ago
scrawl
4637750601
Savegame loading optimization
10 years ago
scrawl
4eaaa5e855
Increment save file version and mark it as used, will be used in next commit
10 years ago
Stanislav Bas
51a2d4ef5a
Merge remote-tracking branch 'upstream/master'
10 years ago
Marc Zinnschlag
d3bcf0711c
Merge remote-tracking branch 'smbas/feature-cloning-enhancements'
10 years ago
scrawl
ca21e9ecb1
Fix magic hit VFX showing when casting on a static object
10 years ago
scrawl
4b2391c60f
Ignore effect meshes in getScreenBounds
10 years ago
scrawl
d5a47cfafe
Include cleanup
10 years ago
Stanislav Bas
e2103287aa
Not accepted drag event must be ignored
10 years ago
scrawl
017c9f7ac9
Fading for weather particle effects
10 years ago
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
Stanislav Bas
e4d52ff9b0
Deleted records can be cloned
10 years ago
Stanislav Bas
9d274ee156
Merge branch 'master' into feature-cloning-enhancements
10 years ago
Stanislav Bas
81c7ce5b06
Add the proper getErrors() method to CellCreator.
...
Fix the impossibility of the Exterior Cell creation.
10 years ago
Marc Zinnschlag
15bb2855a9
disable prev/next buttons if there is no previous/next record
10 years ago
Marc Zinnschlag
e27a75bd10
added user setting for cyclic prev/next
10 years ago
Marc Zinnschlag
95522fcad2
more general cleanup
10 years ago
Marc Zinnschlag
9aa153984a
fixed inconsistent handling of deleted records in dialogue; general cleanup
10 years ago
Marc Zinnschlag
a8c26ec0c1
moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar
10 years ago
Marc Zinnschlag
d5e6d8a58b
disable dialogue subview buttons while document is locked
10 years ago
Marc Zinnschlag
6769479358
moved code for initiating record cloning from DialogueSubView to RecordButtonBar
10 years ago
Marc Zinnschlag
7f1129df3b
cleaned up DialogueSubView constructor; moved bottom box below button bar
10 years ago
Marc Zinnschlag
49dc30683f
refactored dialogue subview button bar into a new class
10 years ago
Stanislav Bas
cbb124ab4f
Close the creator when the original record is removed (in clone mode)
10 years ago
Stanislav Bas
cad4ce4e0f
Cell type can be changed when cloning a cell
10 years ago
Stanislav Bas
5761ec428d
Creating/cloning Cell sets the proper Interior flag
10 years ago
Stanislav Bas
f3bb00e3d9
Add the ability to add nested values to the Create command
10 years ago
Stanislav Bas
a7f31988d1
Add the ability to search a nested column index
10 years ago
Marc Zinnschlag
6d5823e8aa
killed some tabs
10 years ago
Marc Zinnschlag
fdf6645dbc
Merge remote-tracking branch 'smbas/fix-info-tables'
10 years ago
Marc Zinnschlag
654e7428aa
Merge remote-tracking branch 'smbas/master'
10 years ago
Marc Zinnschlag
2dada1a162
Merge branch 'meta'
10 years ago
Marc Zinnschlag
4487bda702
size limits for meta data strings
10 years ago
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
10 years ago
Marc Zinnschlag
a4c2c75d1f
fixed overwriting of meta data when loading project file
10 years ago
Marc Zinnschlag
1e033fa8fe
added meta data dialogue sub view
10 years ago
Marc Zinnschlag
57015f3666
fixed handling of numeric read-only fields in dialogue sub views
10 years ago
Marc Zinnschlag
10fbe6aada
split DialogueSubView in SimpleDialogueSubView and DialogueSubView
10 years ago
Marc Zinnschlag
5a37530c1c
added missing MetaData table UniversalId type
10 years ago
Marc Zinnschlag
1870b087e7
ported setting of meta data for saving to the new mechanism
10 years ago
Marc Zinnschlag
f3ff90e1fd
moved meta data into a new single-row table
10 years ago
Stanislav Bas
feeb9ea8b0
Merge remote-tracking branch 'upstream/master'
10 years ago
scrawl
a44be148d8
Fix door collisions
10 years ago
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl
beb1086260
Fix attackStrength being unset for creatures with no weapons
10 years ago
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
10 years ago
scrawl
4ef6aa6b7f
Fix weather particles disappearing
10 years ago
scrawl
ea0339d471
Make the string argument to BetaComment optional
10 years ago
Stanislav Bas
ea97b0a20c
Refine InfoTableProxyModel::getFirstInfoRow() code
10 years ago
Stanislav Bas
844e5c504d
Fix conversion to QString
10 years ago
Stanislav Bas
867ce686ae
Proper conversion to QString for DropLineEdit::dropEvent()
10 years ago
scrawl
8a3889a81e
Rain fading
10 years ago
scrawl
3a21f05f6e
Rain effect
10 years ago
Marc Zinnschlag
8fbc799655
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
69db0179ca
update refresh menu item on stateChanged signal instead of when opening the menu
10 years ago
cc9cii
c0f3d70f06
Use the new severity message attribute.
10 years ago
cc9cii
71f3b7ed4f
Fix crash when user preference is missing.
10 years ago
Marc Zinnschlag
6fbdbb11d5
added refrash menu item to report table ( Fixes #2620 )
10 years ago
Stanislav Bas
d282bead23
InfoCreator accepts drops of Topic/Journal ID
10 years ago
Stanislav Bas
5b82b9d9d0
ReferenceCreator accepts drops of Cell ID
10 years ago
Stanislav Bas
21f0b586ec
Rows with the same topic but in different letter case can be reordered
10 years ago
Marc Zinnschlag
e29d9bcc8e
use a namespace instead of a class with only static functions
10 years ago
Marc Zinnschlag
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
10 years ago
Stanislav Bas
270c17faa7
Prevent drops on non-editable table cells
10 years ago
Stanislav Bas
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
10 years ago
scrawl
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
10 years ago
scrawl
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
10 years ago
scrawl
d7695f2560
Remove unused NpcAnimation visibilityFlags
10 years ago
scrawl
d5b73f2a55
Move HeadAnimationTime to the implementation file
10 years ago
scrawl
24bfb44b13
Move head tracking from NpcAnimation to Animation (Bug #2720 )
10 years ago
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
Marc Zinnschlag
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
10 years ago
scrawl
3f54f77647
essimporter build fix
10 years ago
Stanislav Bas
d606b62688
Nested tables accept drops
10 years ago
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
10 years ago
Stanislav Bas
b9882eb59a
DragRecordTable checks drag type before accepting it
10 years ago
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
10 years ago
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
10 years ago
Stanislav Bas
a23de394f8
Refine DropLineEdit code
10 years ago
Stanislav Bas
2565452052
Add some drag'n'drop utils to work with TableMimeData
10 years ago
dteviot
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
10 years ago
Stanislav Bas
dc37aea8eb
Add missing mappings to TableMimeData
10 years ago
Stanislav Bas
7dcdd130bb
Rework Dialogue subview code according to DropLineEdit changes
10 years ago
Marc Zinnschlag
c644f15167
calm down travis
10 years ago
Marc Zinnschlag
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
10 years ago
Marc Zinnschlag
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
10 years ago
Marc Zinnschlag
8791832c86
standarised on the use of the Message struct when passing operations messages around
10 years ago
Stanislav Bas
64701b273d
LineEdits for ID values accept drops with a proper type
10 years ago
scrawl
ad6764fa6a
Fix bug #2715
10 years ago
Marc Zinnschlag
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
10 years ago
Stanislav Bas
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
10 years ago
Marc Zinnschlag
9a102f81c8
added setting for controlling script compiler warnings
10 years ago
Marc Zinnschlag
1ee1934053
framework for accessing user settings in operation stages
10 years ago
Stanislav Bas
ced4e237a8
Fix the sorting of Info tables when new row are added
10 years ago
Marc Zinnschlag
8aba52170f
fixed a build error
10 years ago
Stanislav Bas
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
10 years ago
scrawl
efad4efe19
Star fading (Bug #2693 )
10 years ago
scrawl
74260a9a44
Tweak moon sizes
10 years ago
scrawl
f5c50aa581
Disable FreezeOnCull for effect particles
10 years ago
Stanislav Bas
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
10 years ago
scrawl
1ed4e33815
Fading for mooncircle texture
10 years ago
scrawl
38d90f47a6
Moon fading fix (Bug #2713 )
10 years ago
Stanislav Bas
e212414bc7
Use an ID parent type as the collection ID in GenericCreator.
...
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
10 years ago
Stanislav Bas
581ba55db9
Add Topic/Journal Id completion to InfoCreator
10 years ago
Stanislav Bas
a6734a0ea4
Add Cell Id completion to ReferenceCreator
10 years ago
scrawl
2b53e5d965
Fix for explosion effects playing when the game is paused
10 years ago
scrawl
e0dfc1425e
Correct moon blending
10 years ago
scrawl
0c4ebee6b3
Cloud opacity & cross-fading
10 years ago
scrawl
fb94395628
Fix atmosphere lighting
10 years ago
Stanislav Bas
36271f25ec
Rework creator factories to accept Document as a parameter
10 years ago
Marc Zinnschlag
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
Marc Zinnschlag
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
10 years ago
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
scrawl
04010b8a1a
Set OnPcHitMe even for missed hits
10 years ago
scrawl
76799982a5
Add missing include
10 years ago
Stanislav Bas
cf487581f7
Show the pop-up of ColorEditor immediately after the editor creation in tables
10 years ago
Marc Zinnschlag
12e0873446
Merge remote-tracking branch 'smbas/feature-info-tables-sorting'
10 years ago
Marc Zinnschlag
63d46f7e66
removed an unused variable
10 years ago
Marc Zinnschlag
0b32b24d60
Merge remote-tracking branch 'smbas/fix-enumdelegates'
10 years ago
scrawl
fabc5126f3
Include cleanup
10 years ago
Stanislav Bas
c60fed89ac
Enable sorting for Info tables
10 years ago
scrawl
0ffa1f964b
Fix water ripple height
10 years ago
Stanislav Bas
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
10 years ago
Stanislav Bas
2e40b68862
Add a custom proxy model for Info tables
10 years ago
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
10 years ago
scrawl
3ebfb4e0d9
Ignore particle systems in getScreenBounds
10 years ago
scrawl
b543308e3e
Remove an already resolved todo comment
10 years ago
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
10 years ago
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
10 years ago
scrawl
7b35882814
RemoveParticlesVisitor fix
10 years ago
Stanislav Bas
ed09424223
Correct the position of the colored rectangle in ColorEditor and ColorDelegate
10 years ago
Stanislav Bas
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
scrawl
1c151f2f0a
Re-enable some outcommented sky code
10 years ago
Stanislav Bas
1e368de289
Adjust columns of nested tables when a dialog subview is opened
10 years ago
scrawl
3da8f6e62e
Water ripples
10 years ago
Stanislav Bas
6cfee630aa
Proper size hint for DataDisplayDelegate
10 years ago
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
scrawl
b73947033d
Rotate sky meshes
10 years ago
Stanislav Bas
2c1ca33a20
Refactor Enum- and DataDisplayDelegate code
10 years ago
Stanislav Bas
0ffb2bc6bc
Proper size hint for EnumDelegate
10 years ago
Marc Zinnschlag
62c5f185d7
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
13112c6d04
Merge remote-tracking branch 'scrawl/aiwanderfix'
10 years ago
cc9cii
6a47ea9a67
fix typo
10 years ago
cc9cii
cccf6c6bdd
Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644 .
10 years ago
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
10 years ago
scrawl
2d072aab2d
Broken bone references from .kf files are no longer a fatal error (Bug #2687 )
10 years ago
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
10 years ago
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
10 years ago
scrawl
609e146a22
Build fixes for windows
10 years ago
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
10 years ago
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
10 years ago
scrawl
07937c741a
Improve exception handling when starting a new game from the main menu
10 years ago
scrawl
a5b72a358b
Prune empty nodes in RemoveDrawableVisitor
...
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
10 years ago
scrawl
f017fd6860
Reduce includes in animation.hpp
10 years ago
scrawl
412e001edb
Fix simulation time reset in OpenCS when opening a new view
10 years ago
scrawl
b90fc8ad92
Fix for various Viewer::frame calls resetting the simulationTime
10 years ago
scrawl
9fc2c2e8ee
Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677 )
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
scrawl
2476cd4f9a
Error message fix
10 years ago
scrawl
195e1a8410
Fix the Viewer's FrameStamp not being set correctly during Engine::frame
10 years ago
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
10 years ago