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

12972 commits

Author SHA1 Message Date
Aesylwinn
1f32f1eef5 Add water texture. 2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7 Use shared water geometry + state generation, 
Fix water position and render bin,
Fix passed cell parameter being ignored
 2016-08-05 13:49:44 -04:00
Aesylwinn
5753f52b47 Move water mesh + simple state generation to components library. 2016-08-05 13:25:05 -04:00
Koncord
114a11ea78 Getting rid of packages spam 
I think this is temporary solution. I have an idea how to cache the result of functions and send data after callback.
 2016-08-05 14:28:45 +08:00
Koncord
7898b1181d Reduced package size 2016-08-05 14:21:09 +08:00
Koncord
a815d013fe Reducing CPU usage for server 2016-08-05 14:16:02 +08:00
Aesylwinn
3904a24e6c Add missing include. 2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24 Render water in editor. 2016-08-04 23:01:43 -04:00
Koncord
e4e17ca4b9 Close #30 2016-08-05 00:31:15 +08:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
David Cernat
8dd8e22a0b Replace tabs with spaces in LocalPlayer changes 2016-08-04 00:55:28 +03:00
David Cernat
3362902396 Update position after changing cell (for real) 2016-08-04 00:03:05 +03:00
David Cernat
b0bd10f219 Allow script-based teleportation from interior to exterior cell 0,0 2016-08-03 22:07:49 +03:00
LohikaarmeHAV
19c74a4d6e Part two 2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592 First part 2016-08-03 20:20:55 +03:00
lohikaarme
e8ef5c233f Miss info 2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf Commnent? 2016-08-03 14:22:25 +03:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
lohikaarme
48bcde8cc9 ... 2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc hups 2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c Nah 
Preview seem to not like removing mCamPositionSet and I have do other things.
 2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8 Forgot to remove line and add comment. 2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c Removed debug 2016-08-02 14:10:08 +03:00
Koncord
b4c7914a25 Added <memory> header for Windows 2016-08-02 19:00:43 +08:00
LohikaarmeHav
c6ec473280 Camera reset now every time cell object->view is pressed. 2016-08-02 13:46:43 +03:00
Koncord
74c103ddc1 Fixed types in all GetInterface functions 
Move lib_t type to Scripts/Types.hpp
 2016-08-02 18:10:06 +08:00
Koncord
e513c3676d Added forgotten header to project 2016-08-02 17:53:56 +08:00
Koncord
9375b540d6 removed '#undef _SEP_' 2016-08-02 17:35:18 +08:00
Koncord
bdfaea2d46 Implement 'setenv' for windows 
Paths converter
Move 'split' from main to Utils
 2016-08-02 17:32:10 +08:00
scrawl
3374630e7b Merge pull request #1008 from Internecine/bug3451-invalid-enchantments 
Fixes Bug 3451 - Invalid Enchantment IDs
 2016-08-02 10:14:59 +02:00
David Cernat
72026955f5 Add missing preprocessor directive for Windows build of server 2016-08-02 07:08:31 +03:00
Internecine
90735d226d Replaced Store::find usage with Store::search to remove exception handlers. 2016-08-02 11:43:41 +12:00
David Cernat
09d564424f Translate Russian code comment into English 2016-08-01 19:26:42 +03:00
Marc Zinnschlag
f32d0121fc Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts' 2016-08-01 09:57:11 +02:00
Internecine
14165352f6 Added exception handlers when trying to retreive enchantment and magic effect data. 2016-08-01 13:16:42 +12:00
Aesylwinn
f73d60cc73 Make scene controls use configurable speed modifier. 2016-07-31 16:28:03 -04:00
Aesylwinn
bf2ab4ed45 Change the way modifiers are handled so they can be shared. 2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888 Revert "Change scene controls to more closely match blender as requested" 
This reverts commit bc7ae70f0b.
 2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b Change scene controls to more closely match blender as requested 
in the forums.
 2016-07-30 09:53:45 -04:00
Koncord
31e2ab54d6 Revert "Update position after changing cell" 
This reverts commit 5e072b9d3c.
 2016-07-30 04:57:43 +08:00
Aesylwinn
1cce085fa2 Remove unused headers. 2016-07-29 16:35:43 -04:00
Koncord
5e072b9d3c Update position after changing cell 2016-07-30 04:12:47 +08:00
Aesylwinn
2f97d6cffb Move tool tip processing to ShortcutManager, 
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
 2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2 Change some key binding defaults. 2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90 Clean up modifier/shortcut class and handle focus out event, 
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
 2016-07-29 15:00:35 -04:00
Koncord
7107136808 New API 
SetExterior(pid, x, y)
GetExteriorX(pid)
GetExteriorY(pid)

also "SetCell" will now move to the named external cells (e.g. SetCell(pid, "Balmora"))
 2016-07-30 01:33:28 +08:00
Koncord
0549a7a01d Fixed type cast 2016-07-28 20:09:12 +08:00
Aesylwinn
96a3c278fd Added shortcuts for loading a cell relative to the camera, 
Removed Ctl+V binding for "Verify" because that is associated
with paste.
 2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6 Add custom page for key bindings. 2016-07-27 19:15:24 -04:00
mrcheko
293a0f768c use real distance to target to determinate 'ready to attack' state 2016-07-27 23:43:32 +03:00
LohikaarmeHav
f142f9bf86 wtf 2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c Add ability to clear shortcut/modifier setting with right click. 2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114 Add modifier setting. 2016-07-27 13:53:33 -04:00
Marc Zinnschlag
63fd1e8df7 Merge remote-tracking branch 'origin/master' 2016-07-27 15:49:11 +02:00
Koncord
23a37fc7fc Ignore LuaBridge warnings 
Remove TINYXML_LIBRARIES
 2016-07-27 17:53:26 +08:00
Koncord
d3414148fc Simplify LangLua::Call 2016-07-27 17:51:23 +08:00
Aesylwinn
b204758be1 More shortcuts. 2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d Exclude keys not compatible with qt 4 2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b Remove QShortcut usage, 
Add a lot of shortcuts,
Remove debug messages
 2016-07-27 00:24:16 -04:00
Koncord
5a6c1750d9 Fixed some build warnings and IsTimerElapsed function 2016-07-27 10:35:27 +08:00
Aesylwinn
08af82e1bd Switched to an interactive method for key input, 
Redid text representation for shortcuts
 2016-07-26 21:22:31 -04:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01:00
Stanislav Zhukov
075b600b3a Fix for Windows 2016-07-27 06:55:21 +08:00
Aesylwinn
05888e7925 Updated more tool tips to show shortcut configs. 2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150 Fix pathgrid selection mode not being removed from toolbar. 2016-07-25 20:49:28 -04:00
Aesylwinn
051aec2729 Added methods to keep text mentioning shortcuts up to date, 
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
 2016-07-25 20:49:09 -04:00
Stanislav Zhukov
4316d4d1bf Merge pull request #21 from TES3MP/tes3mp-gui 
Tes3mp gui
 2016-07-25 16:16:32 -05:00
Aesylwinn
f251c3867d Redesigned shortcut handler to be capable of dealing with child and 
parent widgets. This should be the final design change. Also, some
various bug fixes.
 2016-07-23 21:23:02 -04:00
Koncord
86dccbed4b Fix CMake 2016-07-24 02:30:07 +08:00
David Cernat
f4342f0bde Stop requiring amx folder for non-Pawn builds. Use correct Windows identifiers for preprocessor directives in server code. 2016-07-23 20:06:14 +03:00
Koncord
1e3eff91ac Merged branch tes3mp-gui into tes3mp-gui 2016-07-23 22:08:01 +08:00
Koncord
9ab77cb123 New API functions: MessageBox, CustomMessageBox, InputDialog 
New Callback: OnGUIAction
 2016-07-23 22:02:06 +08:00
Stanislav Zhukov
fe50394f4d Fix movement desync 
I think this should fix all movements desyncs
 2016-07-22 23:40:34 +08:00
Aesylwinn
acdb636935 Qt4 protected signal workaround and signed/unsigned mismatch. 2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c Changed shortcut design to allow a configurable second output. Also 
re-added shift for temporarily changing camera speed.
 2016-07-22 01:58:17 -04:00
MiroslavR
4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220 Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
MiroslavR
d790747389 Implement deletion of moved references (Bug #3471) 2016-07-22 01:59:02 +02:00
davidcernat
ab309180c2 Add useful debug info for cell changes 2016-07-21 23:07:37 +03:00
Aesylwinn
1b5273f2b7 Finally re-added rendering stats, refactored some functions 
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
 2016-07-20 15:00:00 -04:00
AnyOldName3
59639e3988 Make it build again (but remove the new functionality). 2016-07-20 15:16:53 +01:00
Aesylwinn
faa84e0a35 - Further extended usage of new shortcut class 
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
 2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de Added orbit "center on selection" shortcut. 2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a Changes in shortcut design. 
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
 2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839 Remove use of c++11 feature and add some missing headers. 2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0 Base key config/shortcut implementation 2016-07-20 08:25:11 -04:00
AnyOldName3
95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 2016-07-20 02:48:57 +01:00
davidcernat
3c8543bfaf Make player references cross exterior cells only when called by server 
Previously, clientside representations of players were able to move to a new exterior cell once during their movement tick and then again when sending a cell change packet to the server. Besides causing crashes in CellRef because of a messy cell-changing record, this also led to major desyncs.

Clientside representations of players can now only change their cells when a server-sent cell change packet specifically allows it.
 2016-07-20 03:26:25 +03:00
David Cernat
360eec30a0 Merge pull request #2 from OpenMW/master 
Add recent OpenMW commits by AnyOldName3
 2016-07-20 02:58:57 +03:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Aesylwinn
3483b54df5 Build fix. 2016-07-18 00:05:27 -04:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a Fix transition between exterior cells for non-local players 
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
 2016-07-17 22:03:20 +03:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
Koncord
6f07d590d4 Fix SetPos and SetAngle functions 
Fix types for SetPos and SetAngle
 2016-07-17 17:59:46 +08:00
mrcheko
203804ff15 fix AiPackage repeating 2016-07-16 19:08:49 +03:00
mrcheko
59a1a6d117 checkWayIsClear: remove PATHFIND_CAUTION_DIST check 2016-07-16 19:07:48 +03:00
Stanislav Zhukov
645a21af21 Added new script functions for lua compatibility 
GetPosX, GetPosY, GetPosZ
GetAngleX, GetAngleY, GetAngleZ
 2016-07-16 16:19:35 +08:00
Stanislav Zhukov
ce92f30022 Fix maximum incoming connections 2016-07-13 04:24:42 +08:00
Stanislav Zhukov
b09e4a0218 Fix chat 'y' 
Now you can close chat only if pressed 'Enter'.
 2016-07-13 03:21:30 +08:00
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01:00
Koncord
299c4c904e Resurrect function 2016-07-12 23:26:53 +08:00
GrimKriegor
ace719507c Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1 
https://github.com/TES3MP/TES3MP/issues/1
 2016-07-12 01:42:05 +01:00
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
mrcheko
b4e94e2aae Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
 2016-07-12 00:45:01 +03:00
AnyOldName3
1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce fix hardcoded melee attack ranges 2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c Trim unneeded code 2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
scrawl
2329812988 Merge pull request #995 from Allofich/traps 
Trap and lock fixes
 2016-07-10 17:19:36 +02:00
scrawl
67d3571fac Fix activation distance in third person mode 2016-07-10 17:10:19 +02:00
mrcheko
05794505c8 travis build fix 2016-07-10 17:25:50 +03:00
Allofich
599e6708ec Allow using keys to open trapped objects of lock level 0 2016-07-10 23:08:11 +09:00
Allofich
cabe038a97 Make lockpick and probe sounds 3d positional 2016-07-10 22:08:42 +09:00
Allofich
249918612d Play trap disarm sound when key used on trapped object 2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
mrcheko
f57858b750 Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
 2016-07-10 14:36:48 +03:00
MiroslavR
b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20 Fix actors lacking turning animations while in first person mode 2016-07-10 01:48:54 +02:00
mrcheko
d2fe6fe857 Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/aicombat.hpp
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
#	apps/openmw/mwmechanics/aiwander.cpp
#	apps/openmw/mwmechanics/aiwander.hpp
 2016-07-09 22:59:54 +03:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989 Clean up, remove unnecessary code changes 2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a Allow some telekinesis on teleport doors 2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0 Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
e362e3e6a5 Fix cppcheck warnings 2016-07-07 23:50:48 +08:00
Poncho
5b3ac5ff27 Use correct direction multipliers during awareness check 2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
scrawl
994ad3e004 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 2016-07-07 23:50:48 +08:00
scrawl
cd8c84dc6c Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 2016-07-07 23:50:48 +08:00
scrawl
5d4063d8c7 LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Allofich
0e5c3f781f Only allow trap distance check to apply to player 2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d Cleanups 2016-07-07 21:57:00 +09:00
Allofich
cb621939fd Streamline trap code 2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
Allofich
8014f37879 Avoid duplicate code 2016-07-07 21:54:30 +09:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00
Allofich
e25e698978 Fix telekinesis check for activators 2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7 Apply magic effects while waiting/sleeping 2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4 Player's death now interrupts waiting/sleeping 2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c Clear projectiles on non-incremental time advances 2016-07-06 00:11:58 +02:00
mrcheko
0793e4a80e refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck 2016-07-05 21:38:41 +03:00
Allofich
c1236f4113 Simplified code 2016-07-04 20:25:25 +09:00
Allofich
c02695e56d Cleanups and fixes 2016-07-04 16:06:16 +09:00
Allofich
199607423b Use iMaxActivateDist for AI actors that use Activate packages 2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5 Use raycast distance when player activates trapped object 2016-07-04 16:06:15 +09:00
Allofich
64d53a2314 Avoid double raycasts when using getFacedObject 2016-07-04 16:06:04 +09:00
Allofich
574e40db5e Don't allow telekinesis on activators 2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc Merge pull request #980 from scrawl/voice_fix 
Voice fix
 2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a Do not set change flag when running forEach on an empty cell 2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80 Fix for "RigGeometry rendering with no skeleton" errors 2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c Fix non-predefined cells not being saved correctly 2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234 Cache magic effects in MWMechanics::Spells 2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e Show remnant corprus effects in magic window 2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae Implement effect removal for abilities (Fixes #3455) 2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef Remove getEyePos() 2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77 Don't allow telekinesis on actors or teleport doors 2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90 Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects 2016-06-29 22:54:11 +02:00
scrawl
528de956da Merge pull request #981 from Allofich/magicka 
Fix timing of some magicka calculations
 2016-06-29 20:42:18 +02:00
Allofich
2290346296 Fix timing of some magicka calculations 2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7 Merge pull request #965 from kpp/find_tinyxml 
Find tinyxml
 2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d Include cleanup 2016-06-27 22:10:30 +02:00
scrawl
4699a8098b Include fix 2016-06-27 21:51:18 +02:00
scrawl
1739351b7a Remove now unused Sound_Decoder::rewind() 2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0 Don't analyze the loudness for sounds that don't need it 2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb Analyze the loudness data as the stream is decoded for playback 
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.

The benefit is that we need to decode the audio just once instead of twice.

We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
 2016-06-27 21:32:54 +02:00
scrawl
fc293aa048 Merge pull request #978 from Allofich/fatigue 
Fix update of fatigue display
 2016-06-27 17:05:05 +02:00
scrawl
5d9f611869 Merge pull request #979 from MiroslavR/master 
Show correct class image in level-up dialog
 2016-06-27 16:58:50 +02:00
Allofich
1602eb3de8 Fix so that keepPlayerAlive() will not run twice 2016-06-27 21:43:49 +09:00
Allofich
19a20a6871 Fix update of fatigue display 2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a Remove redundant part of condition 2016-06-26 15:17:52 +02:00
Marc Zinnschlag
594444a85a Merge remote-tracking branch 'aesylwinn/MultipleDeletion' 2016-06-26 08:11:43 +02:00
MiroslavR
0db3af1b89 ESSImporter: load specialization increases 2016-06-26 03:28:13 +02:00
MiroslavR
dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 2016-06-26 03:22:58 +02:00
Allofich
dc468dd139 Fix magicka and fatigue calculations from fortifying attributes 2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b Update disposition check between persuasion attempts 2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75 Make NPCs use both hands in weaponless combat. 2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc Cleanup of #include statements 2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650 Use namespace block in aiactivate 2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a Add missing include 2016-06-17 04:34:31 +02:00
scrawl
c18de84798 Fix a crash that could occur when two or more plugins move a deleted ref to another cell (Fixes #3446) 2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e Merge pull request #967 from Allofich/AIPackageFixes 
AI package cleanups
 2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2 AI package cleanups 2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a Float to surface fix 2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07 Split refreshCurrentAnims into multiple functions 2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18 Merge pull request #962 from Allofich/AIPackageFixes 
Duration fixes for Follow and Escort
 2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e Duration fixes for Follow and Escort 2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290 Make a copy of map key to work around it being invalidated (Fixes #3329) 2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72 Uses FindTinyXML to find package 2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros 
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
 2016-06-12 14:44:04 +03:00
scrawl
4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 2016-06-12 02:43:33 +02:00
scrawl
910ad76e29 Remove spell effects when a summoned creature expires (Bug #3439) 2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439) 2016-06-12 00:40:55 +02:00
scrawl
a825882c6b Process death events at the end of the death animation (Fixes #1873) 2016-06-12 00:04:50 +02:00
scrawl
37afe966cf Update comment 2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f Reject weather dialogue conditions when in an interior cell (Fixes #3437) 2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14 Add isNullAction() method to fix compiler warning 2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1 Do not consider actors following the player as hostiles 2016-06-11 18:26:20 +02:00
Marc Zinnschlag
148f2c9539 Merge remote-tracking branch 'aesylwinn/QTimerFix' 2016-06-11 11:26:14 +02:00
scrawl
a85932a62b Ignore the collision box offset when launching projectiles (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab Do not use the collision box offset for combat hit tests (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9 Use fCombatDistance as the creature attack range 2016-06-10 23:47:01 +02:00
Aesylwinn
f6c3b44cfb Fix QTimer not being stopped in right thread 2016-06-10 12:10:14 -04:00
Daniel Pettersson
943d9d97dc Slowfall now stops momentum when jumping 2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3 Fix another bug related to vanity mode toggle 2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9 Fix queueing of vanity mode toggle (Bug #3421) 2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9 Do not use/assign the camera distance in first person mode (Fixes #3421) 2016-06-10 01:05:43 +02:00
scrawl
166cced22f Merge pull request #957 from svaante/master 
Added 1.5 bonus for ranged weapons when weapons are rated
 2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222 Merge pull request #954 from Allofich/AIWanderDuration 
Improve duration calculations in Wander AI
 2016-06-09 23:46:37 +02:00
Aesylwinn
ae50300053 Add ability to remove multiple rows in subrecords. 2016-06-09 15:42:40 -04:00
Allofich
55ac1fab68 Change Wander duration to run on a counter 2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884 Added 1.5 bonus for ranged weapons when weapons are rated 2016-06-09 21:23:36 +02:00
Marc Zinnschlag
3dce406829 Merge remote-tracking branch 'aesylwinn/FixFocus' 2016-06-09 08:57:05 +02:00
scrawl
abcd2219e8 Ignore the calling actor in getEnemiesNearby / getActorsFighting 2016-06-08 22:13:21 +02:00
Aesylwinn
2f39a6e20d Fix camera input not being reset when focus for widget is lost. 2016-06-08 13:25:47 -04:00
Marc Zinnschlag
447ba08be5 Merge remote-tracking branch 'aesylwinn/FixTracking' 2016-06-08 09:23:35 +02:00
scrawl
165f048792 Do not count dead NPCs as observers (Fixes #3434) 2016-06-07 22:01:44 +02:00
Aesylwinn
7657684dad Fix mouse tracking to fix tooltip behavior. Also hide tooltips 
when the mouse is moved.
 2016-06-07 13:22:39 -04:00
scrawl
12eea9ed69 Remove magic number in getMaxActivationDistance 2016-06-07 15:18:36 +02:00
Marc Zinnschlag
b079db7913 Merge remote-tracking branch 'aesylwinn/EditPathgrid' 2016-06-07 08:35:16 +02:00
scrawl
8fb8c2bae5 Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order 2016-06-07 02:43:25 +02:00
scrawl
f417d7780a Fix the enemy nearby check (Bug #3423) 2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a Don't play music if no playlist is set 2016-06-07 01:36:09 +02:00
scrawl
f64bc3c7ef Pass the victim to commitCrime on pickpocket detection (Fixes #3424) 2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728 Fix crash in race dialog when no head or hair are available 2016-06-06 01:04:14 +02:00
scrawl
a45643f150 Merge pull request #949 from Allofich/master 
Fix return values for AITravel
 2016-06-05 21:16:28 +02:00
Allofich
065d6a391d Don't repeat sequences of only one non-wander AI 2016-06-06 04:12:49 +09:00
scrawl
2ee414abe4 Merge pull request #943 from kpp/find_bullet 
Find bullet
 2016-06-05 16:02:34 +02:00
Aesylwinn
3409d8a922 Change pathgrid node movement to be visually consistent, some 
renaming
 2016-06-04 12:38:17 -04:00
Ben Shealy
5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 2016-06-04 12:28:47 -04:00
scrawl
3645b3357e Fix improper assignement of spawn point in placeAt for non-actors (Bug #3417) 2016-06-02 21:24:19 +02:00
scrawl
ab2089bbf3 Throw an exception if placeAt is passed an invalid direction parameter 2016-06-02 21:19:02 +02:00
scrawl
2ce1da688f ESS-Import: fix handling of first person camera state (Bug #3416) 2016-06-02 16:26:17 +02:00
Roman Proskuryakov
3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 2016-05-31 07:18:37 +03:00
Aesylwinn
83c86cd1be Implement context-select functionality. 2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd Changes to color scheme, slight change to drag indicator, 
change tooltip description.
 2016-05-29 13:26:29 -04:00
Allofich
bce66c629a Change editor-placed AI packages to cycle 2016-05-29 17:34:40 +09:00
scrawl
496cb85b01 Do not cancel Ai packages when on loading (Fixes #3409) 
This piece of code was an attempt to fix up save games made before commit d3b76b7006 , but ended up introducing a new bug.
 2016-05-28 20:27:05 +02:00
Aesylwinn
90620081c7 Fix handling of deleted pathgrids. 2016-05-27 13:15:35 -04:00
Aesylwinn
bded4f86f0 Remove connection number check 2016-05-27 13:13:49 -04:00
scrawl
d487007167 Remove debug code 2016-05-27 17:43:36 +02:00
scrawl
e396e6f2ea Adjust the eye level for line of sight checks (Fixes #3407) 2016-05-27 17:42:17 +02:00
Aesylwinn
ded8862e9d Insert nested rows after selected row, or at start if none selected. 2016-05-26 22:44:02 -04:00
Aesylwinn
d0ef95a1e1 Make adjustments to pathgrid modification code. 2016-05-26 22:13:47 -04:00
Aesylwinn
564d0db68c Move pathgrid abstraction handling to save code. 2016-05-26 22:11:27 -04:00
Aesylwinn
239727531f Revert "Fix data corruption issues." 
This reverts commit 6199663bd8.
 2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712 Revert "Fix editor undo for nested data." 
This reverts commit 774e1497b6.
 2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c Redo slight change to pathgrid editing controls, lost in revert 2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08 Revert "Cleanup and slight change to pathgrid editing controls." 
This reverts commit cc4655e9c7.
 2016-05-25 22:48:43 -04:00
scrawl
a2153a6213 Remove outdated comment 2016-05-25 21:41:05 +02:00
scrawl
5d4f58c828 Fix being unable to activate objects when scripts are disabled 
The if statement was a leftover of the previous activate implementation and is no longer needed.
 2016-05-25 21:37:56 +02:00
Aesylwinn
cc4655e9c7 Cleanup and slight change to pathgrid editing controls. 
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
 2016-05-24 18:19:05 -04:00
Aesylwinn
5eaaed05fc Improve mouse pick culling. 2016-05-24 17:31:00 -04:00
scrawl
3f1df4caa6 Don't auto-equip ammunition (Fixes #3401) 2016-05-24 13:21:43 +02:00
Aesylwinn
18897348d7 Fix weapon values not being properly set in editor. 2016-05-24 01:12:46 -04:00
Aesylwinn
774e1497b6 Fix editor undo for nested data. 2016-05-23 15:51:36 -04:00
Aesylwinn
6199663bd8 Fix data corruption issues. 
- Point connection count not being set
- Nested undo not restoring table (for pathgrid scene editing, editor
    nested undo is still broken)
 2016-05-21 18:59:43 -04:00
Aesylwinn
799ed300ea Use cell coordinates class, fix undo description. 2016-05-21 14:36:07 -04:00
scrawl
703dba902b Set the shader path in OpenCS 2016-05-20 00:40:59 +02:00
Aesylwinn
b86250036c Add ability to add pathgrids. 2016-05-19 18:33:15 -04:00
scrawl
44dd67ee0f Fix a potential crash for lights without a model that have "off by default" flag set 2016-05-19 22:35:25 +02:00
scrawl
a9561f738a Move RemoveParticlesVisitor to animation.cpp 2016-05-19 22:35:17 +02:00
scrawl
0efbdb25ee Improve const-correctness in Animation 2016-05-19 22:30:14 +02:00
scrawl
3749821809 Choose a random death animation for actors that start the game as dead (Fixes #3397) 2016-05-19 21:40:05 +02:00
Aesylwinn
1781aaaa27 Drag indicator. 2016-05-18 12:17:26 -04:00
Aesylwinn
e8e915bcde Share selection functionality with instance editing mode. 2016-05-18 10:46:25 -04:00
Aesylwinn
ae0d2c3b9c Refactor edit mode. Remove essentially duplicate function. 2016-05-17 21:24:16 -04:00
Aesylwinn
13c2161b27 Fix memory leak, remove empty if statement, change dynamic_cast 
to static_cast
 2016-05-17 16:14:23 -04:00
Aesylwinn
5a7ebab694 Fix forward declaration. 2016-05-16 23:06:36 -04:00
Aesylwinn
9d02286592 Remove unused forward declaration. 2016-05-16 22:17:03 -04:00
Aesylwinn
a3363bc098 Fix and simplify pathgrid update handling, only recreate geometry 
once per frame, and a few naming changes.
 2016-05-16 21:06:55 -04:00
Aesylwinn
d2d22e2f23 Clamp node positions in exterior cells. 2016-05-16 19:03:40 -04:00
Aesylwinn
cd3b96b3e8 Change interaction mask back to original and place required masks in 
PathgridMode.
 2016-05-16 17:59:52 -04:00
Aesylwinn
aea2380c2b Add raytrace to dragCompleted. Implement node drag connection, 
node and edge removal, and some fixes.
 2016-05-16 17:25:02 -04:00
Aesylwinn
6fbc10dbba Add ability to get cell, pathgrid, and ability to add nodes. 
Also missing include.
 2016-05-16 17:20:07 -04:00
Aesylwinn
9f7c8d559c Add focus requirement for context menu. 2016-05-16 17:16:15 -04:00
Aesylwinn
f0bbe2c633 Add context menu for pathgrid editor. 2016-05-16 17:06:40 -04:00
Aesylwinn
8b6cb73369 Add ability to invert selection. 2016-05-16 17:03:00 -04:00
Aesylwinn
55656d68ef Cleanup, put duplicated code in function 2016-05-16 17:00:58 -04:00
Aesylwinn
da6a742beb Add control description to tooltip. 2016-05-16 16:50:02 -04:00
scrawl
b0180cb6b4 Fix current region check (Bug #3391) 2016-05-16 02:05:02 +02:00
scrawl
3b31e8f66e Do not set AiPackageDone flag for non-Aipackages (Fixes #3392) 2016-05-14 19:19:37 +02:00
Aesylwinn
f8b43b2a64 Rename cryptic variables. 2016-05-13 12:55:35 -04:00
Aesylwinn
32ba5bf8b8 Initial pathgrid editting, support for selection and movement. 2016-05-12 19:35:49 -04:00
Aesylwinn
9645d0cc8a Pass more mouse pick information in scene view editor. 2016-05-12 18:21:43 -04:00
scrawl
fcbcc004a3 Don't use unordered_map 2016-05-11 02:35:17 +02:00
scrawl
78bac93021 Merge pull request #940 from kpp/find_ffmpeg 
Find ffmpeg
 2016-05-10 17:41:30 +02:00
scrawl
59cfcb38e2 Scale the sunlight specular color by weather's GlareView value (Fixes #3375) 2016-05-10 17:39:57 +02:00
Roman Proskuryakov
da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 2016-05-10 12:43:54 +03:00
Marc Zinnschlag
64fdc5a21a Merge remote-tracking branch 'rcutmore/bug-3331' 2016-05-09 09:18:48 +02:00
scrawl
3584e59402 Fix incorrect parameter to changeCell (Fixes #3388) 2016-05-08 18:59:41 +02:00
scrawl
a7e6219091 Merge pull request #939 from kpp/rewrite_esm_name_t 
Rewrite ESM::NAME_T
 2016-05-08 13:15:05 +02:00
Rob Cutmore
547d783eac Editor: Remove overridden configureCreateCommand 
StartScriptCreator was incorrectly overriding configureCreateCommand.
This caused issues trying to edit an uneditable column while adding a
new record.
 2016-05-08 06:09:40 -04:00
Rob Cutmore
e6863c8f79 Editor: Undo editable column check in record add 2016-05-08 06:05:52 -04:00
Marc Zinnschlag
b4e341e1e2 Merge remote-tracking branch 'aesylwinn/RenderPathgrid' 2016-05-08 10:15:12 +02:00
Roman Proskuryakov
5ae1864062 Add unit tests for ESM::FIXED_STRING 2016-05-07 23:27:33 +03:00
Roman Proskuryakov
d5dfa89060 Rewrite NAME_T into FIXED_STRING. 2016-05-07 23:27:33 +03:00
Roman Proskuryakov
d7046878a8 Fix uninitialized values in MWMechanics::AiCombat 2016-05-07 20:41:47 +03:00
Rob Cutmore
307f04f827 Editor: Fix issue adding start script (Bug #3331) 
Updated to verify column is editable when adding a new record.
 2016-05-06 08:04:15 -04:00
Michał Moroz
40cc6a4164 Changed AiSequence::stack to push_back lower priority packages instead of push_front (Bug #3384) 2016-05-04 13:55:36 +02:00
Aesylwinn
14ae232938 Remove now unnecessary factory class. 
It was originally used for storing normals, but that functionality
was removed.
 2016-05-03 16:13:23 -04:00
Aesylwinn
1f902ff069 Remove code duplication. 2016-05-03 16:13:11 -04:00
Rob Cutmore
b129ff9672 Editor: Add PathgridCreator to find duplicate IDs 2016-05-03 07:24:33 -04:00
Rob Cutmore
c9ada852aa Undo including pathgrids in ID check 2016-05-03 06:19:47 -04:00
Aesylwinn
642b1d0273 Add mask. 2016-05-03 03:29:39 -04:00
Aesylwinn
8d95b63180 Add pathgrid rendering to opencs 2016-05-02 22:10:43 -04:00
Aesylwinn
5cac882123 Replace game version of pathgrid rendering with component. 2016-05-02 22:10:17 -04:00
Aesylwinn
7fbcc47b15 Add pathgrid modified signals. 2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0 Revert "Pathgrid rendering v2" 
This reverts commit 4dee9604bb.
 2016-05-02 15:37:08 -04:00
Rob Cutmore
5580f803fd Editor: Prevent duplicate pathgrids (Bug #3342) 2016-05-02 07:28:32 -04:00
Aesylwinn
4dee9604bb Pathgrid rendering v2 2016-05-02 06:29:56 -04:00
scrawl
2ca7415708 Handle DialInfo::mFactionLess (Bug #3380) 2016-05-01 00:10:50 +02:00
scrawl
93b2f09224 Workaround for some AI functions being incorrectly handled as AI packages (Bug #3378) 2016-04-29 18:07:35 +02:00
Marc Zinnschlag
57101c1b19 added namespace and include to previous commit 2016-04-26 15:42:11 +02:00
Alexander Kjäll
32123aec2b
made logarithm function for calculating column widths in the output be more generic 2016-04-25 20:04:48 +02:00
scrawl
5edfe8c41c Reduce the wander fast forward overcrowding offset (Fixes #3370) 2016-04-23 22:47:42 +02:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Marc Zinnschlag
f0778e22dd Merge remote-tracking branch 'origin/master' 2016-04-18 09:42:18 +02:00
Marc Zinnschlag
9d906a99a8 Merge remote-tracking branch 'rcutmore/bug-3286' 2016-04-18 09:40:13 +02:00
scrawl
c64b8ab297 Merge pull request #928 from Salgat/bug-1320 
AiWander - Creatures in cells without pathgrids do not wander (Bug #1320)
 2016-04-17 18:10:47 +02:00
Austin Salgat
be16857f96 Fix wrong height being used for water detection 2016-04-17 10:46:09 -05:00
Rob Cutmore
e6ab3a4ba9 Remove unused CSVWorld::ScriptEdit::setMonoFont 2016-04-17 06:57:02 -04:00
Rob Cutmore
30493545f1 Update script editor tab width on font change 2016-04-17 06:54:31 -04:00
Austin Salgat
e9157e9200 Fix idle animation and Fix water creature manual wandering 2016-04-16 20:38:58 -05:00
Rob Cutmore
25d9b77d10 Add setting for script editor tab width 2016-04-16 20:43:10 -04:00
Austin Salgat
3dec10c686 Update variable to prevent underflowing 
While not an issue presently, the variable may be used in the future in a way that could create issues if it underflows.
 2016-04-16 17:51:13 -05:00
Austin Salgat
84179c262f Update manual wandering to prevent actor from leaving/entering water 
Water creatures will stay in the water, while land creatures will stay on land when wandering.
 2016-04-16 16:39:13 -05:00
Austin Salgat
fc03216d48 Refactor to reuse existing obstacle detection 2016-04-16 12:14:00 -05:00
Austin Salgat
34726c24d9 Fix mDistance being reset prematurely 
This was causing wandering without pathgrids to become disabled for most wandering units. Additionally, wandering now behaves the same for both NPCs and creatures.
 2016-04-15 21:56:41 -05:00
scrawl
d784a77f4c Set the default player cell in the StateManager (Fixes #3269) 2016-04-15 00:49:36 +02:00
Austin Salgat
92b352989a Add logic for NPC wandering without pathgrids 2016-04-13 20:48:08 -05:00
Austin Salgat
c02881a4f8 Fix creatures not wandering 2016-04-12 21:16:55 -05:00
scrawl
8cf91e32fa ESSImport: Correctly handle item stacks (XIDX tag). (Fixes #3340) 2016-04-12 21:39:05 +02:00
scrawl
ba3f4f122a Account for the stack count in HasSoulGem (Bug #3340) 2016-04-12 21:39:05 +02:00
scrawl
4854d6b093 Set the TalkedToPc flag for voiced dialogue (Fixes #3346) 2016-04-12 21:39:05 +02:00
scrawl
d15901b454 Merge pull request #927 from Salgat/bug-2981 
When waiting, NPCs can go where they wouldn't go normally (Bug #2981)
 2016-04-12 00:55:20 +02:00
Austin Salgat
38f5a225ea Refactor PathFinder functions to be useable by AiWander 
This avoids having to duplicate the distanceSquared and getClosestPoint functions.
 2016-04-10 20:44:08 -05:00
Austin Salgat
96231e17f0 Fix wandering NPCs going off pathgrid 
If multiple pathgrids exist in the same cell, sometimes an NPC would port to a different pathgrid that was nearby. This is an issue since it allowed them to do things like travel through walls to inaccessible areas. Now they will only wander along the closest connected pathgrid.
 2016-04-10 20:21:18 -05:00
scrawl
b2dc18e1aa Merge pull request #926 from bentsherman/master 
Allow +/- buttons in trade window to decrease offer to 0
 2016-04-10 00:05:29 +02:00
Ben Shealy
8703609649 Allow +/- buttons in trade window to decrease offer to 0 2016-04-09 17:49:21 -04:00
Marc Zinnschlag
a5bc561c7d Merge remote-tracking branch 'origin/master' 2016-04-08 09:35:39 +02:00
Rob Cutmore
a3903d374f Update script editor tab width (Bug #3286) 2016-04-07 07:47:47 -04:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00