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

6871 commits

Author SHA1 Message Date
Marc Zinnschlag
451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc When searching object by id, search in active cells before searching in the player's inventory 2014-02-13 22:58:12 +01:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Emanuel Guevel
e597328b6b Make enable/disable a no-op for items in containers 2014-02-13 20:24:27 +01:00
Marek Kochanowicz
40cc108e54 drag and drop works. 2014-02-13 20:19:51 +01:00
Marek Kochanowicz
1bcc6d6918 using new icon. 2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc new displays for referencable table columns 2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d use case-insensitive sorting in columns 2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446 Attempt to match types. Does not work at the moment. 2014-02-13 13:54:09 +01:00
gus
7c6e27e4f9 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aitravel.cpp
 2014-02-13 12:59:04 +01:00
Marek Kochanowicz
71b2fc1c70 Introduced method to access display type. 2014-02-13 10:55:31 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
Marek Kochanowicz
5f3f867a10 Implemented convertEnums function 2014-02-13 10:21:49 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec another case fix (remote member access again) 2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09 fixed case handling problem for local variable access 2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f fixed broken remote member variable access 2014-02-12 13:35:24 +01:00
Marek Kochanowicz
c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de added some iostream garbage. 2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07 Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf Compiles now. 2014-02-12 11:42:19 +01:00
gus
6cf561f713 get index to where we are dropping 2014-02-12 11:32:01 +01:00
gus
2e33ab3a13 droping somewhat works 2014-02-12 11:16:12 +01:00
Marek Kochanowicz
e1a39b8388 Replaced some display_string with specific type. Damn, i wish this is correct ;-) 2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee Added new Display types 2014-02-12 09:04:52 +01:00
Emanuel Guevel
8824af30b4 Allow to display message box outside of dialogue window 2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690 Merge remote-tracking branch 'mrcheko/master' 2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc Merge remote-tracking branch 'potatoesmaster/selected-spell' 2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6 Do not allow spellcasting stance without spell selected 2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116 Unset selected spell when removed 2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7 Show a message when the player attempts to cast a disabled spell 2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22 fixed case problem in remote member variable access 2014-02-11 13:56:56 +01:00
Marek Kochanowicz
53e2e8415d replaced start with exec 2014-02-11 12:25:21 +01:00
gus
df46218acc try droping 2014-02-10 16:48:04 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
gus
b5006c5dbd compile fix 2014-02-09 15:33:00 +01:00
mrcheko
a6be72673c improves animation-controlled velocity check 2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2 Fix lockpicks 2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6 Fixes #848: Use hardcoded animation velocity for first person movement 2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62 Fix wrong assertion 2014-02-06 03:15:01 +01:00
gus
632834ce10 WIP 2014-02-05 16:12:50 +01:00
scrawl
4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 2014-02-05 12:15:49 +01:00
Marek Kochanowicz
3b8f04c0f3 Allow multi-item drag. 2014-02-05 11:44:08 +01:00
Marek Kochanowicz
f01b02c42d Changed format. 2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b Removed getUniversalid interface. 2014-02-05 11:19:55 +01:00
scrawl
677fc84223 Refactor actors update 2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e Fix message box formatting bug 2014-02-05 05:18:11 +01:00
scrawl
7907181c0c Fix uninitialized member 2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52 Feature #50: Handle attach & release of projectiles 2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0 Feature #50: Don't allow ranged weapon attack when ammunition is empty 2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d Feature #50: Allow body pitch in third person for ranged weapon aiming 2014-02-05 05:18:10 +01:00
scrawl
5ee105c812 Fix typo 2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5 Feature #50: Handle weapon controllers (i.e. bowstring animations, etc) 2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2 Fix movement speed formula for flying creatures 2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc Fixes #1158 (Armor rating label issues) 2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4 Correction for marksman weapon inventory preview 2014-02-05 05:18:10 +01:00
scrawl
5b076aa570 Revert "Bug #1074: Inventory paperdoll obscures armour rating" 
This reverts commit b017a3be3e.
 2014-02-05 05:18:10 +01:00
scrawl
df78357e05 Handle knockout separately (Closes #1151) 2014-02-05 05:18:09 +01:00
Marek Kochanowicz
04287cb87a Provide method to return whole data vector from tablemimedata. 2014-02-04 19:42:52 +01:00
Marek Kochanowicz
8b799683c1 Display QPixMap with dragged object. 2014-02-04 18:48:18 +01:00
Marek Kochanowicz
3439940a8e Tablemimedata able to handle vector of objects and return icon. 2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be Yes, you can drag. But not drop. 2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55 Attempt to get basic tablemimedata subclass. 2014-02-04 09:13:40 +01:00
mrcheko
688f359a33 discard creatures speed and negative fatique changes 2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8 Merge remote-tracking branch 'pvdk/versioninfo' 2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34 compatibility fix 2014-02-03 11:20:55 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4 Fix linking issues on Windows using MSVC. 2014-02-02 23:59:57 +01:00
pvdk
4e03e9cf87 Changed development version info text and the tooltip now works on all platforms 2014-02-02 20:10:47 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce activate whole-body attack animations 2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6 added new switch: --script-warn 2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e pos accum without conformity with animation bug/creature speed 2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a Fix an issue with int32_t being unknown on windows. 2014-02-02 13:57:19 +01:00
Marek Kochanowicz
a36cc26434 Created new files for TableMimeData class. 2014-02-01 19:06:41 +01:00
scrawl
1deb0a7cdf Savegame dialog: Set key focus to editbox 2014-02-01 18:42:01 +01:00
scrawl
ec46575671 Overwriting saves fixes - copy description of overwritten slot, ask for confirmation 2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86 Savegame dialog: Don't allow empty save names 2014-02-01 18:42:01 +01:00
scrawl
63284d21a0 Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button 2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6 Some additional safety checks for global map loading 2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc Don't add duplicate topic responses to the journal 2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908 Savegame dialog: support loading saves using Enter key or double-click 2014-02-01 18:42:00 +01:00
scrawl
49e26415be Don't call loadGame() from within the MWMechanics::Actors update sequence 2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8 handle equipped items when serialising inventory state 2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later) 2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68 Bug #1147: Fix the inventory preview pose used for ranged weapons 2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe Support keyframe controllers for bones that aren't in the skeleton base 2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1 Fix LastHitObject 2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec Disable combat movements for creatures without weapons 2014-01-31 04:43:35 +01:00
scrawl
7820ea5806 "Always best attack" should only affect the player 2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a Bug #1148: Workaround for broken images in some MW versions 2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17 Don't play "idle" voice entries for NPCs with Hello 0 
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
 2014-01-31 04:43:35 +01:00