1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 11:49:56 +00:00
Commit graph

9425 commits

Author SHA1 Message Date
scrawl
855fe33c59 Add vanilla-compatible range limiting for playloopsound (Fixes #244, Fixes #1342) 2014-12-08 23:58:20 +01:00
scrawl
f6960debcb Attach sound listener to the player head instead of camera 2014-12-08 23:26:09 +01:00
Marc Zinnschlag
0649373d2e Merge branch 'report' 2014-12-08 19:01:38 +01:00
scrawl
cf85cbbc8e Switch sound distance model to AL_INVERSE_DISTANCE 2014-12-08 17:43:56 +01:00
scrawl
fbed429b25 Use GMSTs for sound fading distance 2014-12-08 17:25:17 +01:00
Marc Zinnschlag
e6307a5151 move cursor in scripteditor to position of error 2014-12-08 12:29:23 +01:00
scrawl
9f90a1e44b Remove script access to deleted references that have no content file
In original MW these objects are permanently deleted and can not be accessed anymore.
2014-12-07 22:37:50 +01:00
Marc Zinnschlag
a64b741af2 store hints from operations in report model 2014-12-07 20:53:09 +01:00
Marc Zinnschlag
3a847732b4 abstracted message collection into a class 2014-12-07 18:57:47 +01:00
Marc Zinnschlag
209c5cdbe3 Merge remote-tracking branch 'scrawl/master' 2014-12-07 12:33:39 +01:00
scrawl
f49fde3d5d Add support for undeleting references (Fixes #2193)
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
2014-12-06 21:08:18 +01:00
Marc Zinnschlag
9c4355e91c Merge remote-tracking branch 'scrawl/master' 2014-12-06 20:55:35 +01:00
scrawl
2952a0e2aa Make Resurrect function reset most of the runtime state (Fixes #2181) 2014-12-06 19:53:24 +01:00
scrawl
41542dedf7 Fix map insert return value mixup (Fixes #2192) 2014-12-06 17:24:05 +01:00
scrawl
9a1b7cbe52 Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986) 2014-12-06 16:50:09 +01:00
Marc Zinnschlag
6a67aba336 added double click with modifier actions in report table 2014-12-06 15:08:51 +01:00
Marc Zinnschlag
58f4cc882f added remove action to report table context menu 2014-12-06 14:30:40 +01:00
Marc Zinnschlag
f2fc693325 added context menu to report table 2014-12-06 14:17:56 +01:00
Marc Zinnschlag
350b0cb93c added hidden hint column to report model 2014-12-06 13:45:47 +01:00
Marc Zinnschlag
6c18a3b0b5 allow drags from report table 2014-12-06 13:19:43 +01:00
Marc Zinnschlag
7c59ea6296 added specialised report table 2014-12-06 13:01:55 +01:00
Marc Zinnschlag
9ae69447d3 Merge remote-tracking branch 'scrawl/master' 2014-12-06 11:19:47 +01:00
scrawl
416d549568 Fix animation glitch caused by knockdown
If the player was knocked down while having no weapon, spell nor fists ready, the animation state would incorrectly shift to "weapon equipped" even though no weapon is equipped.
2014-12-05 22:02:18 +01:00
scrawl
e313ed3cef Support animated container models 2014-12-05 20:58:33 +01:00
scrawl
65536f0857 Load initial particle system state from NIF files (Fixes #2178) 2014-12-05 18:00:30 +01:00
scrawl
a67e7c64ea Optimize pathgrid store 2014-12-05 15:58:22 +01:00
scrawl
83dcf9ce4b Overwrite existing records in IndexedStore (Fixes #2182) 2014-12-05 15:58:05 +01:00
cc9cii
ab693f1f64 Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582) 2014-12-05 07:50:03 +11:00
cc9cii
8d0cca6cfc Merge remote-tracking branch 'remotes/upstream/master' into single-instance
Conflicts:
	apps/opencs/editor.cpp
2014-12-05 07:38:33 +11:00
Marc Zinnschlag
f771b95a15 Merge remote-tracking branch 'cc9cii/master' 2014-12-04 20:04:19 +01:00
cc9cii
6731afc79c Use float for setting skill use values. Should resolve bug #2183. 2014-12-05 03:59:16 +11:00
cc9cii
07f10a0140 Use append syntax compatible with older versions of boost. 2014-12-05 01:32:20 +11:00
cc9cii
e67cf96250 Allow only one instance of OpenCS. Only tested on windows x64. 2014-12-05 01:09:42 +11:00
Marc Zinnschlag
eb6e1576be Merge remote-tracking branch 'scrawl/master' 2014-12-03 20:17:34 +01:00
scrawl
fee08f97ed Fix crash in character preview for non-existing meshes (Fixes #2128) 2014-12-03 18:28:35 +01:00
scrawl
75b0da5dce Don't updateBoneTree for non-skinned parts (Fixes #2124) 2014-12-03 18:28:35 +01:00
scrawl
14ae6d28b0 Fix being able to jump when overencumbered 2014-12-03 18:28:35 +01:00
scrawl
3519d23518 Race dialog: remove incorrect assumption about numeric index in head/hair record IDs 2014-12-03 18:28:35 +01:00
scrawl
7faa849cef Fix fatigue recalculation using older value (oops) 2014-12-03 18:28:34 +01:00
scrawl
dd0cea21b0 Implement overwriting pathgrid records (Fixes #2175) 2014-12-03 18:28:34 +01:00
Marc Zinnschlag
e2efc4770d Merge remote-tracking branch 'viadanna/fix/invisible-combat' 2014-12-03 15:34:02 +01:00
Marc Zinnschlag
f2d991505e handle other Windows-specific path issues regarding OpenCS resources handling 2014-12-03 15:31:00 +01:00
Marc Zinnschlag
58b6e757e3 fixed another case folding problem regarding OpenCS resources handling 2014-12-03 15:24:37 +01:00
Marc Zinnschlag
e755f692cc silenced some annoying warnings 2014-12-03 09:42:12 +01:00
Paulo Viadanna
bfa048e687 Fix #1734: AI will stop combat if target disappear 2014-12-02 17:38:25 -02:00
Marc Zinnschlag
406cf2b981 disable element visibility buttons that do not apply to the respective cell type 2014-12-02 11:17:39 +01:00
scrawl
fadbb5ad21 Add particle and sound fading for weather transitions (Fixes #2130) 2014-12-01 23:09:47 +01:00
scrawl
b9d0552166 Fix positionCell rotation argument when used on the player
This fixes the player's initial orientation on the starting boat, to properly face Jiub.
2014-12-01 23:09:47 +01:00
scrawl
46d93f1b08 Crime update: NPCs can report crimes if they didn't see the crime, but were alerted by someone who saw it and did not report it themselves. 2014-12-01 23:09:46 +01:00
scrawl
507cbcfae3 Remove incorrect implementation of the iAlarm* GMSTs, not used by vanilla MW (Fixes #2064)
According to Hrnchamd, these are unused. The real mechanics are not fully documented, but from a quick test only NPCs with an alarm value of 100 will report crimes.
2014-12-01 23:09:46 +01:00
scrawl
ed686ddd2f Don't update nodes with an empty name from the skeleton source (Fixes #2125) 2014-12-01 23:09:46 +01:00
scrawl
a1226501fa AiWander: move idle animation handling to non-delayed section (Fixes #2073) 2014-12-01 23:09:46 +01:00
scrawl
f9ae0d9d66 Fix dialogue goodbye link conflicting with choice links 2014-12-01 23:09:46 +01:00
scrawl
8103d25b09 Make ToggleMenus close open windows (Fixes #2045) 2014-12-01 23:09:46 +01:00
scrawl
c684c99a95 Combat AI: Don't attempt to cast spells when impossible to succeed (Fixes #2059) 2014-12-01 23:09:46 +01:00
scrawl
6960cac5eb Disable third person zoom feature by default due to usability issues (Fixes #2129) 2014-12-01 23:09:46 +01:00
scrawl
61d1aa78ce Move AiWander path finder to temporary storage (Fixes #2082) 2014-12-01 23:09:46 +01:00
Marc Zinnschlag
b7cf114d5d Merge remote-tracking branch 'scrawl/delete' 2014-12-01 22:57:41 +01:00
Marc Zinnschlag
cbcd6a26d5 memory leak fix 2014-12-01 22:57:32 +01:00
scrawl
48d5789aeb Use a separate flag for references deleted by a content file (Fixes #2018)
The flag must be separate so as to not contaminate the user's savegame.

Fixes the following use cases that were broken before:

 - Content file edits a reference that was already deleted by a previously loaded content file -> reference must stay deleted
 - Changed or new content file deletes a reference that is already present in the user's savegame -> reference must be deleted
 - Said content file is disabled again - reference must be undeleted
2014-12-01 22:16:45 +01:00
MiroslavR
6e1a11f322 Queue screen fade operations invoked by scripts 2014-12-01 19:13:04 +01:00
Marc Zinnschlag
acd63659c1 Merge remote-tracking branch 'scrawl/launcher' 2014-12-01 09:39:31 +01:00
cc9cii
3b5cd286f6 Do not destroy overlay if it was never created (e.g. due to an Ogre exception). 2014-12-01 14:09:22 +11:00
cc9cii
64e1594b41 Move the destruction of global resources, being used by multiple documents, to the editor. 2014-12-01 14:08:27 +11:00
cc9cii
44b11163d1 Do not delete physics objects if it was never created (e.g. preview window) 2014-12-01 10:07:02 +11:00
cc9cii
2d229c70cb Another missed null shared_ptr conversion for gcc. 2014-12-01 09:41:03 +11:00
cc9cii
9fb4b1f499 Initialise null shared_ptr 2014-12-01 08:15:17 +11:00
scrawl
a4e32d23c6 Fix old profile content not being cleared correctly when saving content file selection (Fixes #2173) 2014-11-30 20:52:34 +01:00
cc9cii
2720e5ea9d Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application. 2014-12-01 06:44:12 +11:00
Marc Zinnschlag
db17dbe324 don't store esm readers for non-base content files 2014-11-30 18:04:18 +01:00
Marc Zinnschlag
4a9d2038fa load land for non-base content files immediately 2014-11-30 14:33:39 +01:00
Marc Zinnschlag
003675318d Merge remote-tracking branch 'scrawl/master' 2014-11-29 20:54:04 +01:00
scrawl
5f5fcc2fef Make PlayGroup use an indefinite number of loops (Fixes #2156) 2014-11-28 17:15:31 +01:00
scrawl
4fd3a994e9 Add model and script information to BetaComment 2014-11-28 16:27:18 +01:00
scrawl
ea8f617508 Add missing player control enabled checks (Fixes #2152) 2014-11-28 15:54:38 +01:00
scrawl
d7220cdc2f Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158) 2014-11-28 15:16:53 +01:00
scrawl
0a466ad643 Make recalculation of magicka less aggressive (Fixes #2155) 2014-11-28 14:45:35 +01:00
Marc Zinnschlag
dadc089ddb Merge branch 'buttons' 2014-11-28 09:16:47 +01:00
Marc Zinnschlag
e177b66c1d moved fog button from unpaged worldspace to worldspace 2014-11-28 09:16:39 +01:00
Marc Zinnschlag
e04ead2bd5 new element visibility button icons 2014-11-28 09:14:02 +01:00
MiroslavR
cb74c1c36e Set health to 0 if it drops below 1 (Fixes #2163) 2014-11-27 20:44:41 +01:00
Marc Zinnschlag
50a489321f updated run button 2014-11-27 09:27:29 +01:00
Marc Zinnschlag
d37ff8ec63 fixed missing tooltip update for toggle/mode-type buttons 2014-11-27 08:59:21 +01:00
Marc Zinnschlag
23624841e0 Merge remote-tracking branch 'cc9cii/editwidget-setrange' 2014-11-26 10:19:58 +01:00
cc9cii
936094ae95 Set range of spinbox types in dialogsubview. 2014-11-26 08:08:28 +11:00
Marc Zinnschlag
533bb3b0d5 Merge remote-tracking branch 'miroslavr/master' 2014-11-25 19:30:49 +01:00
scrawl
ff8bdd74ed Fix strange bitflags handling 2014-11-25 15:54:55 +01:00
MiroslavR
238325455d Erase effects that have expired (Fixes #2134) 2014-11-25 10:33:03 +01:00
scrawl
d36dfbe779 Apply the frame time cap to Ogre's ControllerManager (Fixes #2154)
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
2014-11-25 02:44:11 +01:00
cc9cii
69134e3ac2 Add icon to windows executable. 2014-11-24 12:48:36 +11:00
scrawl
ada4e37556 Fix race preview texture not being destroyed properly (Fixes #2098) 2014-11-24 01:02:18 +01:00
scrawl
c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 2014-11-23 16:37:31 +01:00
scrawl
4bf5c89e6f Merge branch 'master' of https://github.com/OpenMW/openmw into unshield
Conflicts:
	apps/wizard/CMakeLists.txt
2014-11-23 13:45:46 +01:00
scrawl
abf49267ea Unshield include fix 2014-11-23 13:44:03 +01:00
scrawl
a8a2b44b0f Don't require libunshield on windows 2014-11-23 00:51:57 +01:00
Nikolay Kasyanov
a0c454b01c Properly add libunshiled include dir (again, for wizard this time) 2014-11-22 22:53:01 +02:00
scrawl
414f7ea02c Ignore mouse movements during video playback (Fixes #2139) 2014-11-22 12:59:31 +01:00
Marc Zinnschlag
c7933dd692 Merge remote-tracking branch 'cc9cii/master' 2014-11-22 11:28:01 +01:00
cc9cii
31fdf49616 Use Qt exit function rather than system one. 2014-11-22 06:59:23 +11:00
scrawl
1e06f69d9e Remove the "browse to existing installation" button, now replaced by the wizard
Clean up some debug spam
2014-11-20 22:39:34 +01:00
cc9cii
911839bb91 Simplify detecting whether a universal id represents a referenceable type. 2014-11-21 06:48:42 +11:00
scrawl
c6558fe487 Fix Ogre being initialised twice 2014-11-19 13:19:02 +01:00
cc9cii
ede1b97b46 Check the type of universal id before getting its id. Should resolve bug #2137 2014-11-19 18:10:29 +10:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
2014-11-18 17:43:51 +01:00
scrawl
3028141815 Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded) 2014-11-18 11:47:46 +01:00
scrawl
21481e8c71 Fix bsatool help typo 2014-11-18 11:18:02 +01:00
Marc Zinnschlag
5eb9fd81e1 use placeholder icons in OpenCS when no proper icon is available 2014-11-13 12:09:10 +01:00
Marc Zinnschlag
a60e4c036f Merge branch 'mode'
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/opencs/view/render/worldspacewidget.hpp
2014-11-13 11:12:20 +01:00
Marc Zinnschlag
b7f8f848a8 added edit modes for exteriors 2014-11-13 10:45:59 +01:00
cc9cii
b86148411b Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable. 2014-11-12 14:02:08 +11:00
Marc Zinnschlag
2acf446f18 added edit mode button to scene toolbar 2014-11-11 15:58:22 +01:00
scrawl
273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-11-11 15:43:46 +01:00
Evgenii Babinets
fe385214e4 Added proper slow fall effect mechanics. 2014-11-10 02:42:44 -05:00
Marc Zinnschlag
b50fcd403b renamed getElementMask to getVisibilityMask 2014-11-09 11:29:45 +01:00
Marc Zinnschlag
de3a26e21b Merge remote-tracking branch 'miroslavr/master' 2014-11-08 11:00:19 +01:00
MiroslavR
b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 2014-11-08 00:57:03 +01:00
Marc Zinnschlag
9e67a07ad4 allow externally supplied ModeButtons in SceneToolMode 2014-11-07 11:11:43 +01:00
Marc Zinnschlag
4dd645559d added ModeButton specialisation of PushButton for use in SceneToolMode 2014-11-06 13:26:19 +01:00
scrawl
d5768af952 Fix INT_MIN trade exploit (Fixes #2096) 2014-11-06 03:51:18 +01:00
cc9cii
a3a0682138 Remove files no longer used, reverting to OEngine. 2014-11-06 11:16:17 +11:00
cc9cii
bf669a51c1 Merge branch 'master' into mouse-picking-physics 2014-11-06 09:46:48 +11:00
cc9cii
f051fb65ff Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document. 2014-11-06 08:35:24 +11:00
scrawl
6b88f5f33e Use Ogre::uint8, fixes a missing include for uint8_t 2014-11-05 20:58:49 +01:00
scrawl
61d4a6b344 Merge branch 'openmw-033' 2014-11-05 20:58:42 +01:00
scrawl
ba3d2be8e3 Add missing include (Fixes #2108) 2014-11-05 19:45:32 +01:00
cc9cii
03abd69b4f Include string header for gcc. 2014-11-05 07:20:20 +11:00
cc9cii
7d133d508d Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager. 2014-11-05 07:10:14 +11:00
cc9cii
37a050873c Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time. 2014-11-04 21:46:35 +11:00
cc9cii
70b5d6857a Add missing files. 2014-11-04 20:52:28 +11:00
cc9cii
0e70315f91 Experimental, compiles and runs but crashes in some exit scenarios. 2014-11-04 20:43:04 +11:00
Marc Zinnschlag
d48a2759f6 Merge remote-tracking branch 'cc9cii/mouse-picking' 2014-11-03 13:19:19 +01:00
Marc Zinnschlag
bf40a3bb5d enhanced SceneToolBar tool handling (remove and insert at specific point) 2014-11-03 13:18:53 +01:00
cc9cii
bd6e54dde3 Add function to cancel drag by pressing ESC. Remove debug code. 2014-11-03 21:24:47 +11:00
cc9cii
092080c69c Group the commands with begin/end macros. 2014-11-03 13:57:57 +11:00
cc9cii
bf5ba41223 Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once. 2014-11-03 12:46:31 +11:00
cc9cii
4556eb74fe Fix saving position and rotation. 2014-11-03 10:07:21 +11:00
cc9cii
e3a000917c Minor tidy up. 2014-11-03 10:04:24 +11:00
cc9cii
358cac2f0a Fix deleting object physics again. 2014-11-03 10:03:54 +11:00
cc9cii
d9755f82c3 Position saving - work in progress. 2014-11-03 08:11:15 +11:00
cc9cii
85ef683319 Fix deleting physics object when scene node is cleared. 2014-11-03 08:10:28 +11:00
MiroslavR
140013820b Fix invalidated iterator 2014-11-02 15:40:08 +01:00
MiroslavR
a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 2014-11-02 15:36:13 +01:00
Marc Zinnschlag
29c9b6bd01 Merge remote-tracking branch 'scrawl/master' 2014-11-02 10:38:42 +01:00
cc9cii
3796240b19 Refactor duplicate code sections. 2014-11-02 18:13:25 +11:00
cc9cii
49d416353e Remove a redundant list. 2014-11-02 17:56:28 +11:00
cc9cii
7f54dab6ef Fix issue where objects were sometimes unresponsive after dragging. 2014-11-02 15:34:45 +11:00
cc9cii
e174428cc5 Minor tweaks. 2014-11-02 15:03:26 +11:00
cc9cii
1eed180a5c Fix Gcc/MSVC differences with friend class. Invert camera derived direction. 2014-11-02 11:41:11 +11:00
cc9cii
a21958d007 Add option to move the mouse against the screen frame of reference. 2014-11-02 10:30:44 +11:00
cc9cii
89bb616cbc Remove debugging code. 2014-11-02 08:33:32 +11:00