mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:49:56 +00:00
Code Issues Releases Wiki Activity
14671 commits 38 branches 54 tags 122 MiB
Commit graph

11145 commits

Author SHA1 Message Date
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
Stanislav Bas
25b653e316 Inform about Modified status change when modifying a value of a model 2015-08-02 15:06:56 +03:00
Stanislav Bas
afb36b73eb Proper index for Modified column in ModifyCommand 2015-08-02 15:03:27 +03:00
Marc Zinnschlag
e73c115ff5 Merge remote-tracking branch 'origin/master' 2015-08-02 13:44:17 +02:00
Marc Zinnschlag
529041f6f6 Merge remote-tracking branch 'slothlife/moon-settings' 2015-08-02 13:43:55 +02:00
slothlife
0244a9b329 Correct moon texture with respect to trajectory 2015-08-01 07:57:05 -05:00
Arthur Moore
08d5aaf0fc Remove more comments 2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5 Don't warn twice when unable to play an idle animation 2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637 Don't try to play animations we know are bad 
Prevents log spam
 2015-07-31 18:01:02 -04:00
scrawl
7644a46ded Creatures with no movement should not attempt to start combat (Fixes #2786) 2015-07-31 01:26:26 +02:00
scrawl
f326b8e5d2 Fix weapon animations playing on the lowerbody when swimming 2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e Play swimming animation fallback on the upper body when possible 2015-07-31 00:35:41 +02:00
scrawl
1f755a2bc0 Don't use a shared Material in AlphaFader 2015-07-31 00:03:01 +02:00
slothlife
67a63cc662 Add some const correctness to MoonModel 2015-07-30 14:00:08 -05:00
Arthur Moore
5ea596f38d Refactor onChooseActionStatePerFrameActions 
This prevents playIdle errors from tyring to play idleAnimation 0
 2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263 Alert the user if trying to play a non-idle animation 
Continue to propagate success/failure up the call stack.
 2015-07-30 08:08:58 -04:00
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.
 2015-07-30 08:00:26 -04:00
Marc Zinnschlag
26ea3aa1ad Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-30 10:26:40 +02:00
slothlife
a4e1630ec2 Remove unreferenced member in MoonModel 2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6 Fix forward declaration of MoonState 2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe Implement accurate moon settings (fixes #672) 2015-07-29 23:57:45 -05:00
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.
 2015-07-28 06:51:47 -04:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
scrawl
7ba399fc92 Change a message to upper case spelling 
More consistent with other loading messages
 2015-07-28 03:21:44 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Marc Zinnschlag
420503d5fc Merge remote-tracking branch 'smbas/fix-bug-2728' 2015-07-27 11:23:49 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +02:00
Stanislav Bas
812fffbadc Don't inform about a nested row addition in proxy models for top-level tables 2015-07-26 20:25:46 +03:00
Stanislav Bas
2471e4d67a Rework Table to use rowAdded() signal of a proxy model 2015-07-26 20:09:31 +03:00
Stanislav Bas
86b7d2a43d Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-26 20:07:36 +03:00
Stanislav Bas
37fd733deb Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-26 20:06:30 +03:00
Marc Zinnschlag
b2fdfbcfe4 Merge remote-tracking branch 'pkubik/distance-setting' 2015-07-26 11:01:12 +02:00
dteviot
04aee1fe20 extracted function reactionTimeActions(). 2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70 extracted function returnToStartLocation(). 2015-07-26 17:29:32 +12:00
dteviot
5e519ef550 extract function isPackageFinished(). 2015-07-26 17:29:01 +12:00
dteviot
ad0d807103 extracted function reactionTimeActions(). 2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28 extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions(). 2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7 extract function onWalkingStatePerFrameActions(). 2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba extract function onIdleStatePerFrameActions(). 2015-07-26 17:24:33 +12:00
dteviot
b3d5b47fea extracted function UpdateActorsMovement(). 2015-07-26 17:23:45 +12:00
scrawl
dff84adf7e Fix weapon animation priority 2015-07-26 01:35:36 +02:00
dteviot
aba7225817 Removed some duplicated operations. 2015-07-26 11:15:21 +12:00
scrawl
41996b0aad Don't play turning animations in first person mode 2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b Adjust the movement animation speed every frame (Fixes #1921) 2015-07-25 18:22:48 +02:00
Stanislav Bas
c088cd4fa9 Proper index creation for nested data 2015-07-25 18:32:13 +03:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
3bca3e73d4 Fix GetWeaponDrawn and GetSpellReadied script functions for creatures 2015-07-25 02:11:59 +02:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0 Outdated comment fix 2015-07-25 00:28:47 +02:00
scrawl
3f3c3d0ad3 Remove an already resolved todo comment 2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc Include cleanup 2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
71bc22401f Include cleanup 2015-07-24 18:23:23 +02:00
Marc Zinnschlag
fcf9ae42f4 Merge remote-tracking branch 'smbas/fix-table-proxy-bugs' 2015-07-24 10:29:08 +02:00
Rohit Nirmal
6d2d32485f Fix building OpenCS with Qt 5. 2015-07-23 22:22:22 -05:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Stanislav Bas
a7b3248ee7 Proper sorting of columns with enum values 2015-07-23 20:35:16 +03:00
scrawl
7e4e59efb9 Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792) 2015-07-23 02:29:09 +02:00
scrawl
7900631d51 Print the missing player cell to error output 2015-07-23 02:29:09 +02:00
scrawl
8286dc6c5a Player followers don't report crimes (Fixes #2457) 2015-07-23 02:29:09 +02:00
Marc Zinnschlag
6e3032efc1 Merge remote-tracking branch 'koncord/fix-gold-beh' 2015-07-22 08:30:43 +02:00
Koncord
6c3c85f0d4 Fix indent 
Remove misc.hpp in containerstore.cpp
 2015-07-20 21:53:20 +09:00
Marc Zinnschlag
f3d3cbc58b Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-20 09:57:46 +02:00
Marc Zinnschlag
d2cd151f77 Merge remote-tracking branch 'kunesj/master' 2015-07-20 09:45:14 +02:00
dteviot
2a4d35b98c fixed "comma at end of enumerator list" warning. 2015-07-20 18:20:57 +12:00
Koncord
7a86c8d8b6 Fix OpAddItem, OpGetItemCount and OpRemoveItem. 2015-07-20 12:48:19 +09:00
Koncord
a24df8cb66 Revert addImp() and remove() 
add isGold() in MWWorld::Class
 2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44 Fix "removeitem gold_100" behavior 2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07 Fix "additem gold_100" behavior 2015-07-20 08:20:28 +09:00
Koncord
75e5023590 fix code duplication 2015-07-20 08:06:43 +09:00
Jiří Kuneš
a14a3c82de added description of new syntax to the onRetrieveTag function comment 2015-07-19 19:52:50 +02:00
Marc Zinnschlag
9b3d5c958f Merge remote-tracking branch 'scrawl/music' 2015-07-19 11:49:00 +02:00
Marc Zinnschlag
137d5e2586 Merge remote-tracking branch 'scrawl/master' 2015-07-19 11:46:06 +02:00
dteviot
00eef585af renamed mPlayedIdle to mIdleAnimation. 2015-07-19 18:04:42 +12:00
dteviot
22f49128cc replaced multiple booleans with single state variable. 2015-07-19 18:02:13 +12:00
dteviot
1ed6e95c07 Got rid of some radians to degrees to radians conversions. 2015-07-19 18:01:25 +12:00
dteviot
3ebe9fb34f renamed mRotate to mTurnActorGivingGreetingToFacePlayer 2015-07-19 18:00:49 +12:00
scrawl
b01abe4d19 Stop title music when the game starts (Fixes #2468) 2015-07-19 02:08:24 +02:00
scrawl
1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +02:00
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)
 2015-07-18 20:39:45 +02:00
scrawl
77f1387da8 Include cleanup 2015-07-18 20:36:28 +02:00
Marc Zinnschlag
833ad5a2b4 Merge remote-tracking branch 'origin/master' 2015-07-18 17:48:05 +02:00
Marc Zinnschlag
cdfa3006a3 incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-18 17:47:50 +02:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Marc Zinnschlag
f1ac440b78 do not allow editing of deleted scripts 2015-07-18 17:00:00 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
scrawl
111cf5462b Merge pull request #666 from scrawl/animation 
Animation refactoring & fixes
 2015-07-18 13:33:41 +02:00
Marc Zinnschlag
73b6df8280 put script compilation in script subview behind a timer 2015-07-18 13:09:17 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
Marc Zinnschlag
e921552053 Merge remote-tracking branch 'scrawl/opencs' 2015-07-18 11:58:20 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96 Merge remote-tracking branch 'kunesj/master' 2015-07-18 11:34:04 +02:00
slothlife
f8f0380413 Fix for loading window icon on Windows 2015-07-17 21:41:53 -05:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
scrawl
a33ca75742 Pass AnimPriority by const reference 2015-07-18 03:23:41 +02:00
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.
 2015-07-18 03:09:04 +02:00
scrawl
c783b50a83 Fix config file priority in the launcher to match OpenMW 2015-07-18 01:38:35 +02:00
scrawl
6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9 Use multimap to speed up custom map marker code 2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16 removed setCrosshairOwned from windowmanager 2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d use correct mechanics manager 2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93 change collor of crosshair 2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
Marc Zinnschlag
5febb96012 do not try to jump to source location for errors that do not have a source location 2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046 consider column when jumping to error in source text 2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4 jump to line in source text when clicking on an error in error table 2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388 made error table read only 2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd improved error table layout 2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160 consider script warning settings for script subview 2015-07-17 11:52:59 +02:00
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.
 2015-07-17 03:39:09 +02:00
scrawl
660e7f5d89 Don't update animation states in skipAnim mode (Fixes #2782) 2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2 Don't restart the jump animation when equipping a different weapon (Fixes #2286) 2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1 Fix enchantments casting more than once per button press, broken by a1432b0255 2015-07-16 19:56:09 +02:00
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.
 2015-07-16 19:55:05 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d improved error reporting 2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f display script errors in script subview 2015-07-16 12:36:20 +02:00
scrawl
f8d360190d Remove an unneeded virtual 2015-07-15 19:10:09 +02:00
scrawl
992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 2015-07-15 18:52:23 +02:00
scrawl
17ada63fcb Don't play turning animations on the upperbody when in first person mode (Fixes #2287) 2015-07-15 16:43:11 +02:00
scrawl
3656851750 Remove the now unused changeBlendMask 2015-07-15 16:43:11 +02:00
scrawl
83cceeee72 Use the extended animation priority for Block animations, allow starting attacks during a block animation (Fixes #2761) 2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c Use the extended animation priority for Hit animations 2015-07-15 16:33:10 +02:00
scrawl
50db6ed396 Use the extended animation priority for weapon animations 2015-07-15 14:40:36 +02:00
scrawl
e93a578f23 Extend the animation priority system to one priority value per bone group / distinct blend mask 2015-07-15 14:18:31 +02:00
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.
 2015-07-15 13:49:16 +02:00
Marc Zinnschlag
df027b3498 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4 fixed deleted button sensitivity state 2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03 improving consistency of subview layouts 2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24 replaced the script subview status bar with a bottom box (including a status bar) 2015-07-14 10:05:45 +02:00
scrawl
de6dc21552 Create hardware cursors in advance (Fixes #2660) 2015-07-13 23:36:25 +02:00
scrawl
dca4704b4b Print exceptions in CharacterCreation::spawnDialog 2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a Select the current resolution in resolution list on game start (Fixes #2768) 2015-07-13 18:00:41 +02:00
Marc Zinnschlag
fc6c14614b added user settings option to toggle toolbars in single-record subviews 2015-07-13 12:52:18 +02:00
Marc Zinnschlag
749eff5259 renaming a few user settings categories 2015-07-13 09:42:16 +02:00
Marc Zinnschlag
d22f8703e5 Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-13 09:09:01 +02:00
dteviot
ddeabcdfbe Removed unused field that was giving compiler warning. 2015-07-12 17:15:41 +12:00
dteviot
e294cd95cd extracted function playIdleDialogueRandomly() 2015-07-12 17:15:14 +12:00