scrawl
7ead963075
Revert "Revert "ESSImport: convert inventory equipment slots""
...
This reverts commit fe31ca0ac0
2015-01-23 15:33:30 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50
2015-01-23 02:32:43 +01:00
scrawl
fe31ca0ac0
Revert "ESSImport: convert inventory equipment slots"
...
This reverts commit 03df659e7d
2015-01-23 02:32:42 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
a97f599e65
fixed ref num saving in non-wide format
2015-01-22 13:41:09 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
cd62dbc5b7
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-21 15:12:04 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
Scott Howard
8c32b7e304
missing include in essimporter/main.cpp
...
error: 'cout' is not a member of 'std'
error: 'cerr' is not a member of 'std'
https://launchpadlibrarian.net/195402684/buildlog_ubuntu-trusty-amd64.openmw_0.34.0%2Bgit20150120.442-0~ubuntu14.04.1_FAILEDTOBUILD.txt.gz
2015-01-20 17:59:11 -05:00
scrawl
03df659e7d
ESSImport: convert inventory equipment slots
2015-01-20 23:58:24 +01:00
scrawl
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
142a138b75
ESSImport: convert TalkedTo flag and gold pool
2015-01-20 20:19:08 +01:00
scrawl
e38d756345
ESSImport: fix NPCC indices
2015-01-20 20:18:30 +01:00
scrawl
5b705196bc
ESSImport: convert level progress
2015-01-20 19:47:54 +01:00
scrawl
eede2c8e55
ESSImport: convert breath meter and skill increases
2015-01-20 19:30:39 +01:00
scrawl
0fc9221eb3
ESSImport: convert NPC disposition
2015-01-20 19:29:54 +01:00
scrawl
1375a4e4bb
ESSImport: read stolen items (not converted yet)
2015-01-20 19:29:54 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5
Fix windows build, MessageBox is a defined symbol
...
Windows and its stupid defines...
2015-01-20 17:07:26 +01:00
scrawl
06736e9e03
ESSImport: convert faction reactions and known dialogue topics
2015-01-20 15:56:07 +01:00
Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
scrawl
6d5bb57e00
ESSImport: fix loading item stacks in containers
2015-01-20 01:21:44 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
40c29abe20
ESSImport: convert other references (non-creature/npc/container)
2015-01-20 00:42:26 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
8e1eeccbe1
ESSImport: container state
2015-01-19 13:16:12 +01:00
scrawl
a7b82e5107
ESSImport: inventory loading works, equipment slots need more work
2015-01-19 12:22:51 +01:00
scrawl
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +01:00
scrawl
ad398f0c65
ESSImport: convert kill counter
2015-01-19 09:29:30 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
19ed047dec
ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring
2015-01-18 23:15:36 +01:00
scrawl
08ad4d73bb
ESSImport: player is placed in correct cell, npc cellrefs work
2015-01-18 20:01:50 +01:00
scrawl
c8ed24cc84
ESSImport: creature CellRefs work, need probing to find ref type
2015-01-18 16:13:52 +01:00
scrawl
cbf56dbb47
ESSImport: work on cell fog of war
2015-01-17 03:07:24 +01:00
scrawl
031eec4550
Starting ESS importer for Morrowind save files
2015-01-17 00:16:49 +01:00
scrawl
14aacf9a72
Add comment
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
Marc Zinnschlag
9670e0881d
update reference's current cell when x/y-coordinates are modified
2015-01-16 15:17:52 +01:00
Marc Zinnschlag
561ddfa0c5
make column type accessable via the regular table model
2015-01-16 11:29:44 +01:00
scrawl
714b19015c
Fix unknown record error message
2015-01-15 20:31:08 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
fc6aa256bf
Add comment
2015-01-15 16:05:25 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +01:00
Marc Zinnschlag
7615cbafce
create modify commands through command dispatcher
2015-01-15 14:24:33 +01:00
Marc Zinnschlag
706df3f881
silenced a coverity warning
2015-01-15 12:13:53 +01:00
Marc Zinnschlag
7b8e6f9dda
addressed potential 0-pointer issue
2015-01-15 12:04:23 +01:00
Marc Zinnschlag
f3c7532660
cleaned up some enum confusion
2015-01-15 12:01:59 +01:00
scrawl
bf915d929a
Update idle voices according to research
2015-01-15 03:35:46 +01:00
scrawl
b39cc0c8c8
Fix OpenCS window opening issue when config file doesn't exist
...
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
2015-01-15 02:49:54 +01:00
scrawl
6b2df95167
Fix for some coverity defects
2015-01-15 02:03:27 +01:00
scrawl
edbac30a57
Change another dynamic_cast to static_cast (coverity)
2015-01-15 01:23:58 +01:00
scrawl
cef72385d4
Fix extreme frame drop when running into certain corners ( Fixes #2023 )
2015-01-15 00:58:12 +01:00
scrawl
52ed3d92a8
Fix btCompoundShape scaling ( Fixes #1683 )
2015-01-14 17:59:04 +01:00
scrawl
a3c861b7fa
Idle voice fix
2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34
Fix running AI for dead actors
2015-01-13 18:13:02 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
scrawl
3ce22d31d8
Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up
2015-01-13 05:37:44 +01:00
scrawl
fafc14d5a0
Add proper air movement mechanics ( Fixes #2077 )
2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
4ed3e7bbb7
Enchanting code cleanup
2015-01-12 23:29:58 +01:00
scrawl
bb718f216d
Initialize ENAMstruct in SpellCreationDialog (Coverity)
2015-01-12 23:29:58 +01:00
scrawl
08d8dd287c
I think this was committed by accident
2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
2015-01-12 23:29:58 +01:00
scrawl
cda2eea906
Enchanting: use fEnchantmentConstantDurationMult and fEffectCostMult
2015-01-12 23:29:58 +01:00
scrawl
871d59de6c
Reduce Idle voice chance ( Fixes #1964 )
2015-01-12 23:29:58 +01:00
scrawl
82eaa9f1bc
Fix loading crash (don't apply viewmode before player is set up) ( Fixes #2272 )
2015-01-12 23:29:39 +01:00
scrawl
c3f3f8b3d0
Use only Cell records for saving progress bar ( Fixes #2259 )
2015-01-11 18:01:06 +01:00
scrawl
0ec018f7f1
More accurate savegame loading progress bar, uses position in the file (Bug #2259 )
2015-01-11 17:54:15 +01:00
scrawl
1780bcc238
Print RefNum in BetaComment
2015-01-11 17:04:58 +01:00
scrawl
4d4f2fc475
Add maximum distance for teleporting followers on using a door
2015-01-11 17:04:58 +01:00
scrawl
b108fbe986
Remove incorrect implementation of fGreetDistanceReset
...
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
2015-01-11 17:04:58 +01:00
scrawl
716e14a37a
Print missing savegame dependencies on the console
2015-01-11 17:04:58 +01:00
Marc Zinnschlag
7c959c8494
Merge remote-tracking branch 'dteviot/Bug811'
2015-01-11 12:30:32 +01:00
Marc Zinnschlag
289a912817
Merge remote-tracking branch 'scrawl/master'
2015-01-11 12:24:51 +01:00
dteviot
458b82c308
Centralized "fish can't attack non-swimmer" logic.
2015-01-11 14:25:46 +13:00
dteviot
7aa0f887c0
Minor changes to ESM::RefNum
...
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
scrawl
f9227beedd
Add warning when loading a savegame that depends on non-existing content files ( Fixes #2261 )
2015-01-11 00:06:52 +01:00
scrawl
579f5d232f
Move interactive messageBox to separate function
2015-01-10 23:23:48 +01:00
scrawl
91571f51be
Ogre crash workaround ( Fixes #1745 )
2015-01-10 22:45:08 +01:00
dteviot
fcbf7d7deb
Fixed string formatting minor error found by Mingun.
2015-01-11 08:33:33 +13:00
Marc Zinnschlag
595c08817f
Merge remote-tracking branch 'scrawl/master'
2015-01-10 17:02:46 +01:00
scrawl
37bea9d4dc
Fix exception for empty dialog topics ( Fixes #2267 )
2015-01-10 15:06:30 +01:00
Marc Zinnschlag
320b994aef
keep original cell field empty, if reference is in modified
2015-01-10 12:35:59 +01:00
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
2015-01-10 11:33:04 +01:00
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
scrawl
5b9d10f851
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
dteviot
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
2015-01-10 15:04:45 +13:00
scrawl
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
2015-01-10 03:01:01 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
scrawl
4b704f665f
Reduce includes, move DragAndDrop to separate file
2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b
Reduce includes
2015-01-10 01:00:52 +01:00
scrawl
66e7e04807
UnitTests: add another dialogue keyword test
2015-01-10 00:29:07 +01:00
scrawl
2ac23008f5
Remove an old workaround ( Fixes #2263 )
...
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
2015-01-10 00:07:55 +01:00
scrawl
dfdf26e95e
Add assertion to Store
2015-01-09 20:58:53 +01:00
scrawl
1b302b750c
UnitTests: add tests for KeywordSearch conflict resolution
2015-01-09 20:53:49 +01:00
scrawl
9d07edda13
UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04
2015-01-09 20:53:43 +01:00
scrawl
ce2cbab402
Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow)
2015-01-09 20:08:52 +01:00
Marc Zinnschlag
4e7f7baf8b
Merge remote-tracking branch 'dteviot/Bug2076'
2015-01-09 13:57:21 +01:00
Marc Zinnschlag
e32402a040
handle moved references on load
2015-01-09 12:05:53 +01:00
dteviot
64cd1396ac
Fixed minor issues.
...
1. Renamed "hightRatio" to "heightRatio".
2. Replaced magic numbers with named constants.
2015-01-09 22:17:53 +13:00
dteviot
7fe2f86d06
Slaughter fish attacks when player only knee deep in water ( Fixes #2076 )
2015-01-09 21:40:53 +13:00
Marc Zinnschlag
d254bb0a34
Merge remote-tracking branch 'dteviot/FixLoadOrderReset'
2015-01-09 09:32:23 +01:00
scrawl
65ab31eae6
Remove now redundant Store::setUp implementation
2015-01-09 04:31:02 +01:00
scrawl
ddd6e682bc
Dialogue: add conflict resolution for overlapping keywords ( Fixes #2245 )
2015-01-09 04:19:38 +01:00
scrawl
c77660ba20
Remove some nonsense code
2015-01-09 01:59:38 +01:00
scrawl
2ddbe22da3
Fix for NPC store clearDynamic bug
...
It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.
2015-01-09 01:59:32 +01:00
Marc Zinnschlag
f8a3ec3ee3
Merge remote-tracking branch 'scrawl/cmdline-savegame'
2015-01-08 20:57:49 +01:00
scrawl
d31ae2b345
Fix mIds mapping for dynamic records being lost on save/reload
2015-01-08 16:27:13 +01:00
scrawl
928b9ee41b
Fix missing GUI mode update when showing soulgem dialog
2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6
Don't right-shift signed integers which is implementation-defined
2015-01-08 16:27:13 +01:00
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
2015-01-08 12:15:48 +13:00
Marc Zinnschlag
38a413a483
Merge remote-tracking branch 'scrawl/master'
2015-01-07 20:22:15 +01:00
scrawl
4684014a83
Use .omwsave extension for save game files
2015-01-07 15:06:39 +01:00
scrawl
13c5bd5cc2
Enchanting: fix skill-based cast cost bonus being applied twice
2015-01-07 04:41:12 +01:00
scrawl
ef1b0a191b
Revert "Enchanting: fix inverted self-enchant success chance"
...
It wasn't inverted to begin with. The author of this commit is an idiot.
2015-01-07 03:48:16 +01:00
scrawl
4e92f6ab48
Add commandline option to load a save game on startup
2015-01-07 03:27:24 +01:00
scrawl
157438460b
Fix being able to activate objects when paralyzed
2015-01-07 02:34:29 +01:00
scrawl
dc5ed5b861
Remove weather particles underwater ( Fixes #2010 )
2015-01-07 02:34:29 +01:00
scrawl
d02e075bab
Add setting for exterior cell grid size ( Fixes #1537 )
2015-01-07 02:34:29 +01:00
scrawl
a17252eab3
Remove unused checkWaypoint function
...
It was an almost exact copy of the checkPathCompleted function anyway.
2015-01-07 02:34:28 +01:00
scrawl
4d9100091d
Reduce default pathing arrival tolerance to 32 units ( Fixes #1605 )
2015-01-07 02:34:28 +01:00
scrawl
e19ab77d00
Store camera first person state in savegame ( Fixes #2255 )
2015-01-07 02:34:24 +01:00
scrawl
992b87ea44
Reset existing summons when the spell is re-casted ( Fixes #2135 )
2015-01-06 16:11:10 +01:00
scrawl
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d
Merge remote-tracking branch 'internecine/bug2031'
2015-01-06 09:43:59 +01:00
Internecine
e1fdcb608e
Fixed incorrect index
2015-01-06 15:00:24 +13:00
scrawl
464f8abb3f
List exterior cell names in tab completion ( Fixes #2252 )
2015-01-06 01:10:09 +01:00
scrawl
708dbc2518
Crime fix
2015-01-05 20:31:50 +01:00
scrawl
c343a5c803
stopCombat fix
2015-01-05 20:31:50 +01:00
scrawl
c1955ef7fa
Fix enchanting dialog effect labels showing a duration for constant effects
2015-01-05 18:57:08 +01:00
Marc Zinnschlag
ba7b74217b
added original cell column to reference table
2015-01-05 15:20:47 +01:00
Marc Zinnschlag
3b534326ff
forbid manual editing of the cell field in reference records
2015-01-05 15:04:11 +01:00
scrawl
5e7e40aac9
Fix being able to switch weapons while knocked out
2015-01-04 19:54:49 +01:00
scrawl
de12c96a46
Fix crash on exit if the window wasn't created ( Fixes #2249 )
2015-01-04 19:23:31 +01:00
scrawl
bc686c93b5
Potential fix for thrown weapons being regarded as broken
2015-01-04 19:20:30 +01:00
scrawl
398fe6e780
Thrown weapon fix ( Fixes #2248 )
2015-01-04 19:20:24 +01:00
scrawl
d56906acf7
Fix the creature position glitch
2015-01-03 19:10:15 +01:00
scrawl
6f747df713
Remove an unused constructor
2015-01-03 19:10:15 +01:00
scrawl
593ca6bd48
Fix for framerate-dependent maximum stepping distance (Bug #1638 )
2015-01-03 19:10:15 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Marc Zinnschlag
bdc28c0523
Merge remote-tracking branch 'maqifrnswa/feature1325'
2015-01-02 18:14:42 +01:00
Marc Zinnschlag
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
2015-01-02 18:08:47 +01:00
Scott Howard
f24c1845b6
remove pop-up message on load failure
2015-01-02 10:42:09 -05:00
mrcheko
a8621e6230
defaults are set to 1.0; remove contrast setting
...
(can be changed in config though); disable gamma control for not Windows
OSs
2015-01-02 16:49:22 +03:00
Scott Howard
dece4e2640
remove unneeded includes
2015-01-01 22:54:32 -05:00
Scott Howard
03b39435f8
place user settings window at same location as mouse pointer
2015-01-01 22:50:35 -05:00
Scott Howard
ce7cef924e
when loading a file fails, pop-up critical window and highlight error text
2015-01-01 22:27:08 -05:00
Thoronador
44e01d0eaa
remove redundant initialization statement
...
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
2015-01-02 02:23:10 +01:00
Thoronador
526fb1b37b
fix uninitialized value in BillboardObject
2015-01-02 00:45:50 +01:00
Thoronador
91ff536460
fix uninit, #2
2015-01-02 00:26:45 +01:00
Thoronador
17fb7aa598
uninitialized stuff
2015-01-01 23:18:30 +01:00
scrawl
97fc51ceb7
Merge commit 'pull/origin/422'
2015-01-01 23:03:38 +01:00
scrawl
326d0d3ebf
Add default values for fNPCHealthBarTime and fNPCHealthBarFade ( Fixes #2243 )
...
These GMSTs are missing in unpatched versions of the game.
2015-01-01 22:55:43 +01:00
scrawl
92e4a0669c
Fix for AiWander state loading
2015-01-01 18:58:17 +01:00
scrawl
559ddbb480
Quick fix for Ai fast-forward crash in exteriors ( Fixes #2241 )
2015-01-01 18:18:46 +01:00
Marco Schulze
6cd5b78ca7
Fix missing include in apps/launcher/main.cpp
2015-01-01 14:15:05 -03:00
Internecine
a7a3ab0c78
Fixed instant negative dynamic stat changes being applied as positive
2015-01-01 21:26:09 +13:00
scrawl
dc1c52bda7
Add some todo comments
2015-01-01 03:38:54 +01:00
scrawl
e0d083f702
Add hand-to-hand combat mechanics for bipedal creatures
...
You can now have a fistfight with vivec, if you so desire.
2015-01-01 03:38:54 +01:00
scrawl
70d3bfc6ed
Fix idle animation not restarting immediately for creatures
2015-01-01 03:38:54 +01:00
scrawl
01652bbcc5
Store original actor position in AiWander package ( Fixes #2200 )
2015-01-01 03:38:49 +01:00
scrawl
5d7eb11596
Fix lights being rendered on the map (broken by d55fe43fc9)
2014-12-31 21:04:13 +01:00
scrawl
99ae0f901b
Implement AiTravel fast-forward ( Fixes #1125 )
2014-12-31 20:42:29 +01:00
scrawl
a8ae0dec52
Implement AiWander fast-forward (Feature #1125 )
2014-12-31 18:41:57 +01:00
scrawl
d26d5f6c26
Fix outdated bone locations when camera view is changed while paralyzed
2014-12-31 17:25:06 +01:00
scrawl
d1a29300f0
Handle bipedal creatures not using weapons ( Fixes #2238 )
2014-12-31 16:59:21 +01:00
mrcheko
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
2014-12-31 18:40:01 +03:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1
gamma/contrast system reworked
2014-12-30 18:33:11 +03:00
scrawl
9c693d078b
Fix equipment update removing ammunition ( Fixes #2144 )
2014-12-30 16:22:06 +01:00
scrawl
18fb3f831a
Make the maximum horizontal stepping distance independent of movement speed ( Fixes #1638 )
2014-12-30 15:46:33 +01:00
dteviot
a62e15d93d
Read profile files from LauncherSettings in load order.
2014-12-30 17:25:19 +13:00
scrawl
e2346d7c37
Store permanent magic effects in savegame ( Fixes #1648 )
2014-12-30 01:36:31 +01:00
scrawl
6c9875969a
Stop idle animations for non-biped creatures when attacking/moving
...
The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
2014-12-28 15:34:47 +01:00
scrawl
a58bc9f2f7
Remove sneaking effect on combat AI ( Fixes #2237 )
2014-12-28 14:45:20 +01:00
scrawl
1bd3ab8a2d
Fix torch animation playing when torch is hidden ( Fixes #2236 )
2014-12-28 14:17:53 +01:00
scrawl
377b79d5ba
Use SoundGen fallback for type Land only ( Fixes #2228 )
2014-12-28 02:39:54 +01:00
scrawl
de9d347018
Fix on touch area effect spells ( Fixes #2233 )
2014-12-28 01:51:12 +01:00
scrawl
25954a80f5
Fix recharging of items in player inventory
2014-12-28 01:06:49 +01:00
scrawl
0a2dd4c6cb
Fix unsafe use of BaseNode in Move script instruction
2014-12-27 17:20:37 +01:00
scrawl
a62fe38a1b
Fix unsafe use of BaseNode
2014-12-27 15:02:05 +01:00
scrawl
50e31877ab
Fix crash when northmarker has been disabled (Bug #2230 )
2014-12-27 14:52:33 +01:00
Internecine
5f9540318a
Fixed incorrect indexes
2014-12-27 19:49:14 +13:00
Internecine
a87fe71ddf
Added a helper function to handle dynamic stat changes
2014-12-27 19:46:54 +13:00
scrawl
2f0793390f
Fix cut off text for some widgets in the stats window
2014-12-27 01:25:26 +01:00
Marc Zinnschlag
2fa0764c89
Merge remote-tracking branch 'swick/master'
2014-12-26 16:08:07 +01:00
Marc Zinnschlag
5f8b8b127c
Merge remote-tracking branch 'psi29a/clang_lintian'
2014-12-26 16:07:07 +01:00
Marc Zinnschlag
da722a5cf1
Merge remote-tracking branch 'miroslavr/master'
2014-12-26 16:05:20 +01:00
Sebastian Wick
764cd9ca16
disable "window border" setting in the ingame settings UI if fullscreen is enabled
2014-12-24 16:31:23 +01:00
scrawl
6f72989cb1
SpellModel, SortFilterItemModel: case insensitive sorting
2014-12-24 15:45:15 +01:00
scrawl
2e5e7370ba
Adjust default angle, FOV and viewport of character preview ( Fixes #2220 )
2014-12-24 15:45:15 +01:00
scrawl
9a1bde684f
Sort class list in select class dialog
2014-12-24 15:45:14 +01:00
scrawl
768c4a5757
Update crime response to pickpocket attempts (thanks Hrnchamd)
2014-12-24 15:45:14 +01:00
scrawl
b8fa73dfa9
Preserve record ordering in Store
...
This fixes the default head/hair used for some races in the chargen UI.
2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53
Make local map widget size configurable
2014-12-24 15:45:14 +01:00
scrawl
a47de06492
Make local map resolution configurable and use lower default value
...
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
2014-12-24 15:45:14 +01:00
scrawl
7f0d71f8f4
Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd)
2014-12-24 15:45:14 +01:00
scrawl
59f21c6105
Use "hair" as filter for PRT_Hair parts ( Fixes #2218 )
2014-12-24 15:45:14 +01:00
scrawl
d55fe43fc9
Support animation groups for Light and Door objects ( Fixes #2039 )
2014-12-24 15:45:14 +01:00
scrawl
019cd96719
Stop AiPursue when target has invisibility or chameleon>=75
2014-12-24 15:45:14 +01:00
scrawl
e5de253169
Use maximum step size of 62 units for stepping down ( Fixes #1809 )
2014-12-24 15:45:14 +01:00
scrawl
edc128572d
Add MWMechanics::Actor class for temporary actor state, move AiState there
2014-12-24 15:45:14 +01:00
scrawl
42d63a4eb2
Fix position flicker after an animation ends
2014-12-24 15:45:14 +01:00
scrawl
8bc7eb5530
PlayGroup: Don't loop animations with no loop keys ( Fixes #2223 )
2014-12-24 15:45:13 +01:00
scrawl
9e5dfb6e98
Update crime system according to research wiki for more accurate attack responses
2014-12-24 15:45:13 +01:00
scrawl
2410d79410
Fix iFightAttack and iFightAttacking being swapped
...
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
2014-12-24 15:45:13 +01:00
scrawl
e73e975291
Fix player being able to activate objects when knocked out
2014-12-24 15:45:13 +01:00
scrawl
3912ee2b1d
Fix faction rank not being set on items in faction-owned containers
2014-12-24 15:45:13 +01:00
scrawl
0081a68376
Use fMagicStartIconBlink for spell effect indicator fading
2014-12-24 15:45:13 +01:00
scrawl
877e07823d
Fix incorrect sound for spell creation success
2014-12-24 15:45:13 +01:00
scrawl
fb542a64ec
Merchant items should be restocked instantly
2014-12-24 15:45:13 +01:00
scrawl
1bcc4430e0
Fix owner not getting set on restocked items
2014-12-24 15:45:13 +01:00
scrawl
9ed71765a9
Fix deleted containers showing in merchant inventories
2014-12-24 15:45:13 +01:00
scrawl
f3738e9a98
Say an "intruder" voice dialogue for trespassing crimes ( Fixes #1082 )
...
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
2014-12-24 15:45:13 +01:00
scrawl
37e11b7272
Adjust loading box size for large captions
2014-12-24 15:45:12 +01:00
scrawl
866fdfe8bd
Crime system improvements
...
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
2014-12-24 15:45:12 +01:00
scrawl
307b84e9f6
Add enemy health bar fading and use relevant GMSTs
2014-12-24 15:45:12 +01:00
scrawl
1910327469
Implement disposition changes due to crimes
2014-12-24 15:45:12 +01:00
scrawl
cc9af9562b
Function_CreatureTargetted should return '2' for werewolfs
...
This makes NPCs say the correct attack voice files when fighting a werewolf.
2014-12-24 15:45:12 +01:00
scrawl
efa9ff3a76
Fix incorrect implementation of iWerewolfBounty
2014-12-24 15:45:12 +01:00
scrawl
35d2bfabca
Adjust NPC response to pickpocket attempts ( Fixes #2219 )
2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc
Support region names in cell dialogue filter ( Fixes #2113 )
2014-12-24 15:45:12 +01:00
scrawl
105f0f8716
Head tracking: don't look at dead actors
2014-12-24 15:45:12 +01:00
scrawl
8a210c49e9
Improve AI prioritising health potions
2014-12-24 15:45:12 +01:00
scrawl
a29abb85f1
Fix ItemView sizing bug
2014-12-24 15:45:12 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
scrawl
1b9209df4a
Allow blocking of hand-to-hand attacks
2014-12-24 15:45:11 +01:00
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
2014-12-24 15:09:50 +01:00
MiroslavR
3cc32b641a
Fix some memory leaks
2014-12-23 20:44:25 +01:00
Bret Curtis
45299abe99
make it C98 compat
2014-12-23 17:13:11 +01:00
Bret Curtis
dcfadeb51a
fix typo and annoying gcc/clang unused return values in crash catcher
2014-12-22 10:45:34 +01:00
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
2014-12-22 02:44:20 +01:00
MiroslavR
c796589420
Allow adding multiple Attribute/Skill effects in spell making ( Fixes #2224 )
2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson
0af5c7b379
Starting to clean up some heavy includes
2014-12-19 09:23:16 +01:00
Marc Zinnschlag
057d0913d6
Merge branch 'scriptfixes'
2014-12-18 10:22:07 +01:00
Marc Zinnschlag
a6d30bc2e3
consider --script-warn when running with --script-all-dialogue
2014-12-18 10:20:15 +01:00
Marc Zinnschlag
899ae763e6
fixing a travis build problem
2014-12-17 09:33:40 +01:00
scrawl
c2771bc8ab
Head tracking fix
2014-12-17 02:15:40 +01:00
scrawl
31d28e727f
Implement leveled list script functions ( Fixes #1546 )
2014-12-17 01:24:22 +01:00
scrawl
d642512f71
Error message fix
2014-12-17 00:57:04 +01:00
scrawl
88c5e1991c
Fix being able to stand on top of actors ( Fixes #1192 )
2014-12-16 23:18:41 +01:00
scrawl
d962f0918d
Implement NPC head tracking ( Fixes #1720 )
2014-12-16 20:47:45 +01:00
scrawl
b9e5aa9db6
Movement controller: Don't allow stepping up other actors
...
This seems to fix issues with NPCs inadvertently being placed on top of a small creature while fighting it.
Note that jumping on top of actors is still possible (Bug #1192 )
2014-12-16 20:44:42 +01:00
scrawl
0dc9401269
Fix GUI crash due to outdated spells list
2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5
Fix missing armor rating label update
2014-12-15 19:19:08 +01:00
scrawl
e4127aa491
Use space in ItemView more efficiently
2014-12-15 19:04:53 +01:00
scrawl
c7e1c0b595
Fix weapon cycle getting stuck for same item IDs
2014-12-15 17:49:08 +01:00
scrawl
935cccf974
Implement weapon/spell cycling hotkeys ( Fixes #1024 )
2014-12-15 16:23:08 +01:00
scrawl
4d5adfb5dd
Fix being able to use enchantments of items that failed to equip ( Fixes #2215 )
2014-12-15 13:47:34 +01:00
scrawl
4e0d16da8c
Take Scale field in creature record into account ( Fixes #2214 )
2014-12-15 13:34:04 +01:00
scrawl
79237d16a7
Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
...
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
2014-12-15 13:28:03 +01:00
scrawl
7abbca8be9
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-12-14 20:27:12 +01:00
scrawl
2b78e9795d
Implement Calm effect removing combat packages ( Fixes #1985 )
2014-12-14 19:35:34 +01:00
scrawl
4f3995a4d8
Fix werewolf AI being able to use items
2014-12-14 19:15:43 +01:00
scrawl
4acc25f59c
Use SoundGen with no creature field as fallback
...
This fixes the adorable "thump" sounds in the Scrib's idle animation not playing.
2014-12-14 17:52:06 +01:00
scrawl
192626c6f5
SoundGen fix: use Original Creature field only if non-empty
2014-12-14 17:44:03 +01:00
MiroslavR
c5a604453e
Fix several book formatting issues ( Fixes #2204 )
2014-12-14 16:25:27 +01:00
scrawl
88a2e4c043
Graceful error handling for missing spells/factions ( Fixes #1825 , Bug #2176 , Bug #2203 )
2014-12-14 02:38:27 +01:00
Nik Dyonin
80c92789c2
Fix issue when killed NPC cannot be looted if it was in combat mode before killing.
2014-12-14 02:58:42 +03:00
Marc Zinnschlag
1f74d8cca5
Merge remote-tracking branch 'scrawl/scripttest'
2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f
Add --script-all-dialogue switch to compile all dialogue scripts ( Fixes #1659 )
2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec
Always print the failing dialogue script
...
These aren't usually very long, so printing them shouldn't spam the console by too much.
2014-12-13 00:39:24 +01:00
scrawl
ed6face4aa
Disable activation scripts for actors in combat
2014-12-12 22:21:57 +01:00
scrawl
60aa209144
Implement drowning when knocked out underwater ( Fixes #1228 )
2014-12-12 17:42:56 +01:00
scrawl
d034a079e6
Allow equipping twohanded weapon and shield at the same time ( Fixes #1785 )
...
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2
Fix vampirism magic effect not applying immediately ( Fixes #1984 )
2014-12-12 02:39:59 +01:00
scrawl
03da21f088
Remove redundant GUI element showing during loading screens
2014-12-12 02:13:50 +01:00
scrawl
e69cf11029
Hide tooltips during loading screens
2014-12-12 02:09:15 +01:00
scrawl
cf5fc60e86
Make ToggleMenus affect tooltips ( Fixes #1989 )
2014-12-12 01:42:13 +01:00
scrawl
f42420bc19
Use the Original Creature field for SoundGen lookups
2014-12-12 01:24:35 +01:00
scrawl
2601b26217
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-12-11 22:44:58 +01:00
scrawl
7892ed35f3
PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078 )
2014-12-11 22:25:53 +01:00
scrawl
886903d70e
Implement HitAttemptOnMe function (Bug #2078 )
2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3
Reset lastHitObject when it is retrieved rather than every frame
...
This seems to be how vanilla MW does it.
2014-12-11 22:00:31 +01:00
scrawl
a355550cab
Add support for NPCs with missing head/hair models ( Fixes #2078 )
2014-12-11 21:43:31 +01:00
scrawl
be16f1d0a5
Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078 )
2014-12-11 21:00:02 +01:00
scrawl
d955017079
Don't report script operation status via messageBox (Bug #1942 )
2014-12-11 20:51:02 +01:00
Marc Zinnschlag
912dcdc418
Merge remote-tracking branch 'scrawl/ptrupdate'
2014-12-11 20:41:53 +01:00
Marc Zinnschlag
7759f9f8f9
Merge remote-tracking branch 'scrawl/launcher'
2014-12-11 20:40:20 +01:00
Marc Zinnschlag
19bd07648b
Merge remote-tracking branch 'scrawl/pathgrid'
2014-12-11 20:32:32 +01:00
scrawl
ed2aa5a233
Fix crash caused by dangling baseNode pointer
2014-12-11 20:32:05 +01:00
scrawl
7e8ca3fff1
Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942 )
2014-12-11 19:29:06 +01:00
scrawl
8ed376af5e
Launcher: fix changing active profile through the Play page
2014-12-11 15:59:43 +01:00
scrawl
3270f0e932
Change pathgrid workaround to check for interior cell name
2014-12-11 15:19:48 +01:00
scrawl
1937ace1b7
Launcher: fix bugs deleting profiles ( Fixes #2188 )
2014-12-10 21:52:30 +01:00
scrawl
33019b93b4
Fix bug setting current launcher profile on startup (Bug #2188 )
2014-12-10 21:10:14 +01:00
scrawl
623783cd6a
Enchanting: fix cast cost for "on use" enchantments being set incorrectly
2014-12-10 18:05:11 +01:00
scrawl
619ea846b4
Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type)
2014-12-10 17:55:48 +01:00
scrawl
74c345f790
Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense)
2014-12-10 17:40:59 +01:00
scrawl
ead6bf1601
Enchanting: cast the enchant points for the item to int ( Fixes #2202 )
2014-12-10 17:34:05 +01:00
scrawl
3c747195ae
Add fall damage for creatures ( Fixes #2201 )
2014-12-10 17:21:34 +01:00
scrawl
e0c6f84546
AiFollow: target has to be seen in order to start following ( Fixes #1637 )
2014-12-09 22:25:28 +01:00
Digmaster
95219a7936
Show currently selected input type for settings window
2014-12-09 14:48:34 -06:00
Digmaster
bb6ed06a4e
read gamecontrollerdb file location from settings file
2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a
Fixed binding controls to A on joystick
2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593
Inital value for joysticks is 0.5
2014-12-09 11:16:17 -06:00
scrawl
109a3f78a1
Adjust AiFollow distance for groups of multiple followers ( Fixes #1637 )
2014-12-09 16:06:04 +01:00
scrawl
3ad0189982
Take sound listener y rotation (roll) into account, though currently unused for actors
2014-12-09 12:07:22 +01:00
Marc Zinnschlag
0522da257c
Merge remote-tracking branch 'scrawl/master'
2014-12-09 11:07:26 +01:00
Digmaster
073a2f0674
Fixed issue with walking
2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1
Joystick Support
2014-12-08 21:57:32 -06:00
scrawl
0fe7500f74
Work around pathgrid record limitation ( Fixes #2195 )
2014-12-09 00:13:56 +01:00
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
Internecine
edc51ab768
Removed debug output
2014-11-05 15:26:13 +13:00
Internecine
6741fbe7a9
Fixes bug #2031
2014-11-05 15:22:44 +13: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
Internecine
9c5f156793
Fixes tooltip displaying 0 durations
2014-11-05 00:46:33 +13: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
cc9cii
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
2014-11-02 08:22:27 +11:00
scrawl
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
2014-11-01 19:37:54 +01:00
scrawl
efa4d09c48
Fix crash when avcodec_decode_audio4 doesn't return a full frame ( Fixes #2088 )
2014-11-01 19:32:07 +01:00
cc9cii
998982b16a
Keep physics engines until physics code is moved out of OEngine.
2014-11-01 21:04:53 +11:00
Marc Zinnschlag
8b3d876534
Merge remote-tracking branch 'lgro/ffmpeg_decoder'
2014-11-01 10:57:21 +01:00
cc9cii
c6a2461fbd
Delay removing physics until the document is closed. Also other general cleanup.
2014-11-01 20:51:04 +11:00
cc9cii
1ee64c7087
Add missing files for multi-document support.
2014-11-01 19:12:22 +11:00
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8
Fix Subview interface clutter by keeping a map of Scenewidgets.
2014-11-01 08:29:08 +11:00
cc9cii
e51d532795
Show drag movements of objects in multiple scene managers.
2014-11-01 07:39:58 +11:00
cc9cii
d6e67b248f
Fix deleting objects and scenewidgets.
2014-11-01 07:29:16 +11:00
Marc Zinnschlag
7785e3a0bc
fixed for potential crash during saved game loading
2014-10-31 17:59:55 +01:00
cc9cii
ade7f09203
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
2014-11-01 00:03:09 +11:00
cc9cii
ac7acb2c22
Disable more debug code.
2014-10-31 22:21:24 +11:00
cc9cii
4f685092fb
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
2014-10-31 22:05:24 +11:00
cc9cii
aa7b693a13
Remove debug settings and minor cleanup.
2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee
Multiple SceneManagers per physics engine now working.
2014-10-31 21:50:57 +11:00
Marc Zinnschlag
ac58dd735b
do not crash on exceptions while adding startup scripts
2014-10-31 11:02:42 +01:00
Marc Zinnschlag
4fa0bf63c5
Merge remote-tracking branch 'scrawl/master'
2014-10-31 08:18:18 +01:00
scrawl
45f14f0704
Fix stolen faction-owned items not being confiscated
2014-10-31 00:25:37 +01:00
cc9cii
a2ac4c7650
Allow multiple scene managers per physics engine. Compiles but does not work properly.
2014-10-31 08:18:15 +11:00
Marc Zinnschlag
8ed3454774
Merge remote-tracking branch 'corristo/unshiled-include-fix'
2014-10-29 14:49:04 +01:00
cc9cii
0515159b74
Fix typo.
2014-10-29 23:38:19 +11:00
cc9cii
1741043f20
Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.
2014-10-29 23:02:38 +11:00
Nikolay Kasyanov
0dc08e2983
Properly add libunshiled include dir
2014-10-29 11:26:06 +02:00
Alexander "Ace" Olofsson
c1ce570e37
Use the enum value from Qt::KeyboardModifiers
...
This fixes the windows build at least
2014-10-29 04:55:06 +01:00
cc9cii
792fbd119f
Resolve incorrect merge issues.
2014-10-29 10:43:55 +11:00
cc9cii
c990ed4335
Merge branch 'mouse-picking-state' into mouse-picking
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
2014-10-29 09:33:48 +11:00
cc9cii
6ca88dc541
Merge branch 'master' into mouse-picking
...
Conflicts:
apps/opencs/model/settings/usersettings.cpp
2014-10-29 09:28:23 +11:00
cc9cii
8e2a0ea90a
Implemented moving objects around x-y plane.
2014-10-29 08:13:13 +11:00
scrawl
f7ba1dbfc8
Add error handling for getPcRank and similar defines ( Fixes #2071 )
2014-10-28 16:07:37 +01:00
cc9cii
68b7532383
Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.
2014-10-29 00:50:48 +11:00
scrawl
e48dc45ede
Fix creatures not being able to move with 0/0 encumbrance
2014-10-27 21:53:00 +01:00
scrawl
c194226d08
Increase maximum height for finding spawn points to 500 ( Fixes #2056 )
2014-10-27 21:52:59 +01:00
scrawl
aa02974d3b
Fix Journal instruction for non-existing journal indices ( Fixes #2063 )
2014-10-27 21:52:59 +01:00
cc9cii
5afaa0083f
Minimise false detection of grab & drag operation.
2014-10-28 06:42:33 +11:00
cc9cii
a01a921644
Experimental mouse event state machine for 3d editing, starting with drag & drop objects.
2014-10-28 06:01:19 +11:00
Marc Zinnschlag
e604fcf282
Merge branch 'double'
2014-10-27 09:56:52 +01:00
Marc Zinnschlag
6f4b753750
replaced regular function call from SubView to View with signal-slot-connection
2014-10-27 09:51:55 +01:00
Marc Zinnschlag
1aef9304e9
replaced the signal/slot user settings update with a regular function call
2014-10-27 09:44:18 +01:00
Marc Zinnschlag
b0a7b457f7
made double click actions in tables configurable
2014-10-27 09:32:02 +01:00
cc9cii
815e832dbb
Merge branch 'master' into mouse-picking-state
2014-10-27 18:57:42 +11:00
Marc Zinnschlag
275bf854ed
added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)
2014-10-27 08:57:18 +01:00
cc9cii
6c8320a638
More cleanup.
2014-10-27 12:09:20 +11:00
cc9cii
c2c33eac0f
Minor cleanup.
2014-10-27 08:26:01 +11:00
cc9cii
0b63ba5727
Move debug rendering code out of PhysicsSystem.
2014-10-27 08:08:33 +11:00
cc9cii
dd2c067e17
Cleanup for better legibility.
2014-10-27 06:50:51 +11:00
cc9cii
fb0f85c8db
Report terrain position on cursor position.
2014-10-26 21:15:47 +11:00
cc9cii
95683bc8c3
Add user interface for top level window status-bar setting (implementation already existed). For feature #854 .
2014-10-26 15:04:52 +10:00
cc9cii
8b0dc88db8
Use the correct name for deleting objects.
2014-10-26 08:15:18 +11:00
cc9cii
b46df4034d
Cleanup bullet objects in the destructors.
2014-10-26 07:56:51 +11:00
scrawl
dab05471be
Reset crime when bounty is reset to 0 by a script ( Fixes #2057 )
2014-10-25 21:09:37 +02:00
scrawl
ac067564ea
Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware.
2014-10-25 20:50:41 +02:00
scrawl
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-25 19:59:23 +02:00
Marc Zinnschlag
aad13e6bff
close view when closing last sub-view unless this view is the last view
2014-10-25 18:13:56 +02:00
scrawl
55c9c0a266
Audio resampling fixes
...
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
2014-10-25 17:17:57 +02:00
Marc Zinnschlag
a9f5632afd
extended double click functionality in tables
2014-10-25 16:27:36 +02:00
cc9cii
9337d6533a
Add terrain collision. Support visibility mask for objects and terrain.
2014-10-25 22:09:19 +11:00
Marc Zinnschlag
a87092d11b
Merge remote-tracking branch 'miroslavr/master'
2014-10-25 12:09:36 +02:00
Marc Zinnschlag
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
2014-10-25 12:08:16 +02:00
cc9cii
cc0acec64c
Add settings to enable/disable debug rendering of mouse picking.
2014-10-25 21:02:40 +11:00
cc9cii
dd9208afeb
Merge remote-tracking branch 'upstream/master' into mouse-picking
2014-10-25 10:59:17 +01:00
cc9cii
e01795556f
Suppress some warnings for MSVC.
2014-10-25 10:37:57 +11:00
scrawl
dbe30e31b9
Make creature's model take priority over base_anim.nif ( Fixes #2055 )
2014-10-25 00:56:43 +02:00
scrawl
b39d69e98c
Videoplayer fixes, play/pause & seeking
...
- Fix rindex overflow
- Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
- Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
- Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)
The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
2014-10-24 21:31:11 +02:00
MiroslavR
ed3a3f717f
Handle getdistance on objects inside a container ( Fixes #2046 )
2014-10-24 19:05:43 +02:00
MiroslavR
fa746b8e54
Do not display weight or value in tooltip for zero-weight items ( Fixes #2047 )
2014-10-24 19:05:43 +02:00
MiroslavR
925fa8d193
Reset ownership of items dropped via 'drop' instruction ( Fixes #2053 )
2014-10-24 19:04:47 +02:00
scrawl
e2bad395e5
Leak fix
2014-10-24 18:07:17 +02:00
cc9cii
54a6897df8
Use QString rather than std::to_string
2014-10-24 20:43:29 +10:00
cc9cii
e5dd8d06a0
Store object reference id to RigidBody instead of scene node handles.
2014-10-24 21:18:29 +11:00
cc9cii
cb53e714f7
Convert PhysicsSystem to a singleton.
2014-10-24 19:14:02 +10:00
cc9cii
98ff3e7307
No physics or mouse picking for object preview.
2014-10-24 07:57:29 +11:00
Marc Zinnschlag
19b380d0b4
Merge remote-tracking branch 'scrawl/master'
2014-10-23 20:07:40 +02:00
Marc Zinnschlag
6ff41c6a00
intercept shift/ctrl double-clicks in tables
2014-10-23 11:28:58 +02:00
cc9cii
2f26fc1188
Avoid Ogre exceptions and null pointers.
2014-10-23 20:14:01 +11:00
cc9cii
39cd89a9af
Make gcc happy.
2014-10-23 18:51:31 +11:00
cc9cii
4d86371ca3
Minor refactoring and cleanup.
2014-10-23 15:35:01 +11:00
cc9cii
cca6d0a024
Fixed issue with mouse picking accuracy.
2014-10-23 12:43:06 +11:00
scrawl
eb1c24ffe6
Refactor video player engine to get rid of MWSound dependencies
...
- Split video player to separate source files.
- Move video player engine sources to extern/ (repository will be set up on github soon).
- Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
- Handle conversion of unsupported channel layouts via ffmpeg's swresample.
2014-10-22 22:33:32 +02:00
cc9cii
fdee3fd919
Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.
2014-10-23 06:59:14 +11:00
Marc Zinnschlag
c1d867a213
Merge remote-tracking branch 'origin/master'
2014-10-22 09:48:30 +02:00
Marc Zinnschlag
8f0add75f5
Merge remote-tracking branch 'scrawl/master'
2014-10-22 09:42:28 +02:00
Marc Zinnschlag
94d5151273
Merge remote-tracking branch 'miroslavr/master'
2014-10-22 09:39:54 +02:00
scrawl
bcb2d714c0
Add TODO comments for future videoplayer enhancements
2014-10-21 23:46:04 +02:00
cc9cii
4b53b8658b
Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.
2014-10-22 07:11:04 +11:00
scrawl
41df4289c6
Merge remote-tracking branch 'upstream/openmw-33' into HEAD
...
Conflicts:
apps/openmw/mwworld/store.hpp
2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson
b5a57920b6
Fix compile error on Windows
2014-10-21 19:35:17 +02:00
scrawl
5711103322
Remove leftover comment
2014-10-21 17:51:59 +02:00
scrawl
202cfa879f
Implement frame drop support in the videoplayer ( Fixes #1343 )
2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6
Fix videoplayer crash on quit
...
The sound stream thread was trying to update the stream during/after destruction of the video state.
2014-10-21 17:01:53 +02:00
scrawl
8472695f89
Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
...
This reverts commit d77546b7dc
2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff
Revert "Fix for compiler warnings and deprecated functions usage in videoplayer."
...
This reverts commit f5589b42ea
2014-10-21 17:01:53 +02:00
scrawl
681f3fa530
Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder."
...
This reverts commit b40c1ff26c
2014-10-21 17:01:52 +02:00
Marc Zinnschlag
5fdd264d07
Merge remote-tracking branch 'origin/master'
2014-10-21 12:38:35 +02:00
Marc Zinnschlag
843493e90a
fixed case-problem in OpenCS script compiler
2014-10-21 12:38:18 +02:00
scrawl
8b3755a770
Compile fix
2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:45:18 +02:00
scrawl
192069a181
Add automatic potion naming
2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06
Fix alchemy producing potion IDs from content files
2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2
Compile fix
2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a
Add automatic potion naming
2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3
Fix alchemy producing potion IDs from content files
2014-10-20 17:07:54 +02:00
MiroslavR
5a7dbb19f7
Code clarity
2014-10-20 01:10:08 +02:00
scrawl
4047e3c928
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:45:18 +02:00
Marc Zinnschlag
94ae222f0e
Merge branch 'settings'
2014-10-19 13:44:15 +02:00
Marc Zinnschlag
a5bbfff9e2
another layout correction
2014-10-19 13:43:40 +02:00
Marc Zinnschlag
5a1ce4943e
added advance 3D rendering user settings section
2014-10-19 13:41:56 +02:00
cc9cii
8bcd415cca
Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.
2014-10-19 07:25:54 +11:00
MiroslavR
ed6bdc0bde
Use all topics to search for keywords in dialogues ( Fixes #2013 )
...
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
2014-10-18 20:07:40 +02:00
scrawl
deabc52c16
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:59 +02:00
scrawl
415f67f859
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:07:01 +02:00
scrawl
8233f5894a
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:04:36 +02:00
cc9cii
03a30c3f1d
Experimental, compiles but does not work.
2014-10-18 06:16:48 +11:00
scrawl
f117a75747
Force walk animation when flying ( Fixes #2015 )
2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:01:28 +02:00
Marc Zinnschlag
2106893563
silenced a compiler warning regarding null pointer dereferencing
2014-10-17 15:47:31 +02:00
Marc Zinnschlag
49938182e8
silenced a compiler warning regarding null pointer dereferencing
2014-10-17 15:46:07 +02:00
Marc Zinnschlag
a3c894c1e2
Merge branch 'cellmarker'
2014-10-17 14:26:16 +02:00
Marc Zinnschlag
994159fafd
fixed broken iterator
2014-10-17 14:23:37 +02:00
Marc Zinnschlag
8a05c0e5c0
fixed overlay singleton
2014-10-17 14:23:27 +02:00
Marc Zinnschlag
ba46bcad40
Revert "Don't allow viewing non-existent cells from the regionmap."
...
This reverts commit 7cdab41501
2014-10-17 13:52:21 +02:00
Marc Zinnschlag
4b921c3876
user settings cleanup
2014-10-17 13:49:33 +02:00
Marc Zinnschlag
c97845d35d
better script compiler diagnostics
2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f
Fix ItemWidget text cleanup ( Fixes #2022 )
2014-10-17 02:41:43 +02:00
Marc Zinnschlag
ed44f3ec7d
added tooltip support to user settings UI
2014-10-16 16:22:36 +02:00
scrawl
c4e81adb83
Fix settings window being too small for all tabs on some localizations
2014-10-16 15:49:01 +02:00
scrawl
e413bebe99
Toggle addon files when activated or clicked on checkbox rather than clicked ( Fixes #1980 )
2014-10-16 15:07:51 +02:00
Marc Zinnschlag
f4894deff1
removed special value text from spin boxes (broken feature, not used anyway)
2014-10-16 14:47:55 +02:00
Marc Zinnschlag
dddd20ba1e
added default values for display format settings
2014-10-16 14:31:13 +02:00
Marc Zinnschlag
799cd87b52
name convention and spelling fixes
2014-10-16 14:24:17 +02:00
Marc Zinnschlag
e27da6a0d4
removed settings file mixup
2014-10-16 13:59:34 +02:00
Marc Zinnschlag
c94c1adaf3
split off settings page label from internal section name
2014-10-16 13:48:07 +02:00
cc9cii
7cdab41501
Don't allow viewing non-existent cells from the regionmap.
2014-10-16 07:36:47 +11:00
cc9cii
094f046087
Convert OverlaySystem to a OpenCS style singleton.
2014-10-16 07:29:46 +11:00
scrawl
244db5cbfe
Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33
2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1
fix for implicit references
2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b
dagoth fix
2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09
setDynamic workaround for broken endgame scripts ( Fixes #2016 )
2014-10-15 15:00:45 +02:00
Marc Zinnschlag
720ba2c0d8
split off settings label from internal settings name
2014-10-15 13:39:53 +02:00
Marc Zinnschlag
daf7cab416
refactored section handling
2014-10-15 12:38:17 +02:00
Marc Zinnschlag
219fbd427f
unclutter user settings declarations
2014-10-15 12:13:22 +02:00
Marc Zinnschlag
868fdfba51
reclaiming some unused space
2014-10-15 11:07:40 +02:00
Marc Zinnschlag
e20fa209cc
user settings UI layout improvements
2014-10-15 11:02:41 +02:00
cc9cii
aff6f6fdb2
Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.
2014-10-15 18:48:01 +11:00
cc9cii
1d0ac3b4df
Delete Ogre::OverlaySystem before Ogre::Root
2014-10-15 07:02:19 +11:00
Alexander "Ace" Olofsson
dc788512e2
Fix LNK2019 link error on Visual Studio 2010 builds
...
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
2014-10-14 16:10:19 +02:00
cc9cii
8cebfc411b
Minor visual improvements.
2014-10-14 17:34:10 +11:00
cc9cii
994420aa57
Singleton wrapper for Ogre OverlaySystem.
2014-10-14 13:21:43 +11:00
cc9cii
57b337d368
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
2014-10-14 11:43:56 +11:00
Marc Zinnschlag
6beee95151
Merge remote-tracking branch 'terrorfisch/aistate'
2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d
Merge remote-tracking branch 'internecine/master'
2014-10-13 19:11:14 +02:00
Marc Zinnschlag
e23a32c44f
some cleanup
2014-10-13 15:26:47 +02:00
Marc Zinnschlag
8062faa51a
fixed member variable access in OpenCS script compiler ( Fixes #2011 )
2014-10-13 15:25:27 +02:00
Marc Zinnschlag
02acf60c0b
added tooltips for scopes in creator bar
2014-10-13 14:24:27 +02:00
cc9cii
961867e39f
Hide overlay if off screen.
2014-10-13 20:58:07 +11:00
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-10-13 20:45:30 +11:00
Marc Zinnschlag
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277
Merge remote-tracking branch 'miroslavr/master'
2014-10-13 10:57:04 +02:00
cc9cii
43838ccf01
Remove override (c++11)
2014-10-13 16:42:50 +11:00
cc9cii
e58e5c2bf5
Update overlays independently from multiple viewports.
2014-10-13 15:57:01 +11:00
Thoronador
46496a35a1
fix uninitialized pointer variable in CSVDoc::SubView class
2014-10-12 23:42:44 +02:00
Thoronador
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
2014-10-12 23:28:16 +02:00
cc9cii
47c5bc9a19
Set bounding box on manual objects rather than creating meshes.
2014-10-13 07:42:43 +11:00
MiroslavR
8456741eaa
Fix blindness and create a separate fader for it
2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec
Don't remove player's sounds when unloading a cell
2014-10-12 18:35:15 +02:00
scrawl
d51daf5875
Fix AI not using F_Always spells, for example "vampire touch"
2014-10-12 17:18:27 +02:00
scrawl
9323f96211
Move terrainstorage to opencs_units_noqt
2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed
Make spells cast by scripts always succeed ( Fixes #1993 )
2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae
Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound'
...
Conflicts:
apps/openmw/mwworld/class.cpp
2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930
Fixes #1887 : Equipped items do not emit sounds
...
Corrected wrong return type of Class::getSound() method.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 13:38:41 +02:00
cc9cii
758ce0ed98
Various fixes as per feedback comments.
2014-10-12 21:15:50 +11:00
Lukasz Gromanowski
e1663de7cf
Fixes #1887 : Equipped items do not emit sounds
...
Added getSound() method to MWClass class and implementation
into Light class.
Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-12 11:40:14 +02:00
MiroslavR
ad253059b1
Hit indicator for absorb/damage health effect
2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e
Construct hit fader with correct texture right away to prevent mygui warning
2014-10-12 00:40:31 +02:00
MiroslavR
a5e972aeb5
Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode
2014-10-12 00:13:24 +02:00
Lukasz Gromanowski
b44ba84a80
Issue #1887 : Equipped items do not emit sounds
...
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 23:20:40 +02:00
MiroslavR
2162a9e1b9
Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available
2014-10-11 23:09:20 +02:00
Lukasz Gromanowski
1a0c3dc6cf
Issue #1887 : Equipped items do not emit sounds
...
Removed unused mUnequipping and mFirstEquip member variables.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c
Issue #1887 : Equipped items do not emit sounds
...
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 22:21:59 +02:00
MiroslavR
0ae604990e
Implement continuous damage indication ( Fixes #1970 )
2014-10-11 22:21:48 +02:00
MiroslavR
4dc613a04b
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a
Issue #1887 : Equipped items do not emit sounds
...
Played sound items are based on parts not inserted items.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-11 21:05:12 +02:00
cc9cii
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 05:54:21 +11:00
Marc Zinnschlag
3fd10d2a82
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498
remove unused var. mSoftwareCursor in WindowManager
2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce
Fix: initialize boolean field with boolean value, not NULL
2014-10-11 10:07:01 +04:00
Thoronador
8361019456
fix uninitialized (pointer) vars in more classes
2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c
fix uninitialized member variables in OcclusionQuery class
2014-10-11 01:35:12 +02:00
Thoronador
db38108801
fix uninitialized pointer variables in some classes
2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13
remove unused dummy variable
2014-10-11 00:56:57 +02:00
Thoronador
ab364c9440
fix some more uninitialized class member fields
2014-10-11 00:50:32 +02:00
Thoronador
51cd2bb5d9
remove unused/double variable from CSMWorld::Column class
2014-10-11 00:15:36 +02:00
Thoronador
a799353f60
fix uninitialized fields in CSMDoc::Operation class
2014-10-11 00:06:50 +02:00
Thoronador
deb6452e0d
fix uninitialized pointer fields in CS::Editor class
2014-10-10 23:57:10 +02:00
terrorfisch
c4badcea6e
removed warning
2014-10-10 23:51:29 +02:00
Thoronador
f0d3fc73d5
fix uninitialized pointer fields in GraphicsPage class
2014-10-10 23:47:27 +02:00
terrorfisch
c28dfc2fa4
Travis CI fix?
2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467
references now initialized when they are needed
2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601
-improved trigonometric precision
...
-cleanup
2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c
- changed namespace
2014-10-10 23:28:49 +02:00
Marc Zinnschlag
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
Marc Zinnschlag
23e969eae7
fixed pathgrid saving again (previous fix was incomplete)
2014-10-10 15:29:21 +02:00
Internecine
470d375177
Removed duplicate functions and moved pause check in weather.cpp
2014-10-10 23:29:51 +13:00
cc9cii
3e5027abbb
Incorporate terrain height to labels and camera.
2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0
User configuration manager's resource directory.
2014-10-10 13:35:14 +11:00
cc9cii
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
2014-10-09 23:47:30 +01:00
terrorfisch
db1b93498d
Added comment.
2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-09 19:17:39 +02:00
Marc Zinnschlag
c85735abed
Merge remote-tracking branch 'scrawl/terrain'
2014-10-09 12:56:42 +02:00
Internecine
782e851eb1
Better fix, now allows for teleporting to change weather while still paused.
2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96
removed unecessary PathFinders
2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8
Updated AiCombat:
...
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00
Addded the parts of AiWander that I fully understand to the temporary storage.
...
The rest should be done by someone who has a clearer overview over the class.
2014-10-08 22:11:45 +02:00
cc9cii
13f028e27b
Avoid out of range exceptions.
2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2
Different implementation of update overlay fix.
2014-10-09 05:56:44 +11:00
scrawl
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5
Update overlay upon control elements button signal.
2014-10-08 21:22:12 +11:00
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
cc9cii
e2560de05a
Don't use windows path separator.
2014-10-08 08:08:03 +11:00
cc9cii
4fd7537155
Use default sort until a more generic sort that uses numeric order can be implemented.
2014-10-08 07:59:21 +11:00
cc9cii
e1197e75bc
Handle change of names or regions to dynamically update the overlay.
2014-10-08 07:54:22 +11:00
sylar
70fd531722
None texturing filtering enable for android by default
2014-10-08 00:15:22 +04:00
sylar
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
2014-10-07 23:30:31 +04:00
Marc Zinnschlag
744c56943a
Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'
2014-10-07 18:03:25 +02:00
cc9cii
7836ee9ab6
Fixed crash exiting internal cells. Better starting camera position for external cells.
2014-10-07 21:18:32 +11:00
cc9cii
a161ad3cd5
Sort cell id column by numerical order.
2014-10-07 20:11:44 +11:00
cc9cii
0cccdfd114
Added description below the cell id (name if exists, or region)
2014-10-07 19:35:28 +11:00
Jordan Ayers
56db525a93
Document the return value of getEffectMultiplier.
2014-10-06 21:56:41 -05:00
cc9cii
7640875f9d
More cleanup.
2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31
Add full path for Ogre Overlay headers (workaround for osx).
2014-10-07 06:40:28 +11:00
cc9cii
0197f7088f
Remove extra frame rendering after enabling/disabling the label.
2014-10-07 06:04:13 +11:00
MiroslavR
d1dc9951d4
Do not display werewolf overlay in third person
2014-10-06 20:24:53 +02:00
MiroslavR
0e19c3fdeb
Silence werewolves' footstep sounds when they are running with their claws sheathed
2014-10-06 18:48:22 +02:00
MiroslavR
4086bc4848
Do not spawn blood vfx on player if hit fader is enabled
2014-10-06 18:33:41 +02:00
MiroslavR
b6abfb0145
Do not display hit fader if the player wasn't damaged
2014-10-06 18:31:02 +02:00
MiroslavR
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-06 18:24:41 +02:00
scrawl
8097d9801d
Fix HasSoulgem function to return number of soulgems
2014-10-06 14:56:49 +02:00
scrawl
9ab8d0a8e6
Hotfix for crash when deleting an actor
2014-10-06 14:56:49 +02:00
cc9cii
b3e09cce00
Remove mouse picking code.
2014-10-06 22:29:45 +11:00
cc9cii
972c789060
Add Ogre Overlay path to cmake.
2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e
Removed temporary key bindings.
2014-10-06 14:21:44 +11:00
Internecine
3dee4c2b0e
Fixes #1706
2014-10-06 16:10:58 +13:00
cc9cii
6d687993b8
Remove C++11 stuff.
2014-10-06 14:08:35 +11:00
cc9cii
e38417e662
Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
...
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.
2014-10-06 13:55:36 +11:00
Jordan Ayers
aac2de270e
Cleanup: Don't call <environment obj>.get().
...
mEnvironment.get() is redundant. Switch the call to resemble the
surrounding environment get() calls, instead.
2014-10-05 18:12:55 -05:00
Jordan Ayers
2f5721bf61
Fix typo in comments.
2014-10-05 18:12:33 -05:00
cc9cii
dbb2781817
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
2014-10-06 08:20:09 +11:00
scrawl
9cce3bc31b
Implement fDispositionMod according to research wiki
2014-10-05 23:03:30 +02:00
scrawl
39bc11681e
Fix broken onGround status when levitating
2014-10-05 22:59:24 +02:00
scrawl
829a7bfd1b
Fix being able to rest while water-walking ( Fixes #1712 )
2014-10-05 22:35:53 +02:00
scrawl
d9165593d9
Fix footstep sounds played during water-walking
2014-10-05 22:27:25 +02:00
scrawl
064f1964ba
More efficient water walking
2014-10-05 22:27:20 +02:00
MiroslavR
e1799cbcf4
Fix a typo in condition
2014-10-05 19:53:36 +02:00
scrawl
04614651fa
Fix recharging items not being updated for actor's initial inventory
2014-10-05 18:27:26 +02:00
MiroslavR
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
2014-10-05 17:53:50 +02:00
scrawl
d790506525
Fix projectiles colliding with dead actors ( Fixes #1971 )
2014-10-05 17:41:56 +02:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
fe4d74a6cb
Fix not being able to move with 0/0 encumbrance ( Fixes #1979 )
2014-10-05 15:52:33 +02:00
scrawl
5c3bc6563b
Fix divisions by zero in normalizedEncumbrance
2014-10-05 15:50:01 +02:00
scrawl
8dd410fe96
Teleport indirect followers as well when using a door ( Fixes #1974 )
2014-10-05 15:18:32 +02:00
Marc Zinnschlag
2d3ffc4483
fixed pathgrid saving
2014-10-05 15:12:12 +02:00
scrawl
ff11745429
Fix magic projectile sound disappearing after multiple save/load cycles
2014-10-05 14:47:23 +02:00
cc9cii
85d93807c5
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
2014-10-05 19:25:37 +11:00
Jordan Ayers
663647bee8
Simplify getEffectMultiplier.
...
Both return cases were same, except for some overflow conditions.
2014-10-04 15:28:58 -05:00
Lukasz Gromanowski
bcb38c3eba
Issue #1887 : Equipped items do not emit sounds
...
Added handling of autoEquip and unequipAll cases.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 22:27:23 +02:00
scrawl
20777c1b2e
Optimize physics shape scaling on cell load
2014-10-04 20:37:35 +02:00
scrawl
db6b04d127
Use the footstep volume slider for jump landing sounds ( Fixes #1968 )
2014-10-04 19:50:38 +02:00
scrawl
95378aa6ac
Fix crash when a magic projectile has no sound defined ( Fixes #1967 )
2014-10-04 18:37:35 +02:00
Lukasz Gromanowski
e566e4abf2
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-04 16:47:29 +02:00
Marc Zinnschlag
be3b229a5f
fixed pathgrid loading
2014-10-04 15:36:52 +02:00
Lukasz Gromanowski
6a89b67cb1
Revert "Issue #1887 : Equipped items do not emit sounds"
...
This reverts commit 566211e753
2014-10-04 13:34:36 +02:00
Marc Zinnschlag
cd7cc4bec9
Merge remote-tracking branch 'miroslavr/master'
2014-10-04 09:46:29 +02:00
Lukasz Gromanowski
566211e753
Issue #1887 : Equipped items do not emit sounds
...
Added playing of sounds for equipped items (at this moment only for lights).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-10-03 22:39:05 +02:00
MiroslavR
95be7ea738
Revert spelling change to preserve consistency, fix a typo
2014-10-03 22:38:06 +02:00
MiroslavR
4829b1f9cc
Support "right" alignment in books
2014-10-03 22:30:46 +02:00
cc9cii
c9e054cdd7
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9
2014-10-04 06:20:10 +10:00
cc9cii
3aea1bf5f9
CMake changes for using Ogre Overlay.
2014-10-04 05:48:56 +10:00
MiroslavR
a13039ad1f
Allow alignment for images in books
2014-10-03 21:36:45 +02:00
MiroslavR
3287d0b6ef
Fix line breaks around IMG tags.
2014-10-03 21:08:52 +02:00
MiroslavR
c5e85ebddc
Merge branch 'master' of github.com:OpenMW/openmw
2014-10-03 21:02:15 +02:00
scrawl
cecc64752e
Increase maximum height for finding spawn points ( Fixes #1633 , Fixes #1881 )
2014-10-03 18:51:18 +02:00
scrawl
d4ac5c0b57
Use a raycast to find spawn point if convexSweepTest doesn't find one ( Fixes #1623 , Fixes #1679 )
2014-10-03 18:49:41 +02:00
scrawl
6fc53e73ad
Don't run AI for knocked-out actors ( Fixes #1854 )
2014-10-03 15:58:14 +02:00
Marc Zinnschlag
9fd82212b3
Merge remote-tracking branch 'cc9cii/opencs-settings'
2014-10-03 13:11:05 +02:00
scrawl
81a9dc0655
Hotfix for not being able to scroll the world map
2014-10-02 22:44:06 +02:00
cc9cii
115841d31d
Do not save window size on exit.
2014-10-03 05:59:24 +10:00
scrawl
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
2014-10-02 19:26:37 +02:00
scrawl
8dc20712de
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
Marc Zinnschlag
a166034e12
Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'
2014-10-02 17:19:32 +02:00
Marc Zinnschlag
f64964d5dd
Merge remote-tracking branch 'scrawl/master'
2014-10-02 17:04:10 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd
Merge branch 'master' into tables
2014-10-02 15:49:36 +02:00
Marc Zinnschlag
00073694c6
added pathgrid subview
2014-10-02 15:16:19 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
afbd2de511
Fix broken alchemy magnitude/duration
2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67
Remove comment for old MyGUI version
2014-10-02 13:55:42 +02:00
Marc Zinnschlag
d64127106b
load and save pathgrid records
2014-10-02 12:30:15 +02:00
Marc Zinnschlag
ce52735df6
Merge remote-tracking branch 'cc9cii/Bug-No-1750'
2014-10-02 08:43:59 +02:00
Jordan Ayers
3bc91c66e6
Disease Check: Shorten the resistance calculations.
2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85
Disease check: Reuse corprus check from spells.hpp.
2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9
Don't update physics and animation for actors outside the AI processing distance
2014-10-02 00:27:04 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
cc9cii
517a797a3e
Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.
2014-10-02 07:00:15 +10:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
cc9cii
5ffb740120
Fix silly mistake (thanks scrawl for picking that up)
2014-10-01 07:19:15 +10:00
scrawl
ee8b85aa2c
Fix priority bug in AiSequence::stack ( Fixes #1959 )
2014-09-30 22:57:38 +02:00
scrawl
795dfdb557
Fix size_t underflow for journals with 1 page ( Fixes #1958 )
2014-09-30 18:14:25 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
Marc Zinnschlag
850a40d4e2
fixed resources table drag source problem
2014-09-30 13:15:15 +02:00
cc9cii
a9745cce1e
Suppress some compiler warnings.
2014-09-30 21:02:31 +10:00
Marc Zinnschlag
ff530a2e19
added missing magic effect table columns
2014-09-30 12:33:48 +02:00
cc9cii
dee090355f
Changes to compile on Ubuntu 14.04.
2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3
Revert some changes (mostly iostream adds)
2014-09-30 18:46:26 +10:00
Jordan Ayers
da9d858201
Add 'const' to a spell helper function.
2014-09-29 20:59:10 -05:00
cc9cii
312b7cd571
Merge branch 'master' into QtOGre
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
3e153d0a9b
Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2
2014-09-29 22:30:21 +02:00
scrawl
b345c50a86
Run stepSimulation before moving actors
...
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d
Forgot const
2014-09-29 12:04:19 +02:00
cc9cii
7675df60ba
Fix far clip distance (again), workaround for broken settings minimum value.
2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875
Silence clang warnings.
2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763
Apply camera setting changes immediately. Remove current value check for shader setting changes.
2014-09-29 06:27:54 +10:00
scrawl
bdab3fa321
Bullet optimization: Don't update AABBs of static objects every frame
2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85
Disable topics list visually when in a choice
2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9
Attempt to fix Clang warnings
2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
2014-09-28 12:18:46 +02:00
cc9cii
6e8977348a
Check the FSAA setting of windows rather than system value.
2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6
Update scenewidget when antialiasing settings change.
2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22
Update SceneWidget when relevant user settings change.
2014-09-28 14:08:14 +10:00
cc9cii
9902e08773
Apply sh::Factory settings immediately.
2014-09-28 11:05:27 +10:00
cc9cii
a25cffc242
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
2014-09-28 10:17:54 +10:00
scrawl
02dec787fd
Cache GMSTs in getDerivedDisposition
2014-09-27 22:44:20 +02:00
scrawl
ea956b537c
Don't search for fFatigueReturnBase and fFatigueReturnMult every frame
2014-09-27 22:37:53 +02:00
MiroslavR
508113f271
Resolve merge conflict
2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5
Book formatter: Fix an excessive line break case
2014-09-27 17:35:57 +02:00
cc9cii
d790b8edfa
Revert old fix.
2014-09-27 23:39:22 +10:00
cc9cii
a2d043f43a
Re-check unknown record id after loading.
2014-09-27 23:36:27 +10:00
MiroslavR
cb5f661596
Book formatter: Support FONT closing tag, minor code cleanup
2014-09-27 13:31:59 +02:00
Marc Zinnschlag
e47f9c7268
added first batch of magic effect columns (re-using existing columns)
2014-09-27 12:51:46 +02:00
Marc Zinnschlag
aa89370db6
make sure magic effects added by expansions are available
2014-09-27 12:38:42 +02:00
Marc Zinnschlag
25a1112627
add magic effect records for newly created games
2014-09-27 12:26:25 +02:00
cc9cii
810ba61909
While loading overwrite records with the same id. Should resolve bug #1750 .
2014-09-27 17:46:48 +10:00
scrawl
e868a48a63
Don't trigger OnPcHitMe for friendly hits ( Fixes #1950 )
...
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
18be152ab1
Allow dragging map even when a marker is hovered
2014-09-26 14:27:52 +02:00
scrawl
603e558fb7
Fix broken getCollidingPc / getCollidingActor (cppcheck)
2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
2014-09-26 13:40:10 +02:00
Marc Zinnschlag
23fd314294
added magic effects table
2014-09-26 13:12:17 +02:00
Marc Zinnschlag
c321f2c252
load and save magic effect records
2014-09-26 13:05:51 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
cc9cii
8e71f092c5
Comment out setMinimum which is broken.
2014-09-26 12:36:55 +10:00
cc9cii
a1c0ec2feb
Repair collateral damage from a purging session gone out of control.
2014-09-26 11:26:33 +10:00
cc9cii
111a35bc38
More strip back.
2014-09-26 07:16:34 +10:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
f56711f443
Fix crash caused by teleportation spells ( Fixes #1904 )
2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208
Revert "AiFollow: return from execute() if target is not player"
...
This reverts commit 061c7813f6Fixes #1898 .
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59
Don't report crime for attacking an NPC that is already in combat with another NPC ( Fixes #1908 , Fixes #1821 )
2014-09-25 17:33:26 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
scrawl
2066097202
Fix incorrect reading of global map state in some cases when the map size changed ( Fixes #1946 )
2014-09-25 15:28:02 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
Marc Zinnschlag
33cd04b37d
added missing sound gen table columns
2014-09-25 11:40:45 +02:00
cc9cii
d5c8ff7d73
More removal.
2014-09-25 18:15:34 +10:00
cc9cii
127f9bb30d
Fix reverting to wrong version.
2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1
Sanitised version. Some settings are only accessible via manually editing the config file.
2014-09-25 08:15:07 +10:00
scrawl
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
2014-09-25 00:04:38 +02:00
scrawl
62ab35881e
Don't advance skills in werewolf mode (thanks Hrnchamd)
2014-09-25 00:03:55 +02:00
scrawl
088d01d727
Minor cleanup
2014-09-24 23:50:28 +02:00
cc9cii
31fb160376
More cleanup.
2014-09-25 06:59:04 +10:00
cc9cii
66852d5392
Code cleanup and revert incorrect settings.
2014-09-24 22:41:49 +10:00
scrawl
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78
Add missing World cleanup for mLevitationEnabled
2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
2014-09-24 12:21:19 +02:00
scrawl
45b4304237
Store levitation/teleport enabled state in savegames ( Fixes #1923 )
2014-09-24 12:21:19 +02:00
cc9cii
fdf375fb4d
Reusing subviews implemented.
2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b
Minor fixes and workarounds.
2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
2014-09-23 22:33:49 +10:00
Marc Zinnschlag
175d4f3d44
Merge remote-tracking branch 'ragora/playdeathlevelupmusic'
2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
2014-09-23 13:23:00 +02:00
Marc Zinnschlag
7ab4881661
added sound gen table
2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5
Tweak the look of the recordfilterbox. Keep titlebar if floating.
2014-09-23 20:51:14 +10:00
Marc Zinnschlag
02247fe712
load and save sound gen records
2014-09-23 12:20:02 +02:00
Ragora
06e683d378
Added code to play music on level up and on death
2014-09-23 04:58:19 -04:00
cc9cii
ffae816aab
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
2014-09-23 17:01:08 +10:00
cc9cii
62406d5322
Use reasonable values for the spinbox.
2014-09-23 07:28:55 +10:00
MiroslavR
22c71cec18
Check for text size
2014-09-22 23:17:44 +02:00
cc9cii
437fb774c5
Re-implemented subview minimum size setting.
2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
2014-09-23 06:30:41 +10:00
MiroslavR
608e1518a5
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce
Book formatter: Do not insert last page if it's empty, code cleanup
2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba
Book parser: Fix comparison between signed and unsigned integer expressions
2014-09-22 16:28:17 +02:00
cc9cii
c4f11785ec
Added a window size change easter egg.
2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d
Fixed checkboxes saving invalid values.
2014-09-22 18:50:48 +10:00
Marc Zinnschlag
aa7fc8ee47
fix for potential script problem during saved game loading
2014-09-22 10:12:07 +02:00
Marc Zinnschlag
5c8ef842b6
Merge branch 'edit'
2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e
minor fix
2014-09-22 09:53:07 +02:00
cc9cii
fc8d6da6a2
Added more shader settings.
2014-09-22 16:24:06 +10:00
cc9cii
71a3880884
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192
Fixed checkbox behaviour. Added some shader settings.
2014-09-22 07:50:35 +10:00
MiroslavR
51cd2678ae
Book formatter: Fix last block of text not displaying
2014-09-21 22:25:54 +02:00
Lukasz Gromanowski
c72369fafe
Simplified casting when comparing to AV_NOPTS_VALUE.
...
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 20:11:03 +02:00
MiroslavR
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
7ad6a94523
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:13:54 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
cc9cii
17a74da650
Cleaned up comments and dead code.
2014-09-21 21:10:18 +10:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
cc9cii
dbd1ab05d3
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
2014-09-21 20:55:52 +10:00
Marc Zinnschlag
e4b6f135b6
catch exceptions from adding local scripts
2014-09-21 12:43:19 +02:00
Marc Zinnschlag
89beecad8c
Merge remote-tracking branch 'scrawl/master'
2014-09-21 12:24:53 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
Lukasz Gromanowski
6987dd768a
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 09:52:31 +02:00
scrawl
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
Marc Zinnschlag
cf5c5cbce7
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
2014-09-20 14:13:42 +02:00
Marc Zinnschlag
9d316a8745
Merge branch 'records'
2014-09-20 13:59:45 +02:00
scrawl
023d7072f9
Don't play battle music for enemies out of AI processing range
2014-09-20 13:55:57 +02:00
scrawl
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
2014-09-20 13:50:23 +02:00
Marc Zinnschlag
8499ceb35d
set default value for topic when cloning info records
2014-09-20 13:30:36 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
Marc Zinnschlag
8ce87803c4
set default value for cell when cloning references
2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
2014-09-20 12:37:25 +02:00
Nikolay Kasyanov
9f7a8462d8
Fix build & OpenCS game runner code on OS X
2014-09-20 13:42:11 +04:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
Marc Zinnschlag
7733df239e
made CloneCommand a subclass of CreateCommand
2014-09-20 10:36:43 +02:00
scrawl
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2
Remove redundant includes
2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d
Merge remote-tracking branch 'scrawl/fontcolors'
2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
ab9d9c7001
Add magic effect flags from ESM files to esmtool
2014-09-19 08:09:40 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
cc9cii
5dfcd2ed01
Removed standard window size combobox. Rearranged widgets.
2014-09-19 08:29:06 +10:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
cc9cii
52354b14fc
Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.
2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f
fixed reference creator error handling
2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea
set refnum and increment refnum counter when creating a new reference
2014-09-18 12:25:17 +02:00
Marc Zinnschlag
33243c8c16
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
2014-09-18 11:37:23 +02:00
Marc Zinnschlag
144f6ca79a
Merge remote-tracking branch 'scrawl/master'
2014-09-18 09:22:33 +02:00
cc9cii
575780ec0d
Display format settings working.
2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299
Show status bar setting working (feature #854 ). Turns out signals were not needed, may need to clean up later.
2014-09-18 16:05:32 +10:00
Stanislav
313bdf4e78
fix
2014-09-18 10:25:33 +06:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
c19f89976e
Add missing Hit voice dialogue for friendly hits
2014-09-18 05:13:17 +02:00
scrawl
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
2014-09-18 04:26:12 +02:00
cc9cii
86636bd960
Mouse events to disabled objects implemented via a signal filter.
2014-09-18 12:23:41 +10:00
scrawl
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
2014-09-18 04:10:17 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
cc9cii
62d2811285
Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.
2014-09-18 07:52:54 +10:00
scrawl
09042ba6d9
Use object name instead of ID when available for tooltips
2014-09-17 13:03:12 +02:00
U-NSFW-50TH\cc9c
ca80a2b856
Merge remote-tracking branch 'upstream/master' into opencs-settings
2014-09-17 21:00:22 +10:00
scrawl
2eaceb71ba
Reject AiTravel destinations further than 7168 units away, as in vanilla MW ( Fixes #1911 )
2014-09-17 12:39:10 +02:00
Marc Zinnschlag
41275b0af3
Merge remote-tracking branch 'cc9cii/Bug-No-1869'
2014-09-17 09:20:59 +02:00
Marc Zinnschlag
b9973c4515
Merge remote-tracking branch 'scrawl/master'
2014-09-17 09:18:36 +02:00
cc9cii
9dc4af69c6
Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.
2014-09-17 17:13:21 +10:00
scrawl
441073b475
Remove ancient comment
2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6
Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep
2014-09-17 07:02:19 +02:00
scrawl
269c200c8f
Fix jump velocity mechanics ( Fixes #1708 )
2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845
Fix idlestorm animation conflict with torch animation
2014-09-17 07:02:19 +02:00
scrawl
4c285151a3
Fix incorrect movement animation for some creatures ( Fixes #1924 )
2014-09-17 07:02:10 +02:00
Stanislav
ebb223b2d3
Feature #1226 : fixes
2014-09-17 09:03:02 +06:00
cc9cii
cb15750e40
Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.
2014-09-17 06:29:11 +10:00
cc9cii
e3da37567b
Cleaned up and got some signals going.
2014-09-17 06:11:41 +10:00
Marc Zinnschlag
70275350de
rewrote command generation in GenericCreator
2014-09-16 13:28:11 +02:00
Marc Zinnschlag
b31c4e2bcd
Merge remote-tracking branch 'cc9cii/Bug-No-1301'
2014-09-16 12:52:12 +02:00
Marc Zinnschlag
90b45e09f7
added refnum column to references tables
2014-09-16 12:48:10 +02:00
Marc Zinnschlag
f5483e76cf
added refnum counter column to cells table
2014-09-16 12:30:17 +02:00
cc9cii
d679e0e012
Made more progress. Grey out disabled settings.
2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875
GUI added, but not yet functional.
2014-09-16 07:44:07 +10:00
Stanislav
8574d2330c
Feature #1226 : Request UniversalId editing from table column
2014-09-16 00:00:34 +06:00
Marc Zinnschlag
71c868aa94
Merge remote-tracking branch 'scrawl/master'
2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
cc9cii
ecb4154ac0
Fixed default settings logic and cleaned up comments.
2014-09-15 19:33:38 +10:00
scrawl
0c75c6bf1b
Improve spellcasting AI for Drain/Damage effects
2014-09-15 10:42:51 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
Marc Zinnschlag
3d8216ee17
fixed broken content file list in case of newly created addons
2014-09-15 09:51:39 +02:00
cc9cii
e4b836608c
Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows.
2014-09-15 06:08:56 +10:00
cc9cii
0ec20b23aa
Initial working version. Video/rendering options supported. No GUI yet.
2014-09-15 06:08:55 +10:00
Marc Zinnschlag
19f469c7db
Merge remote-tracking branch 'scrawl/master'
2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009
allow project scope scripts
2014-09-14 11:41:28 +02:00
Marc Zinnschlag
89000f6196
removed unused OmwLoader
2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
002b41ba51
Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)
2014-09-14 08:38:54 +02:00
scrawl
4b27950879
Don't apply race height to NPC collision shape ( Fixes #1487 )
2014-09-14 07:04:02 +02:00
scrawl
bd96764229
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
2014-09-14 03:54:50 +02:00
Ragora
b8851790a6
Covered forgotten old bound item checks
2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
2014-09-13 18:48:41 -04:00
scrawl
4426b03fa4
Remove some garbage
2014-09-13 22:21:37 +02:00
scrawl
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
scrawl
a42e60970b
Revert "delete death events on adding an actor to the scene"
...
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.
This reverts commit fd2c07a6f4
2014-09-13 20:57:25 +02:00
scrawl
8625764143
Give 100% of health back when Resurrecting an actor ( Fixes #1877 )
2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484
add project file to content file list when running OpenMW from OpenCS
2014-09-13 20:48:24 +02:00
Marc Zinnschlag
10fa205ced
fixed --data switch (was missing composing option)
2014-09-13 20:41:57 +02:00
scrawl
319f4e0547
Bind to scancodes instead of keycodes
2014-09-13 20:39:59 +02:00
scrawl
dc1e8d4e22
Don't trigger any mouse button bindings while in the settings menu
2014-09-13 20:39:59 +02:00
scrawl
04c79d5f1e
Fix case issue when setting companion's profit on the script
2014-09-13 20:39:59 +02:00
scrawl
e54ba2c5d1
Fix broken dialogue Function_HealthPercent
2014-09-13 20:39:58 +02:00
Marc Zinnschlag
d4007ad89e
Merge remote-tracking branch 'mellotanica/master'
2014-09-13 18:56:15 +02:00
Marc Zinnschlag
1254198d90
add debug profiles to scene subviews view drag and drop
2014-09-13 18:54:29 +02:00
Marc Zinnschlag
3ed2edb7cb
rewrote run tool profile management
2014-09-13 18:53:35 +02:00
Marc Zinnschlag
882ef37ae3
Merge remote-tracking branch 'ragora/conjureditemsgmstcheck'
2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3
Merge remote-tracking branch 'ragora/fixmapresize'
2014-09-13 15:52:36 +02:00
scrawl
f82224497a
Compatibility fix for MyGUI git
2014-09-13 08:00:24 +02:00
scrawl
2c58a879ec
Fix minor exploit when map window is shown with transparency
2014-09-13 07:59:29 +02:00
scrawl
2b5adb325b
Remove a useless method
2014-09-13 07:57:15 +02:00
scrawl
cfc57d0fe0
Use MyGUI's castType for widget casts
2014-09-13 04:07:40 +02:00
MiroslavR
4fdef94034
Use player's base name for profiles
2014-09-13 02:58:01 +02:00
MiroslavR
23e6d52844
Fix UI not updating initially for zero stats
2014-09-13 02:56:06 +02:00
Ragora
282e7abd16
Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is
2014-09-12 18:26:38 -04:00
Ragora
35571bb108
Global compass arrow rotates regardless of indoor or outdoor presence
2014-09-12 17:31:37 -04:00
Ragora
25f99c5d5a
Discarded use of a static variable and renamed event function to be less ambiguous
2014-09-12 15:06:37 -04:00
Marco Melletti
f212f0e4d2
subviews now get destroyed on close
2014-09-12 16:45:21 +02:00
Marc Zinnschlag
70ee899691
Merge remote-tracking branch 'cc9cii/Bug-No-1725'
...
Conflicts:
apps/opencs/model/tools/bodypartcheck.cpp
2014-09-12 14:37:26 +02:00
Marc Zinnschlag
b8fdccdbff
Merge remote-tracking branch 'cc9cii/Bug-No-1864'
2014-09-12 14:33:17 +02:00
Marc Zinnschlag
560eae3f4d
Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix'
2014-09-12 14:22:24 +02:00
cc9cii
1107156334
Workaround incorrectly reported channel_layout
2014-09-12 21:18:54 +10:00
Ragora
58d70c2895
Removed Unused includes from experimentation
2014-09-12 05:20:03 -04:00
Ragora
4ecac31752
Map keeps focus on wherever it was last moved when resizing map window
2014-09-12 05:16:33 -04:00
scrawl
c6bcd75058
Add various custom widgets used in OpenMW to the MyGUI plugin
2014-09-12 05:14:21 +02:00
Ragora
e105202ee2
Use std::set instead of std::map
2014-09-11 22:45:30 -04:00
scrawl
ee3b1e800c
Add FontLoader and transparent BG texture to the MyGUI plugin
2014-09-12 04:27:23 +02:00
cc9cii
675d11c0e5
Mental note: need to get a linux box
2014-09-12 11:25:11 +10:00
cc9cii
8fe6877cb2
More include madness b/w different systems & compilers
2014-09-12 11:05:02 +10:00
cc9cii
de41dfc314
Add includes.
2014-09-12 10:52:10 +10:00
Ragora
f9e2fd0f3d
Also forgot to remove a now unused variable I introduced
2014-09-11 20:47:14 -04:00
Ragora
efaa820ee2
Managed to forget the itemmodel.cpp code
2014-09-11 20:46:21 -04:00
Ragora
ea43a23505
All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map
2014-09-11 20:45:22 -04:00
cc9cii
0121fdca2c
Don't use C99 in printf.
2014-09-12 10:31:49 +10:00
cc9cii
be74db8b24
Don't use to_string()
2014-09-12 10:04:46 +10:00
Ragora
83868bca23
Removed unused include left over from experimentation
2014-09-11 19:37:00 -04:00
Ragora
ee6298f520
Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best
2014-09-11 19:33:45 -04:00
cc9cii
ecd9dd81ea
Moved debug statements before exception..
2014-09-12 08:41:33 +10:00
cc9cii
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
2014-09-12 08:27:25 +10:00
Marc Zinnschlag
b29d1d452f
removed some redundant checks
2014-09-11 14:19:18 +02:00
Marc Zinnschlag
5dd424b6c6
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-11 14:14:02 +02:00
cc9cii
48a36442c6
Add libswresample and libavresample support for sounds.
2014-09-11 21:15:18 +10:00
Marc Zinnschlag
717c1b15f5
fixed drop implementation for unpaged worldspace (wasn't updating cell object)
2014-09-11 13:08:30 +02:00
Marc Zinnschlag
0db288ce07
generalising and cleaning up drop implementation of worldspace widget
2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b
some cleanup of the scene view drop code
2014-09-11 11:27:56 +02:00
Marc Zinnschlag
b5d5eadf79
Merge remote-tracking branch 'scrawl/master'
2014-09-11 09:01:21 +02:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
Ragora
74e1db3ac8
Minor Correction to existing conjured item logic
2014-09-11 01:00:39 -04:00
scrawl
f3d4b63aaf
Fix AI moving load doors and throw an exception when trying to do this ( Fixes #1907 )
2014-09-11 05:53:56 +02:00
Ragora
69dbd6b30f
Added checks for different bound item situations
2014-09-10 23:38:38 -04:00
scrawl
36a90198e2
Add option to change screenshot image format
2014-09-11 04:32:31 +02:00
Ragora
141755b473
Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them
2014-09-10 21:34:17 -04:00
scrawl
7fa3100993
Refactor TradeWindow balance buttons to use ControllerRepeatClick
2014-09-11 00:25:09 +02:00
cc9cii
88cf2bd597
Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected.
2014-09-11 07:27:48 +10:00
scrawl
ebab911e44
Add a hack to support binding the console to a printable key ( Fixes #371 ) and change default console key to morrowind default (GRAVE)
2014-09-10 18:13:39 +02:00
scrawl
cf355d0fcb
Change Always Run key default to Caps Lock, as in vanilla
...
A poor choice, but it's still what players coming from vanilla MW will expect.
2014-09-10 18:09:05 +02:00
cc9cii
faac91472c
Allow '-' and '_' in new addon name. Resolves Bug #1789 .
2014-09-10 23:30:42 +10:00
cc9cii
85596322f3
Update status bar when record filter is changed. Should resolve Bug #1290 .
2014-09-10 23:13:56 +10:00
cc9cii
ae0fb77e30
Move recordfilterbox label 2 pixels to right. Resolves Bug #1839 .
2014-09-10 21:23:38 +10:00
cc9cii
227eb12295
Added document name to showModifiedDocumentMessageBox.
2014-09-10 20:29:47 +10:00
cc9cii
f7c1b169b3
Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838 .
2014-09-10 20:00:07 +10:00
cc9cii
89f7608022
Refactor for better legibility.
2014-09-10 14:40:41 +10:00
cc9cii
77171b788b
Made popup messagebox non-modal.
2014-09-10 14:03:25 +10:00
MiroslavR
d64be1c092
Use CellId::mWorldspace to find out whether objects are in the same worldspace
2014-09-10 02:49:57 +02:00
MiroslavR
621e81fa7d
Make getdistance return maximum value only if the given objects are in different worldspaces ( Fixes #1895 )
2014-09-10 01:40:33 +02:00
cc9cii
f0e0494f03
Since commit 8bce460f34 negative value checks no longer make sense. Not sure what to do about Vampire flag, however.
2014-09-10 08:13:10 +10:00
cc9cii
3a5ed9c5bb
Build objects and connections only once.
2014-09-10 07:14:01 +10:00
scrawl
616148e168
Fix "failed to open file" error when no startup script is given
2014-09-09 18:28:49 +02:00
MiroslavR
45c90bdcb5
Call getPtrViaHandle instead of searchPtrViaHandle for faced handle
2014-09-09 18:10:34 +02:00
MiroslavR
7e6e248511
Don't cache faced handle, as its context may have been changed during the frame by input events
2014-09-09 17:50:56 +02:00
MiroslavR
86c286c24e
Fix werewolf globals
2014-09-09 15:12:42 +02:00
cc9cii
fdc20c595d
Fix gcc compile error.
2014-09-09 21:24:54 +10:00
cc9cii
4471fe771e
Fix logic errors.
2014-09-09 21:09:37 +10:00
scrawl
dd5f4947d7
Add a TODO comment
2014-09-09 05:05:20 +02:00
cc9cii
84f5784575
Remove document when closing the last view. Should resolve Bug #1292 .
2014-09-09 13:04:48 +10:00
scrawl
56cd0da522
Fix potential infinite recursion when an area effect spell is reflected ( Fixes #1896 )
2014-09-09 04:44:14 +02:00
MiroslavR
5ac2788a15
Feature #1545 : Allow to select the player in the console
2014-09-09 04:36:17 +02:00
MiroslavR
21eb25706c
Don't pursue the player for their crimes when they are a werewolf
2014-09-09 04:15:54 +02:00
scrawl
cb916594d9
Always show tooltips for dead actors
2014-09-09 02:12:44 +02:00
cc9cii
ad8d722763
Close documents rather than views.
2014-09-09 10:05:06 +10:00
scrawl
d2ef0d362c
Implement vanilla distance threshold for AI processing (Bug #1876 )
2014-09-09 01:52:48 +02:00
scrawl
f18d4b4ac4
Don't show crosshair tooltips for actors in combat
2014-09-09 00:47:26 +02:00
scrawl
780a48cd1e
Don't greet dead actors in AiWander
2014-09-09 00:43:12 +02:00
scrawl
c54ab2e846
Don't allow talking to creatures that are in combat
2014-09-09 00:39:38 +02:00
scrawl
a9847c9453
Fix creature attacking flag not being reset after the attack starts ( Fixes #1889 )
2014-09-09 00:27:25 +02:00
scrawl
457b96a8af
Reset bounty and crime immediately when going to jail ( Fixes #1892 )
2014-09-09 00:00:55 +02:00
scrawl
628600a0a5
Make PlaceItem place the item in the player's current worldspace
2014-09-08 23:57:16 +02:00
cc9cii
5675626482
Cleanup signals when finished.
2014-09-09 07:24:18 +10:00
scrawl
3007af44ea
Revert "Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )"
...
This reverts commit 0c67ff9ed0
2014-09-08 20:52:15 +02:00
Marc Zinnschlag
77e9ac8975
Merge remote-tracking branch 'cc9cii/Bug-No-1710'
2014-09-08 16:38:25 +02:00
scrawl
6b06ab23aa
Don't play sound for torches with OffDefault flag ( Fixes #1884 )
2014-09-08 15:31:47 +02:00
scrawl
8b0cb239a9
Ignore text keys for zero-length animations ( Fixes #1876 )
...
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
2014-09-08 15:23:35 +02:00
scrawl
07d827c907
Ignore invalid input in numeric EditBox ( Fixes #1885 )
2014-09-08 15:22:33 +02:00
cc9cii
724ed807c8
Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable.
2014-09-08 23:14:04 +10:00
cc9cii
988c8f9ebe
Ignore duplicate connections.
2014-09-08 16:18:31 +10:00
cc9cii
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
2014-09-08 15:24:39 +10:00
scrawl
fe0c9ec9b7
Change priorities in World::searchPtr
...
Fixes performance bottleneck of scripts searching through all Containers in all active cells every frame. Can be observed near cell (2,-6)
2014-09-07 19:09:23 +02:00
scrawl
adbc50366b
Use random attack strength for creatures (Bug #1876 )
...
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.
This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
2014-09-07 18:55:59 +02:00
scrawl
b6635c7964
Move eventDone out of WindowBase
2014-09-07 18:55:59 +02:00
scrawl
271c921cf8
Add missing confirmation dialog for deleting map notes
2014-09-07 18:55:59 +02:00
scrawl
6e2673daf3
Remove an unneeded include
2014-09-07 18:55:59 +02:00
scrawl
d6bc50c492
Remove an unused member variable
2014-09-07 18:55:59 +02:00
scrawl
f59c7fcb36
Fix esmtool FactionId output
2014-09-07 18:55:59 +02:00
scrawl
31b31115af
Fix AI not using Restore Health effect when it is complemented by unnecessary restore magicka/fatigue effects (e.g. in sc_purityofbody)
2014-09-07 18:55:59 +02:00
scrawl
0c67ff9ed0
Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )
2014-09-07 18:55:59 +02:00
Marc Zinnschlag
3f24593dba
added profile selection panel
2014-09-07 14:40:50 +02:00
Marc Zinnschlag
4337d05126
added right-click handling support to SceneTool class
2014-09-07 13:35:30 +02:00
cc9cii
f616000afb
More fix based on code review.
2014-09-07 21:17:34 +10:00
Marc Zinnschlag
f913d51e35
remove deleted debug profiles from run tool
2014-09-07 12:55:52 +02:00
MiroslavR
b574131b06
Unset selected spell after selecting enchanted item in the spell window ( Fixes #1878 )
2014-09-07 12:42:11 +02:00
cc9cii
c396149f23
Code review fix.
2014-09-07 20:35:32 +10:00
cc9cii
cedf1171e3
Cleanup comments.
2014-09-07 18:37:33 +10:00
cc9cii
dba352fd6f
Check all views before exiting.
2014-09-07 18:35:50 +10:00
Marc Zinnschlag
16aa55dcde
Merge remote-tracking branch 'miroslavr/master'
2014-09-07 10:22:07 +02:00
Marc Zinnschlag
d4c27d4ce0
Merge remote-tracking branch 'mellotanica/master'
2014-09-07 10:10:54 +02:00
cc9cii
4a8fe39b2c
For bug #1710 . Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type.
2014-09-07 06:29:09 +10:00
MiroslavR
931e778b4d
Initialize mHasMovedInXY in CharacterController
2014-09-06 21:31:48 +02:00
Rohit Nirmal
e315a72582
Remove extra semicolons at the end of some lines.
2014-09-06 13:04:52 -05:00
Marc Zinnschlag
51128d2d57
added run button to scene subview toolbar
2014-09-06 16:11:06 +02:00
MiroslavR
007404e17f
Merge branch 'master' of github.com:OpenMW/openmw
2014-09-06 14:54:59 +02:00
cc9cii
c78ac391a0
Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour.
...
Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.
2014-09-06 20:24:34 +10:00
Marc Zinnschlag
64cf0870c6
set content files when running OpenMW from OpenCS
2014-09-06 12:24:09 +02:00
Marc Zinnschlag
e5dac5e80b
Merge remote-tracking branch 'cc9cii/Bug-No-1735'
2014-09-06 10:12:30 +02:00
MiroslavR
b1a449a0b9
Fix wolfrun sound playing all the time when running is default
2014-09-06 05:52:47 +02:00
MiroslavR
57f7ef1db4
GUI: update/clear force-hidden window status
2014-09-06 03:13:35 +02:00
MiroslavR
c1cc66985d
Werewolf: only NPCs should have modified fight and react to your transformation
2014-09-06 03:09:11 +02:00
cc9cii
ab8403192c
Fix typo.
2014-09-06 08:00:48 +10:00
scrawl
f274d5a627
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-09-05 17:18:36 +02:00
scrawl
282c93ccc5
Handle death in actor update rather than instantly ( Fixes #1866 )
2014-09-05 17:17:45 +02:00
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
2014-09-05 22:36:33 +10:00
Marc Zinnschlag
cf05d3c69f
added run log
2014-09-05 13:49:34 +02:00
cc9cii
fa0b3eb298
Add an icon to opencs.exe as well
2014-09-05 20:30:50 +10:00
Marc Zinnschlag
5e022195b8
create startup script when running from OpenCS
2014-09-05 11:40:01 +02:00
Marc Zinnschlag
61a92da374
use --new-game/--skip-menu switches when running from OpenCS
2014-09-05 11:03:16 +02:00
Marc Zinnschlag
86995adc4a
Merge remote-tracking branch 'cc9cii/Bug-No-1655'
2014-09-05 09:00:12 +02:00
MiroslavR
9e0d5dc28a
Werewolf: can't sleep in beds anymore, actors will attack you on sight, and if you are seen transforming, you will be marked for death
2014-09-05 01:58:57 +02:00
cc9cii
e0e561a105
Add icon to windows exe
2014-09-05 07:17:31 +10:00
Marc Zinnschlag
a728d6d77a
full implementation of global run menu item (replaces earlier placeholder implementation)
2014-09-04 17:45:43 +02:00
cc9cii
7ae8d04c47
Arrgh... silly typo
2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
2014-09-04 18:55:10 +10:00
Marc Zinnschlag
67dfaa7f35
update actions in main menu when creating a new view
2014-09-04 10:47:30 +02:00
cc9cii
801b9446b7
Support for ubuntu/debian. Can easily be reverted if not required.
2014-09-04 07:58:46 +10:00
Marc Zinnschlag
431abcb63a
handle shutdown of OpenMW processes when shutting down OpenCS
2014-09-03 20:06:49 +02:00
Marc Zinnschlag
3fec253409
save first (if document was modified) before running OpenMW
2014-09-03 19:56:52 +02:00
Marc Zinnschlag
a06133a50e
added failed flag to operation done signal
2014-09-03 19:14:27 +02:00
Marc Zinnschlag
71a2424500
Merge remote-tracking branch 'miroslavr/master'
2014-09-03 17:58:54 +02:00
cc9cii
093c7f8882
Moved format conversion to audio_decode_frame()
2014-09-03 22:52:03 +10:00
Marco Melletti
8bce460f34
loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix
2014-09-03 14:40:32 +02:00
cc9cii
fd5f814218
Trivial change from "Musics" to "Music Files"
2014-09-03 20:06:43 +10:00
cc9cii
1e72cf4cdc
More refactoring, remove more #ifdef guards and fix repeat samples for planar formats.
2014-09-03 18:13:43 +10:00
scrawl
628d57f18c
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-09-03 04:55:24 +02:00
scrawl
2379c0ada7
Pause frame updates when the window is minimized ( Fixes #1868 )
2014-09-03 04:54:07 +02:00
MiroslavR
386bb98fd2
Do not attach coin widgets to a box
2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09
Fix broken coin placement in levelup dialog + possible memleak
2014-09-02 22:06:02 +02:00
scrawl
84a0d064cd
Fall back to regular death animation if deathknockdown/deathknockout don't exist ( Fixes #1870 )
2014-09-02 15:14:23 +02:00
cc9cii
5095f729b0
Make travis happy again.
2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5
Minimize the use of #ifdef guards for better code legibility.
2014-09-02 21:52:19 +10:00
Marc Zinnschlag
bee36c9167
block saving while OpenMW process is running
2014-09-02 11:59:04 +02:00
Marc Zinnschlag
c88b3a1520
track state of OpenMW process and enable/disable run/stop actions accordingly
2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130
added OpenMW runner
2014-09-02 10:21:17 +02:00
Marc Zinnschlag
4894699eba
Merge remote-tracking branch 'scrawl/master'
2014-09-02 09:04:19 +02:00
scrawl
0eb949c8a7
Don't update ripples when they are not used
2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
2014-09-01 21:49:37 +10:00
Marc Zinnschlag
a9df3b53fd
restored --new-game switch
2014-09-01 11:55:12 +02:00
Marc Zinnschlag
96cd46568b
some cleanup
2014-09-01 11:15:59 +02:00
Marc Zinnschlag
bec6c4e726
fixed editor creation for Display_LongString
2014-09-01 10:56:38 +02:00
Marc Zinnschlag
7e653cebdf
implement script editor via QPlainTextEdit instead of QTextEdit
2014-09-01 10:52:10 +02:00
MiroslavR
7dfba0ae30
Followers with high fight should not engage in combat with the player
2014-09-01 03:43:53 +02:00
MiroslavR
41c6045986
Realign all parent boxes when autosizedwidgets change size
2014-09-01 03:38:05 +02:00
scrawl
9caff1d800
Don't say Idle voices when player is not in LOS ( Fixes #1436 )
2014-09-01 02:21:54 +02:00
scrawl
59720b7dc6
Implement MagicItems flag for vendors ( Fixes #1861 )
2014-09-01 02:10:36 +02:00
scrawl
0da4757ee6
Merge branch 'master' of github.com:scrawl/openmw
2014-09-01 02:04:18 +02:00
cc9cii
0b9d17a81d
More cleanup.
2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb
Implemented feedback review comments, removing hard coded values and adding error handling.
2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e
Cleanup comments.
2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d
Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16).
2014-08-31 23:35:05 +10:00
cc9cii
8429dab271
Working version - converts FLTP to FLT. Does not work when converting to S16.
2014-08-31 22:01:08 +10:00
cc9cii
16c165185b
Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101.
2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a
Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit.
2014-08-31 13:20:33 +10:00
Corporama
ccca6db865
Compile fixes for Linux
2014-08-30 23:11:09 +02:00
scrawl
9d6ca9066f
Fix summoned creatures not following for non-player summoners
2014-08-30 18:48:28 +02:00
scrawl
180a831e96
Fix typo in combat distance
2014-08-30 18:38:24 +02:00
scrawl
fde6cad24b
Reset RefNum when copying a reference to a new cell
2014-08-30 18:27:59 +02:00
scrawl
267cf4e140
Implement ResetActors script instruction ( Fixes #1859 )
2014-08-30 18:27:32 +02:00
Marc Zinnschlag
03c0cbc65a
added owner global column to references table ( Fixes #1695 )
2014-08-30 10:13:34 +02:00
scrawl
58945c557a
Add sound for casting enchanted item with insufficent charge ( Fixes #1857 )
2014-08-30 02:47:35 +02:00
scrawl
a62e40f4ed
Add situational AI use of Feather, Dispel and Cure effects
2014-08-29 17:58:32 +02:00
Marc Zinnschlag
2eadff54d4
Merge remote-tracking branch 'rohitnirmal/scan-build-fixes'
2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663
Silence some scan-build warnings.
2014-08-28 20:55:32 -05:00
cc9cii
fa0352cd75
fix typo
2014-08-29 10:47:44 +10:00
cc9cii
961b4f0142
Suppress a warning.
2014-08-29 07:48:52 +10:00
scrawl
0be1ac1343
Enable casting of NoMagnitude effects in AI (e.g. summoned creatures)
2014-08-28 21:37:18 +02:00
scrawl
feeb740497
Fix bone not found exception for golden saint spellcasting
2014-08-28 17:02:11 +02:00
scrawl
0f43592237
Another invalid iterator fix
2014-08-28 16:47:54 +02:00
scrawl
1c222a0154
Fix mSelectedEnchantItem cleanup not working for non-player actors
2014-08-28 16:31:06 +02:00
scrawl
f91d639782
Add missing soul trap sound ( Fixes #1855 )
2014-08-28 16:30:42 +02:00
Marc Zinnschlag
78393bca30
Merge branch 'editorfix'
2014-08-28 13:33:08 +02:00
Marc Zinnschlag
0dff1fb816
fix for previous commit (was using wrong destination path)
2014-08-28 13:25:56 +02:00
Marek Kochanowicz
ea2feb0aa9
fix for bug 1672
2014-08-28 12:51:49 +02:00
Marc Zinnschlag
ce3d75bba2
Merge remote-tracking branch 'scrawl/master'
2014-08-28 12:34:08 +02:00
Marc Zinnschlag
9197d4b653
Merge remote-tracking branch 'scrawl/ai'
2014-08-28 09:32:44 +02:00
scrawl
253036abee
Play VFX_Soul_Trap on successful soul trap
2014-08-28 02:55:36 +02:00
scrawl
f8f4d2dfdb
Another invalid iterator fix
2014-08-28 02:14:30 +02:00
scrawl
1a98f8ca93
Invalid iterator fix
2014-08-28 02:09:00 +02:00
scrawl
2e623bac5a
Don't attempt to use broken weapons in AI
2014-08-28 02:01:41 +02:00
scrawl
0bdc1b243a
Consider weapon ammunition in combat AI ( Fixes #1576 )
2014-08-28 01:54:32 +02:00
scrawl
f1d72419de
Don't equip weapons in autoEquip, AiCombat does that now ( Fixes #1451 )
2014-08-28 00:59:54 +02:00
scrawl
0fe9612afb
Implement basic spellcasting AI ( Fixes #961 )
...
Select a weapon to attack with in AiCombat and equip it (Fixes #1609 , Fixes #1772 )
2014-08-28 00:55:37 +02:00
scrawl
1a96dd0bd5
Remove more MyGUI 3.2.0 specific code
2014-08-27 16:39:13 +02:00
Marc Zinnschlag
0b3e2775a0
fixed wording in body part verifier
2014-08-27 10:46:21 +02:00
Stanislav
4d2bdda22f
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-08-26 22:14:50 +06:00
Stanislav
bdfb0c8351
Feature #1616 : Body part record verifier
2014-08-26 21:55:31 +06:00
scrawl
c5fa7bf7c2
Minor cleanup
2014-08-26 17:45:28 +02:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
scrawl
17dc01ec44
Require MyGUI version 3.2.1 and remove legacy code ( Fixes #1528 )
2014-08-26 17:01:35 +02:00
scrawl
dd77954512
Don't pass key to input binder if it was consumed by text editor ( Fixes #1845 )
2014-08-26 03:06:30 +02:00
scrawl
dcddd9a07c
Use MyGUI clipboard events for MyGUI 3.2.1+ ( Fixes #1846 )
...
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
2014-08-26 03:06:30 +02:00
scrawl
10a0e2434e
Open inventory when activating an unconscious actor ( Fixes #1848 )
2014-08-26 03:06:23 +02:00
scrawl
fc7ed05da8
Knock out actors when fatigue base is 0 ( Fixes #1847 )
2014-08-26 03:02:06 +02:00
scrawl
44642ae21b
Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd)
2014-08-26 02:09:23 +02:00
scrawl
b4fbaf1169
Fix potential infinite recursion in ActionTeleport ( Fixes #1840 )
2014-08-26 02:09:23 +02:00
scrawl
854491ac15
Don't treat actors as following if another non-combat AiPackage precedes ( Fixes #1843 )
2014-08-26 02:09:23 +02:00
scrawl
7714192e28
Remove wrong comment
2014-08-26 02:09:23 +02:00
scrawl
9f13315d1c
Remove unused numUnload
2014-08-26 02:09:23 +02:00
scrawl
c775e05d7a
Show encumbrance preview when trading ( Fixes #1793 )
2014-08-26 02:09:22 +02:00
MiroslavR
fc21d898f2
Add hand-to-hand tooltip
2014-08-25 03:15:28 +02:00
MiroslavR
3823e36f05
Merge branch 'master' of github.com:OpenMW/openmw
2014-08-25 00:56:35 +02:00
MiroslavR
d16e0c063c
Enchanting, spellmaking dialog: check for flags when listing known effects
2014-08-24 21:59:52 +02:00
MiroslavR
df262e53ae
Display school in the spell tooltip
2014-08-24 20:51:41 +02:00
MiroslavR
fc789265e2
Spells that always succeed should not increase your skill when you cast them
2014-08-24 20:36:31 +02:00
Marc Zinnschlag
111b55f48e
Merge remote-tracking branch 'scrawl/script'
2014-08-24 17:58:05 +02:00
Marc Zinnschlag
ea4cd94c25
syntax highlighter modes
2014-08-24 17:56:20 +02:00
MiroslavR
e8a245bea3
Enchanting dialog: follow vanilla behavior more closely
2014-08-24 16:41:17 +02:00
Marc Zinnschlag
5c536d571b
added script column to debug profile table (dialogue only)
2014-08-24 13:15:18 +02:00
Marc Zinnschlag
52f6a2ec7b
remote local variable access was always using variable with index 1 instead of the index specified by the access request ( Fixes #1739 )
2014-08-24 11:58:08 +02:00
Marc Zinnschlag
d024c1a93f
Merge remote-tracking branch 'scrawl/master'
2014-08-24 09:14:17 +02:00
Marc Zinnschlag
79e1786ff9
Merge remote-tracking branch 'rohitnirmal/quick-draw'
2014-08-24 09:11:58 +02:00
scrawl
c5c822ecba
Use Chop attack when walking diagonally ( Fixes #1729 )
2014-08-24 02:38:00 +02:00
scrawl
e0e4cbbb41
Implement Light magic effect ( Fixes #1122 )
2014-08-24 02:37:59 +02:00
scrawl
714c927fda
Fix being able to change camera during death via mouse wheel
2014-08-24 02:37:59 +02:00
scrawl
3dbe17b6ed
Terminate AiPursue when target dies ( Fixes #1836 )
2014-08-24 02:37:59 +02:00
scrawl
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
2014-08-24 02:37:50 +02:00
Marc Zinnschlag
80d39780ae
same fix for a couple of additional instructions
2014-08-23 18:50:53 +02:00
Marc Zinnschlag
7de49a66e2
fix for PCJoinFaction and for getPcRank without explicit reference
2014-08-23 18:45:06 +02:00
Marc Zinnschlag
0d8bfbfa9b
getpcrank did not read the explicit reference in some cases ( Fixed #1767 )
2014-08-23 18:23:14 +02:00
Rohit Nirmal
6ed4f530df
Forgot to update comment.
2014-08-23 10:35:55 -05:00
Rohit Nirmal
bf97fe7b35
Need to change draw state if use'd item is in player's right hand.
2014-08-23 10:31:10 -05:00
scrawl
e9e7e96c5f
SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation)
2014-08-23 16:18:46 +02:00
Marc Zinnschlag
30830d0693
make delegates use the whole document instead of the undo stack
2014-08-23 12:25:12 +02:00
Marc Zinnschlag
7c1b32ae62
Merge remote-tracking branch 'miroslavr/corprus'
2014-08-23 09:15:27 +02:00
Rohit Nirmal
234903d93c
Change player draw state when quick-selecting weapon or spell.
...
(Fixes #1828 )
2014-08-22 21:36:39 -05:00
Marc Zinnschlag
232c6c9ad3
Merge branch 'scriptedit' into run
2014-08-22 13:20:02 +02:00
Marc Zinnschlag
be61ed0f6a
minor cleanup
2014-08-22 13:18:47 +02:00
Marc Zinnschlag
c2e3709d0f
moved syntax highlighter from ScriptSubView to ScriptEdit
2014-08-22 12:49:34 +02:00
MiroslavR
85aa237baf
Implement removal of corprus spells
2014-08-22 03:34:31 +02:00
Marc Zinnschlag
d4981c3037
moved change lock from ScriptSubView to ScriptEdit
2014-08-21 14:50:13 +02:00
MiroslavR
2cbe17ca0a
Make Spells::mCorprusSpells private
2014-08-20 12:40:38 +02:00
MiroslavR
26732bc228
Purge blight should not remove corprus
2014-08-19 22:13:37 +02:00
MiroslavR
96e7ff666d
Implement saving/loading of corprus stats, remove redundant code
2014-08-19 03:17:31 +02:00
Bret Curtis
feb0ef8390
fixes building on systems with kFreeBSD kernel
2014-08-18 17:19:54 +02:00
scrawl
83037a1a91
Move fast-forward of particle systems outside of OgreNifLoader ( Fixes #1830 )
...
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
2014-08-18 16:37:47 +02:00
MiroslavR
3722c7adc3
Initial work on implementing corprus worsening effect
2014-08-18 15:33:12 +02:00
scrawl
03cb66c342
Set render queue group for projectiles ( Fixes #1829 )
2014-08-18 15:32:52 +02:00
Bret Curtis
bb1fe23f9c
fix building on GNU Hurd
2014-08-18 14:41:46 +02:00
scrawl
888a53af04
SaveGameDialog: Allow deleting saves with keyboard (Delete key)
2014-08-17 20:41:23 +02:00
scrawl
9b38888ac9
Add missing AiFollow ActorId initialization ( Fixes #1818 )
2014-08-17 17:01:04 +02:00
Marc Zinnschlag
2f08d44313
moved script widget configuration code from ScriptSubView to ScriptEdit
2014-08-17 15:25:22 +02:00
Marc Zinnschlag
4e521d1aca
fixed resources collection access
2014-08-17 14:21:23 +02:00
Marc Zinnschlag
02b7712d7c
Merge remote-tracking branch 'scrawl/master'
2014-08-17 12:07:44 +02:00
scrawl
bcc79919a7
Fix fortified skill not immediately updating on changing equipment
2014-08-17 05:42:52 +02:00
scrawl
360c7f863c
Store magic effect Base values in savegame ( Fixes #1489 )
2014-08-17 05:38:48 +02:00
scrawl
2db50da8dd
Implement magic effect script instructions (Feature #1489 )
2014-08-17 05:09:14 +02:00
scrawl
d8943aef2f
Encapsulate magic effect magnitude (Feature #1489 )
2014-08-17 03:58:04 +02:00
scrawl
e508450c1c
Add persuasion GMST to ensureNeededRecords ( Fixes #1817 )
2014-08-17 03:58:03 +02:00
scrawl
322480862b
InteractiveMessageBox: lay out buttons horizontally if button width does not exceed message width ( Fixes #1812 )
...
Also fix some layout bugs.
2014-08-16 18:53:13 +02:00
MiroslavR
195f044f3b
Replace more .tga->.dds hacks with ResourceHelpers
2014-08-16 18:12:18 +02:00
scrawl
bb33b4e005
Revert "Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )"
...
This reverts commit 40d6c8abf7
2014-08-16 17:24:18 +02:00
scrawl
ddf8c5023e
InventoryWindow: don't unnecessarily update preview on opening count dialog
2014-08-16 17:18:13 +02:00
scrawl
6ddd9cc5a2
Don't show weight or value for keys ( Fixes #1815 )
2014-08-16 16:51:56 +02:00
Marc Zinnschlag
47619d957a
Merge remote-tracking branch 'miroslavr/master'
2014-08-16 15:25:13 +02:00
Marc Zinnschlag
e893d0d7d3
Merge remote-tracking branch 'scrawl/master'
2014-08-16 15:10:03 +02:00
MiroslavR
063b40a0ee
Correct tooltip for maxed out skills
2014-08-16 13:30:49 +02:00
MiroslavR
236eec3d89
Allow widgets with layout-type tooltip to change user data of widgets from tooltip layout
2014-08-16 13:24:44 +02:00
MiroslavR
a9f7a30d90
HBox, VBox: call parent setPropertyOverride
2014-08-16 13:12:02 +02:00
scrawl
c4ae07f48a
Remove partially broken sound pausing in main menu ( Fixes #1707 )
2014-08-16 02:01:39 +02:00
scrawl
7432771ac7
For non-active torches set the particle system speed factor to zero instead of destroying it ( Fixes #1811 )
2014-08-16 00:51:02 +02:00
scrawl
ddba9e5854
Improve performance of ItemView resize (reposition widgets instead of recreate)
2014-08-15 18:42:33 +02:00
Marc Zinnschlag
06e1cfe613
added missing allowed drop types for script edit (script and region)
2014-08-15 14:41:34 +02:00
Marc Zinnschlag
58916a7731
fixed creator for filter dialogue subview
2014-08-15 13:37:37 +02:00
Marc Zinnschlag
6f97fa472e
added dialgoue subview for debug profiles
2014-08-15 13:35:53 +02:00
Marc Zinnschlag
fd3842d726
added flag columns to debug profile table
2014-08-15 13:22:20 +02:00
Marc Zinnschlag
2b9395333a
fixed error detection and improved error reporting in IdValidator
2014-08-15 13:11:55 +02:00
Marc Zinnschlag
775e24d2c0
save debug profiles in project files
2014-08-15 12:08:29 +02:00
Marc Zinnschlag
605f71ecc0
added creator to debug profile table
2014-08-15 12:03:07 +02:00
Marc Zinnschlag
1bf177fe72
fixed double namespace in GenericCreator
2014-08-15 12:01:37 +02:00
scrawl
084cc857d4
Update magic effects when changing equipment ( Fixes #1646 )
2014-08-15 01:13:38 +02:00
MiroslavR
1385a86bd4
Spell creation: do not add skill/attribute effects before selecting the skill or attribute
2014-08-15 00:30:24 +02:00
scrawl
7f807f31d0
Remove comment
...
Doing some testing with extended journals, doesn't appear to be a performance issue.
2014-08-14 19:49:03 +02:00
scrawl
c62d53ae84
Remove no longer needed comments about coordinate system
2014-08-14 19:09:33 +02:00
scrawl
c065a4b203
Add ManualResourceLoader for global map overlay ( Fixes #1736 )
2014-08-14 19:01:03 +02:00
scrawl
1bb82c710c
Fix use of uninitialized memory in AiWander::init
2014-08-14 18:55:54 +02:00
Marc Zinnschlag
c66dfe67b1
integrated namespace widget into input field (GenericCreator)
2014-08-14 14:21:34 +02:00
scrawl
061c7813f6
AiFollow: return from execute() if target is not player ( Fixes #1637 )
2014-08-14 02:14:13 +02:00
scrawl
f8010c09fe
Adjust combat engagement of following actors ( Fixes #1810 )
2014-08-14 02:13:55 +02:00
scrawl
94c2517d67
Fix race preview crash ( Fixes #1808 )
2014-08-13 19:30:46 +02:00
scrawl
28e61c9834
Add default values for fDifficultyMult and sDifficulty ( Fixes #1742 )
...
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
2014-08-13 17:32:52 +02:00
scrawl
09f27d142a
Clear movement queue when changing to a new cell ( Fixes #1802 )
2014-08-13 16:25:27 +02:00
scrawl
d649c19790
Cache ActorId in AiFollow::getTarget ( Fixes #1804 )
2014-08-13 16:00:32 +02:00
Marc Zinnschlag
93ed019ca3
Merge remote-tracking branch 'scrawl/master'
2014-08-13 09:04:35 +02:00
scrawl
8ae6796b2f
Play creature movement animation without scaling if a fallback is used ( Fixes #1797 )
2014-08-13 01:53:56 +02:00
gus
1ac220593d
clean up
2014-08-12 21:32:07 +02:00
scrawl
e2ee3b2497
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
MiroslavR
4f67f5d26f
Spellcreation window: set captions to "0" if no effects are added ( Fixes #1778 )
2014-08-12 18:53:03 +02:00
Marc Zinnschlag
40a33eb9f0
Merge remote-tracking branch 'miroslavr/master'
2014-08-12 17:49:03 +02:00
gus
11922dc53a
code is shorter, thanks scrawl
2014-08-12 17:41:13 +02:00
gus
465914c77c
more clean up
2014-08-12 17:20:02 +02:00
gus
321d385a5d
clean up
2014-08-12 17:18:08 +02:00
scrawl
b374255447
Improve performance of moving spell window (don't recreate widgets unnecessarily)
2014-08-12 17:07:15 +02:00
scrawl
025f50a2df
Improve performance of inventory window resize (don't update selection buffer unnecessarily)
2014-08-12 17:07:06 +02:00
gus
d4d8f07bf3
clean up
2014-08-12 13:32:56 +02:00
gus
e9cc1df69e
use QPainter
2014-08-12 13:31:32 +02:00
gus
5fd599b5de
minor corrections
2014-08-12 13:31:20 +02:00
MiroslavR
baa14511cf
Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision
2014-08-12 12:18:38 +02:00
Marc Zinnschlag
a5ecf2e9f0
hide record type column in resources tables
2014-08-12 11:32:38 +02:00
Marc Zinnschlag
98fa789904
fixed mixed-up tooltip
2014-08-12 11:07:54 +02:00
scrawl
177de58884
Use fWereWolfRunMult only when no weapon is drawn
2014-08-12 01:10:18 +02:00
scrawl
63cb91db2e
Add --export-fonts command line option
2014-08-11 20:40:02 +02:00
scrawl
cf22d2fa36
Make Potions reveal two effects for every fWortChanceValue of alchemy skill ( Fixes #1792 )
2014-08-11 20:40:02 +02:00
scrawl
5335f00958
Don't show Until Healed button when only fatigue is not full ( Fixes #1798 )
2014-08-11 20:40:02 +02:00
scrawl
28fe81df90
Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes #1796 )
2014-08-11 20:39:56 +02:00
MiroslavR
4d403ed747
Rename and move functions for texture path correction
2014-08-11 20:04:44 +02:00
scrawl
8866b5f860
Fix maximum magicka calculation ( Fixes #1795 )
2014-08-11 19:07:14 +02:00
scrawl
fc1687906b
Use the last Loop Stop key for calculating animation velocity ( Fixes #1776 )
2014-08-11 05:29:36 +02:00
scrawl
34847baa54
Disable head animations for dead actors ( Fixes #1781 )
2014-08-11 05:00:13 +02:00
scrawl
f8040da694
Make doors move through dead actors ( Fixes #1608 )
2014-08-11 04:43:06 +02:00
scrawl
98bc4618cb
AiAvoidDoor: turn and walk forward instead of backwards or sideways ( Fixes #1788 )
2014-08-11 04:21:04 +02:00
scrawl
36ba56d037
Make Position instruction move non-player actors within their cell only ( Fixes #1791 )
2014-08-11 02:01:20 +02:00
scrawl
f724732290
Implement mouse wheel journal navigation ( Fixes #1790 )
2014-08-11 00:51:54 +02:00
scrawl
fcd2a9e4d5
Don't set magic effects for dead actors ( Fixes #1783 )
2014-08-10 23:52:32 +02:00
Marc Zinnschlag
fa9c6b19c2
removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)
2014-08-10 21:03:45 +02:00
Marc Zinnschlag
2df1079dd4
removed mScope field from Filter record (redundant now)
2014-08-10 20:49:14 +02:00
Marc Zinnschlag
a54efbcfa0
made FilterCreator redundant by generalising GenericCreator
2014-08-10 18:46:32 +02:00
scrawl
4138c3e966
Reuse health of previous level rather than recalculating initial health ( Fixes #1787 )
2014-08-10 17:09:14 +02:00
scrawl
399fa90ef1
Add missing include guard
2014-08-10 16:56:54 +02:00
MiroslavR
4873c4bd31
Generalize function for texture path correction ( Fixes #1779 )
2014-08-09 18:59:57 +02:00
scrawl
4a26dcb2ad
Avoid calling RenderTarget::update from within loadResource
2014-08-08 15:46:33 +02:00
scrawl
8c26f802e6
Move terrain grid implementation to a component so the editor can use it (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
982453d4f6
Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597 )
2014-08-08 15:46:33 +02:00
scrawl
accab47724
Don't knock down from fall damage in onHit (CharacterController is doing that already)
2014-08-08 15:46:32 +02:00
scrawl
a731ec3587
Remove summoned creature and its effect when it is killed ( Fixes #1341 )
2014-08-08 15:46:32 +02:00
scrawl
8a4e0a2ce8
Don't fade out screen if teleport target cell is not found
2014-08-08 15:46:32 +02:00
scrawl
143609be59
Set glyph width/height separately from texture coordinates (Bug #1096 )
...
Requires MyGUI SVN
2014-08-08 15:46:13 +02:00
scrawl
22d7d8a466
Implement Command creature/humanoid magic effects ( Fixes #1120 )
2014-08-07 17:21:07 +02:00
Marc Zinnschlag
35803bc9b6
added scope configuration to creators
2014-08-07 09:32:49 +02:00
scrawl
0f8a10f468
Savegame: Set equipment slot for lights ( Fixes #1761 )
2014-08-06 20:13:58 +02:00
scrawl
2bfcec53bf
Don't show sMagicInvalidTarget for soultrap on NPCs ( Fixes #1762 )
...
Note the message was accurate, since NPCs can't be soultrapped. Maybe vanilla doesn't show it to not spam the screen with message boxes when attacking with a "soultrap on strike" weapon...
2014-08-06 20:13:58 +02:00
scrawl
a9a7a7ec73
Use Modified attribute values to derive magicka and fatigue ( Fixes #1760 )
2014-08-06 20:13:58 +02:00
scrawl
44b517f66d
Implement hiding inventory windows by double click on caption ( Fixes #1690 )
2014-08-06 20:13:58 +02:00
scrawl
c6bf9dfbfb
Add ManualResourceLoader for character previews ( Fixes #1752 )
2014-08-06 20:13:57 +02:00
scrawl
0b1e997bdd
Make sure dialogue is ended properly when closing it by using a service ( Fixes #1755 )
2014-08-06 20:13:57 +02:00
scrawl
1fc424ce30
Make sure player doesn't get any AI packages (Bug #1749 )
2014-08-06 20:13:57 +02:00
MiroslavR
42dceb641e
Readd Azura's Star after recharging ( Fixes #1765 )
2014-08-06 19:50:10 +02:00
MiroslavR
8707f7b116
Fix spell creation magicka cost ( Fixes #1763 )
2014-08-06 13:19:40 +02:00
Marc Zinnschlag
0be1e3d12f
removed WriteFilterStage class (functionality integrated into WriteCollectionStage)
2014-08-06 10:03:04 +02:00
Marc Zinnschlag
828536e999
generalised the concept of record scope
2014-08-06 09:53:10 +02:00
Marc Zinnschlag
f4ddf2a7b9
Merge remote-tracking branch 'sandstranger/android'
2014-08-06 08:04:11 +02:00
root
c15902487d
fix indent in cmake
2014-08-06 07:59:39 +04:00
root
32ebc90ba4
fix v9
2014-08-06 07:52:36 +04:00
root
713787d92f
fix v7
2014-08-06 07:48:16 +04:00
root
3cd98e5259
fix code v5
2014-09-06 02:02:39 +04:00
root
d8772156a7
fixe all code v 2
2014-08-06 00:46:21 +04:00
root
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
2014-09-04 22:47:03 +04:00
root
57a8b9cdb5
abdroid-build
2014-08-04 19:52:01 +04:00
root
16aafc26bc
fixed cmake for build on all plaforms include android
2014-08-04 19:49:54 +04:00
Marc Zinnschlag
4d49924025
added debug profile record table
2014-08-04 13:36:01 +02:00
Marc Zinnschlag
33c36bf0df
Merge remote-tracking branch 'scrawl/master'
2014-08-03 22:23:48 +02:00
scrawl
45f0f0e4c3
Use sky_night_02.nif if available ( Fixes #1744 )
2014-08-03 17:40:29 +02:00
scrawl
639ae7e06c
Implement friendly hits on followers ( Fixes #1139 )
2014-08-03 16:24:16 +02:00
scrawl
2d74388a76
Don't report crime if we are in combat with the victim
2014-08-03 16:24:16 +02:00
scrawl
216ebac2e9
Implement weapon condition damage for ranged weapons ( Fixes #1746 )
2014-08-03 16:24:11 +02:00
Marc Zinnschlag
dbf5613d8c
cleanup
2014-08-03 09:28:44 +02:00
Digmaster
a32ab842ae
Added ForceJump/ForceMoveJump commands
2014-08-02 22:42:40 -07:00
scrawl
eb1888a540
Fix GetPcRank and PcExpelled not accepting Faction IDs properly ( Fixes #1709 )
2014-08-03 00:31:25 +02:00
scrawl
ef78ae22f6
Loosen mode restrictions on opening Journal window ( Fixes #1570 )
2014-08-03 00:31:18 +02:00
scrawl
cd8287da16
Make sure fog texture is loaded before trying to convertToImage
2014-08-01 18:42:51 +02:00
scrawl
6cb9382bf0
Adjust screen-sized widgets automatically using Stretch align
2014-08-01 17:15:28 +02:00
scrawl
715d357f24
Use a controller to move Drag&Drop widget with the mouse cursor
2014-08-01 17:14:35 +02:00
scrawl
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
2014-08-01 16:25:41 +02:00
Marc Zinnschlag
3f6a7e36d0
removed the (partial broken) return/enter shortcut for custom push buttons, since there is already a space shortcut)
2014-08-01 09:50:49 +02:00
Marc Zinnschlag
1e6d557089
Merge branch 'visibility'
2014-07-31 14:34:25 +02:00
Marc Zinnschlag
f381451ae0
added control element selector toolbar button
2014-07-31 14:33:38 +02:00
Marc Zinnschlag
612202a7a5
fixed several bugs in the layout algorithm of the toggle scene tool
2014-07-31 14:33:12 +02:00
Marc Zinnschlag
507e5c4f6e
explicitly flag scene as modified when changing visibility mask
2014-07-31 14:29:52 +02:00
Marc Zinnschlag
439ba57d46
added visual element selector toolbar button
2014-07-31 14:06:04 +02:00
Marc Zinnschlag
a25758c3b1
fixed visibility flags setting
2014-07-31 14:02:55 +02:00
Marc Zinnschlag
b0a9d17dc3
use name as a tooltip if no tooltip is given for scene tool bar toggle buttons
2014-07-31 13:26:23 +02:00
Marc Zinnschlag
92d322cbd1
added visibility flags
2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949
added scene toolbar toggle widget
2014-07-31 13:05:08 +02:00
Marek Kochanowicz
40edf15ab0
cleaning up the code
2014-07-31 12:18:24 +02:00
scrawl
b58b8c6f8f
Adjust player position to ground when using a door marker, even if the player is levitating ( Fixes #1737 )
2014-07-31 04:28:02 +02:00
scrawl
89af49f669
Make sure fog of war texture is loaded before accessing its buffer
2014-07-31 01:58:33 +02:00
scrawl
175cc98e64
Make magic effects with no corresponding resistance attribute unresistable ( Fixes #1727 )
2014-07-31 01:14:44 +02:00
Marek Kochanowicz
c6194e7ea3
inserted additional class for nested collections
2014-07-30 22:08:55 +02:00
scrawl
0f1451babd
Add epsilon to armor class calculation
2014-07-30 20:26:47 +02:00
Marek Kochanowicz
13ee469b70
saving progress
2014-07-30 17:07:11 +02:00
Marc Zinnschlag
7a5f73de9e
added navigation mode icons to buttons
2014-07-30 17:02:23 +02:00
scrawl
261e755e73
Font hacking again ( Fixes #1506 )
2014-07-30 15:26:10 +02:00
scrawl
d1feb9ef02
Fix # in book text being interpreted as MyGUI color code
2014-07-30 15:26:10 +02:00
scrawl
78bd516ab4
Show sMagicInvalidTarget for an invalid soultrap target ( Fixes #1728 )
2014-07-30 15:26:10 +02:00
Michał Ściubidło
f754e06be9
Fix for bug 1685
2014-07-30 07:47:09 +01:00
scrawl
45af34d189
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-07-29 19:35:44 +02:00
scrawl
543bb22e8f
Implement collision script instructions ( Fixes #1111 )
2014-07-29 19:01:40 +02:00
scrawl
ccde462308
Fix typo (RefId -> RefNum)
2014-07-29 19:01:14 +02:00
scrawl
9e48d56244
Reset RefNum when copying an object ( Fixes #1723 )
2014-07-29 15:55:58 +02:00
scrawl
1a6db097ed
Fix dangling MWWorld::Ptrs in enchanting dialog after loading save game ( Fixes #1722 )
2014-07-29 15:32:22 +02:00
scrawl
a59620f643
Cache loudness vector in the buffer cache
2014-07-29 14:32:44 +02:00
scrawl
0943ff0886
Fix normalizing sample values
2014-07-29 14:19:12 +02:00
scrawl
625f9a35e6
Implement NPC eye blinking ( Fixes #1721 )
2014-07-29 01:16:08 +02:00
scrawl
598c0c4ae7
Implement mouth animation for NPCs based on say sound ( Fixes #642 )
2014-07-29 01:15:22 +02:00
Michał Ściubidło
bd3729a6cb
Add grace periods for player greeting.
...
Add delay for NPC greating. NPC ignores greeted player after some time.
Fixes bug 1503.
2014-07-28 23:45:26 +01:00
Michał Ściubidło
d47bfbe69c
Implement AI greeting states.
...
Greeting consist of 3 phases:
- none - default one, greeting state can only change to "in progress"
when near enough and some time passes
- in progress - NPC says his greating and rotates toward player,
state can only change to "done" after some time
- done - rotation is stoped, after idling can go away from player,
state can only change to "none" when player and NPC are faraway
2014-07-28 23:45:26 +01:00
Michał Ściubidło
20efeea5d9
AI tell their greatings even when player is moving (like morrowind).
...
Greating reset distance was greatly inflated comparing with morrowind.
2014-07-28 23:45:26 +01:00
scrawl
8455ed6279
Cancel upper body animations when knocked down
2014-07-28 19:51:29 +02:00
scrawl
5349699172
Only show "target resists magic" message for spells cast by player
2014-07-28 17:54:48 +02:00
bogglez
b56cb7e5ee
Remove defunct option for building without FFmpeg
...
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
(FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
2014-07-28 17:46:41 +02:00
Marek Kochanowicz
6a9c7c9f86
fix for bug 1672
2014-07-28 17:33:21 +02:00
scrawl
f67b7dae91
Sheath weapon in all Ai packages except for AiCombat
2014-07-28 17:32:14 +02:00
scrawl
d956df83e4
Don't make guards fight non-aggressive creatures that are in combat
...
Ex. summoned creature that is helping in a fight.
2014-07-28 17:19:20 +02:00
scrawl
d9a6515fe3
Adjust AiFollow running threshold to more closely match vanilla MW
2014-07-28 17:11:46 +02:00
scrawl
18b3e71be5
Reset player position when spawning in fallback cell
2014-07-28 16:59:46 +02:00
scrawl
4773d754c6
Remove redundant isHostile flag ( Fixes #1652 )
2014-07-28 16:41:12 +02:00
scrawl
0077296c91
Take actor's speed into account in stuck check
...
The Winged Twilight's walking animation was so slow that it incorrectly detects being stuck.
2014-07-28 15:57:16 +02:00
scrawl
d69ed78ccd
Don't add combat AI to player
2014-07-28 15:40:52 +02:00
scrawl
3067082534
Make base_anim.nif take priority for biped creatures
...
Fixes the skeletal minion's WalkForward1h animation.
2014-07-28 14:53:53 +02:00
Marc Zinnschlag
4791098e11
Merge remote-tracking branch 'miroslavr/master'
2014-07-28 10:06:22 +02:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
c6d3b0b70b
Moved merchant restock from trade start to dialogue start, since other services also interact with it.
2014-07-28 02:27:48 +02:00
scrawl
315b022d2d
Add transfer gold from all services to NPC trade gold pool
2014-07-28 00:55:57 +02:00
scrawl
45206bc3f6
Savegame: write and read dynamic Store before Cells
2014-07-28 00:32:59 +02:00
MiroslavR
b4ba18afe7
Include revision number in the "version" command line option ( Closes #1711 )
2014-07-27 23:36:40 +02:00
scrawl
6262d6c964
Don't leave stale player CharacterController in Actors when loading game ( Fixes #1713 )
2014-07-27 23:10:58 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00
scrawl
47e42d4fda
Destroy Engine after exception is logged
...
In cases where OpenMW throws an exception, then crashes in the Engine destructor (ideally should not happen, but keeps happening), we will at least see what the exception was about.
2014-07-27 20:33:45 +02:00
scrawl
8c81e22f3e
Determine target for On Touch effects for non-player actors
2014-07-27 20:33:44 +02:00
scrawl
31d058b98c
Add workaround for ScrollView messing up canvas size ( Fixes #1700 )
...
TODO: Create fixed ScrollView widget?
2014-07-27 20:33:44 +02:00
scrawl
16b089cdc8
Fix invisible enchanting price when self-enchanting was previously used.
2014-07-27 20:33:44 +02:00
scrawl
9c60e4d826
Change button caption from "Buy" to "Create" when self-enchanting
2014-07-27 20:33:44 +02:00
scrawl
09607f992e
Enchanting: fix inverted self-enchant success chance ( Fixes #1701 )
2014-07-27 20:33:44 +02:00
scrawl
b370c0f7b5
Enchanting: Don't check price on self-enchanting (Bug #1701 )
2014-07-27 20:33:43 +02:00
scrawl
4a1e561015
Properly assign effect attribute/skill in potion creation ( Fixes #1704 )
2014-07-27 20:33:02 +02:00
scrawl
90b2709d6c
Allow absorption of non-harmful spells ( Fixes #1693 )
...
Also fix absorption being calculated for each effect rather than the whole spell.
2014-07-25 19:56:06 +02:00
scrawl
60499eff83
Hotfix for message boxes locking up the game
2014-07-25 19:48:37 +02:00
Marek Kochanowicz
ade27293be
handling destination for guides
2014-07-25 17:11:18 +02:00
Marc Zinnschlag
af54bb9623
removed some redundancies; some more general cleanup
2014-07-25 12:23:18 +02:00
Marc Zinnschlag
d0654f3ade
move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load
2014-07-25 12:17:15 +02:00
Marek Kochanowicz
39545670a8
Added spells table (and it works!)
2014-07-25 12:09:25 +02:00
Marek Kochanowicz
864b93e745
added enums for spells
2014-07-25 11:42:02 +02:00
Marc Zinnschlag
4421e7a5cc
added lighting mode toolbar icons
2014-07-25 11:15:04 +02:00
Marek Kochanowicz
cdac934315
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-07-25 11:13:52 +02:00
Marc Zinnschlag
1ca0cc4988
rewrote MWScript::Locals::configure to be independent of precompiled script data
2014-07-25 09:37:21 +02:00
Marc Zinnschlag
a3c4000198
moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation
2014-07-25 09:36:02 +02:00
Marc Zinnschlag
87c54adb24
some cleanup
2014-07-25 09:26:30 +02:00
Marc Zinnschlag
f6b502b195
rewrote dialgoue filter access to local variables
2014-07-25 09:08:59 +02:00
Marc Zinnschlag
9f69db0d69
added missing const to ScriptManager::getLocals
2014-07-25 08:12:53 +02:00
Marc Zinnschlag
2e355df8b3
removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)
2014-07-25 07:59:50 +02:00
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4
Fix pinned widgets receiving mouse clicks in gamemode ( Fixes #1686 )
2014-07-24 18:04:44 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
4e0c133fb3
Add comment to Cell NAM0 (it's a RefId counter)
2014-07-24 02:19:36 +02:00
scrawl
7ae9bbb1a5
Implement iCrimeThresholdMultiplier
2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea
Use separate function for fatigue restoration during resting/waiting
2014-07-24 02:17:44 +02:00
scrawl
103325bfb8
Change HUD enemy health bar to use actorId
2014-07-24 02:17:44 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
Marek Kochanowicz
a676f6bc2c
comments added
2014-07-23 20:33:52 +02:00
scrawl
ca45a63cf7
Close doors instantly when using Lock instruction
2014-07-22 17:55:54 +02:00
Marek Kochanowicz
72b129b90e
Code shuffling. Created CastableHelper to store actually usefull
...
function.
2014-07-22 17:44:56 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
gus
baf6cca051
modified tab to space
2014-07-22 13:32:15 +02:00
Marek Kochanowicz
9defb188ea
handle inventory in the actors
2014-07-22 13:08:32 +02:00
gus
195767db7f
link back to OGre Wiki for some copied past code
2014-07-22 12:25:31 +02:00
gus
546b44a3be
bugfixes
2014-07-22 12:10:58 +02:00
gus
1e7c4f26df
more compile fixes (damn you Visual studio)
2014-07-22 12:01:21 +02:00
gus
2092e5fe22
compile fixes
2014-07-22 11:49:45 +02:00
gus
875daed4ec
Merge branch 'master' of https://github.com/OpenMW/openmw.git into QtOGre
2014-07-22 11:09:53 +02:00
Marek Kochanowicz
24eb034ba3
major refactorisation
2014-07-22 10:27:45 +02:00
Marc Zinnschlag
91afc2ebe7
Merge remote-tracking branch 'mikesc/bug1482'
2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca
Merge remote-tracking branch 'miroslavr/master'
2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f
Merge remote-tracking branch 'lgro/aicombat'
2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a
Fix bug 1482:
...
- put powers on cooldown only when they are used succedsfully
2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
scrawl
c0645d4978
Increase death count immediately on death (Bug #1588 )
...
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc
Make NPCs react to being attacked by other actors ( Fixes #1588 )
2014-07-21 20:36:26 +02:00
gus
a5058625b3
clean up + toggle function for the billboard
2014-07-21 18:57:35 +02:00
gus
f8019b4a97
added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too.
2014-07-21 18:35:51 +02:00
scrawl
127add7623
Don't allow dialogue with werewolf NPCs
2014-07-21 18:19:45 +02:00
Marek Kochanowicz
dcd90faaef
moved add nested to the helper
2014-07-21 14:58:45 +02:00
Marek Kochanowicz
427d6efd19
Moved removeNestedRow responsibility to the helper.
2014-07-21 14:49:47 +02:00
Marek Kochanowicz
c018ca43ac
getting rid of the asserts
2014-07-21 14:44:48 +02:00
Marek Kochanowicz
cb004936e0
moved setNestedData to the helper as well
2014-07-21 14:34:48 +02:00
Marek Kochanowicz
6573e3f319
moved responsibility for getNestedData to the inventory helper
2014-07-21 14:24:54 +02:00
Marek Kochanowicz
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
2014-07-21 14:10:04 +02:00
Marc Zinnschlag
a9f9dec923
consider script blacklist in OpenCS verifier
2014-07-21 12:15:21 +02:00
Marek Kochanowicz
3dd2ca15da
Reduced code duplication through new common base class
2014-07-21 09:52:09 +02:00
Marc Zinnschlag
d87630b41a
blacklisting for scripts in OpenMW
2014-07-21 09:34:10 +02:00
scrawl
10d4da7994
Fix date time in journal entries being off by one day ( Fixes #1668 )
2014-07-21 01:17:01 +02:00
scrawl
5629803a08
Implement correct armor mitigation mechanics
2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59
Adjust combat mechanics
...
- Projectiles can not trigger critical hits
- Critical hits are only possible if the target is not in combat (Fixes #1669 )
- Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
Marek Kochanowicz
87eed066c2
undo works now
2014-07-20 22:39:39 +02:00
scrawl
90a96cd7d8
Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor
2014-07-20 22:34:20 +02:00
scrawl
1636fd66db
Don't add creature base damage to weapon damage (UESP was wrong)
2014-07-20 22:26:26 +02:00
Marek Kochanowicz
4d79034dbf
correctly handling the nestedTable for undo (but removing and adding
...
rows in proper QT way is still TODO)
2014-07-20 18:52:35 +02:00
scrawl
6d794dac69
Add missing messagebox for spell lock and unlock success
2014-07-20 17:09:55 +02:00
scrawl
9897f14c3c
Don't block when actor is paralyzed
2014-07-20 16:52:57 +02:00
scrawl
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f
Consider Shield spell effect for creature armor rating
2014-07-20 14:41:39 +02:00
scrawl
691ba02115
Reduce wepaon condition even if attack misses
2014-07-20 14:12:27 +02:00
MiroslavR
0f2305ae43
Clear selected spell when window manager is cleared
2014-07-20 13:07:47 +02:00
scrawl
63fd04882a
Make sure crime gold discounts don't reduce price to zero
2014-07-19 23:49:54 +02:00
MiroslavR
d5381e1bc4
Dynamically resize skill widgets to fit their contents ( Fixes #1610 )
2014-07-19 14:04:38 +02:00
Marek Kochanowicz
0017fc68ef
fixed ctor of nestedwrapper (missing initialization of member data field)
2014-07-19 13:08:28 +02:00
Marek Kochanowicz
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
2014-07-18 18:26:22 +02:00
Marc Zinnschlag
6a3ff211b1
automatically get target ID at InterpreterContext construction, if a reference is available
2014-07-18 09:57:47 +02:00
Marc Zinnschlag
4fb897f2f8
added missing getId functions to classes derived from MWWorld::Class
2014-07-18 09:56:58 +02:00
scrawl
d4ffd30f98
Implement Rank filter with no faction given ( Fixes #1660 )
2014-07-17 20:57:37 +02:00
scrawl
f9a39138cc
Add missing endline
2014-07-17 16:16:14 +02:00
scrawl
08ce6ed7fb
Attempt to restack item after repair or recharge ( Fixes #1656 )
2014-07-17 16:16:06 +02:00
Marc Zinnschlag
27c84d6cb7
the reference for a targeted script is now determined when needed instead of at the start of the script execution
2014-07-17 13:36:55 +02:00
Marek Kochanowicz
16292bf23e
removed useless todo statments.
2014-07-17 13:03:53 +02:00
Marek Kochanowicz
5671a4b8e2
corrected include to follow our standards.
2014-07-17 12:58:14 +02:00
Marek Kochanowicz
6e07568b43
Corrected syntax.
2014-07-17 12:56:51 +02:00
Marek Kochanowicz
ca73ce3fe2
trying to fix indending
2014-07-17 12:41:43 +02:00
Marc Zinnschlag
dba6a9ebff
run targeted scripts with an implicit reference based on the ID given
2014-07-17 09:15:41 +02:00
Marek Kochanowicz
f0c6ef185e
Nest columns directly, created NestedColumn class and NestColumn.
2014-07-16 13:13:22 +02:00
scrawl
20a0040bdb
Apply elemental shield magnitude to element resistance ( Closes #1121 )
2014-07-16 10:58:28 +02:00
scrawl
123157b216
Implement elemental shield damage to attacker (Feature #1121 )
2014-07-16 10:58:28 +02:00
scrawl
f43a10b7b9
Adjust disease contraction according to Hrnchamd's research
2014-07-16 10:58:21 +02:00
Marc Zinnschlag
75ab8de3d2
added opcode for running scripts with explicit references (targeted scripts)
2014-07-15 13:26:04 +02:00
Marc Zinnschlag
e9377ad5c4
include targeted script data in saved games
2014-07-15 13:05:38 +02:00
Marc Zinnschlag
8241ee59c3
modified GlobalScripts data structures to accommodate targeted script data
2014-07-15 12:59:02 +02:00
Marc Zinnschlag
1a1f5dfc4a
added tooltips to dialgoue subview buttons
2014-07-15 12:46:52 +02:00
scrawl
5839691530
Check for container organic flag before checking weight ( Fixes #1654 )
2014-07-14 17:27:36 +02:00
scrawl
6cd739678a
Fix dangling model pointer after reference cleanup ( Fixes #1653 )
2014-07-14 16:53:58 +02:00
Marc Zinnschlag
517b27e29a
Merge branch 'toolbar'
2014-07-14 14:18:08 +02:00
Marc Zinnschlag
0430558c3c
fixed focussed button in mode tool panel when panel is opened
2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38
new keyboard shortcut (T): move focus from toolbar to scene widget
2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856
new keyboard shortcut (T): move focus from scene widget to toolbar
2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c
when scene toolbar gains focus, focus first button
2014-07-14 11:06:12 +02:00
scrawl
7c7c71428a
Don't crash if certain class doesn't exist
2014-07-13 14:26:59 +02:00
Marc Zinnschlag
c2ea8f3f0a
added self-adjusting tooltips to the top-level toolbar buttons
2014-07-13 14:21:50 +02:00
Marek Kochanowicz
0252d021eb
removed pointless member field
2014-07-13 12:37:05 +02:00
Marc Zinnschlag
26f87f5d23
added navigation mode button tooltips
2014-07-13 12:15:05 +02:00
Marek Kochanowicz
4b4a72c3b6
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-07-13 10:52:39 +02:00
Marc Zinnschlag
e855e55318
added tooltip to user settings button on startup window
2014-07-13 10:52:33 +02:00
scrawl
c9150c9680
Initialize character skeleton to a suitable pose ( Fixes #1473 )
2014-07-13 10:40:48 +02:00
slothlife
d0e1210dd7
Fix for Bullet debug assert
...
After changing the vector comparison to squaredDistance, the threshold
for rejecting similar vectors needed to be readjusted.
2014-07-13 01:39:42 -05:00
scrawl
8b404ee255
Fix not being able to exit dialogue using Escape when a Goodbye link appears
2014-07-13 06:42:24 +02:00
Marc Zinnschlag
cae0c4a044
Merge remote-tracking branch 'scrawl/master'
2014-07-12 21:19:15 +02:00
scrawl
f2799ea1d9
Reset item model when reference is reset ( Fixes #1628 )
...
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
2014-07-12 18:53:22 +02:00
scrawl
40c3fa0dc1
Fix travis
2014-07-12 18:53:22 +02:00
scrawl
d63dd88113
Apply autocalc corrections to player starting spells
2014-07-12 18:53:16 +02:00
scrawl
fd3f109362
Fix underflow for NPCs with level 0
2014-07-12 18:53:16 +02:00
scrawl
a1639371d3
Fix rounding for skill/attribute autocalc
2014-07-12 18:53:16 +02:00
scrawl
83819b2894
Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences.
2014-07-12 18:53:15 +02:00
scrawl
479f248c1d
Use spell effect range type, not base effect (applied to spellcasting code)
2014-07-12 18:53:15 +02:00
scrawl
b4f8edc186
Use spell effect range type, not base effect
2014-07-12 18:53:15 +02:00
scrawl
1c41ce9b9d
Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)
2014-07-12 18:53:15 +02:00
scrawl
d91d599269
Disable quickload when in modal dialog ( Fixes #1641 )
2014-07-12 06:43:04 +02:00
scrawl
048d07b299
Show owner of doors in tooltip
2014-07-11 11:57:21 +02:00
scrawl
5fbce67b9d
Don't redraw ItemView if the size did not change
2014-07-11 04:30:44 +02:00
scrawl
53c70dbdaa
Exit dialogue when going to jail ( Fixes #1635 )
2014-07-11 04:25:56 +02:00
Marc Zinnschlag
490442cf62
added lighting mode tooltips
2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40
replaced custom toolbutton push flag with type enum
2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83
toolbar tooltip system
2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e
fixed scene subview focus problem
2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884
set focus when opening a toolbar panel
2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac
use custom button on toolbar (top level)
2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b
added push mode and icon-less push button constructor
2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1
removed text argument from button constructor, because toolbar buttons will always be icon only
2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878
return/enter activate the selected button
2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8
make buttons in mode panel act like radiobuttons
2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390
custom push button
2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5
SceneWidget::setLighting was missing an update call
2014-07-10 10:09:21 +02:00
scrawl
0704fa2b3d
Reset local rotation axis in SetAngle ( Fixes #1630 )
2014-07-09 10:23:01 +02:00
Marc Zinnschlag
3333f67830
removed a left-over marker
2014-07-08 12:53:25 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +02:00
scrawl
df80c436fb
Fix compile error for OPENMW_USE_FFMPEG=0
2014-07-08 10:30:46 +02:00
scrawl
742d008765
Fix initializing CharacterController with fists or spell equipped
2014-07-08 10:30:46 +02:00
scrawl
a3a8f4da70
More font hackery. Will it ever end?
...
Fixes #1606
2014-07-08 10:30:45 +02:00
scrawl
0a2d5d34bc
Cancel queued view mode switch when switching view mode ( Fixes #1618 )
2014-07-08 10:30:45 +02:00
scrawl
ee81698089
Always control movement by animation except for first person or in-air
2014-07-08 10:30:45 +02:00
Marc Zinnschlag
1548f4670a
drop part of resources drag and drop
2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d
more refactoring
2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c
added separate display type for colours
2014-07-08 09:08:01 +02:00
Marc Zinnschlag
b2ce94f28a
fixed exceptions
2014-07-08 08:56:28 +02:00
Marc Zinnschlag
b2c2342988
some refactoring (removing redundant code)
2014-07-08 08:53:39 +02:00
Marc Zinnschlag
c1bbefb840
enable dragging from resources tables
2014-07-07 15:20:05 +02:00
Marek Kochanowicz
72392ad68c
emit data changed signal when adding and removing the nested row
2014-07-07 12:22:04 +02:00
Marek Kochanowicz
d221486a14
Fixed problem in the idtable.
2014-07-07 12:16:53 +02:00
Marc Zinnschlag
df6996d4ae
filter resources files based on extension
2014-07-07 11:34:24 +02:00
Marek Kochanowicz
3262f8d774
make dtor virtual
2014-07-07 10:27:48 +02:00
Marek Kochanowicz
acc8432705
fixed segfault
2014-07-07 10:23:40 +02:00
Marc Zinnschlag
19828df799
added subviews for resources tables
2014-07-05 15:51:17 +02:00
Marc Zinnschlag
b2c957a56f
added resources tables
2014-07-05 15:50:47 +02:00
Marc Zinnschlag
42db9a5091
make modification column optional in table views
2014-07-05 15:50:17 +02:00
Marc Zinnschlag
4f6c7b0e84
resolved UniversalId naming ambiguity
2014-07-05 15:07:17 +02:00
Marc Zinnschlag
e171babd2f
added Feature_Constant to IdTable
2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
2014-07-04 13:25:56 +02:00
Marc Zinnschlag
63d0fdee7f
removed leftover data member
2014-07-04 12:48:18 +02:00
Marc Zinnschlag
879ab49e9c
added resources manager
2014-07-04 12:46:57 +02:00
Marc Zinnschlag
1ce60fa13b
Merge branch 'tables'
2014-07-03 12:03:21 +02:00
Marc Zinnschlag
1745335982
body part table fix: forgot to include body parts in ID listings
2014-07-03 12:03:01 +02:00
Marek Kochanowicz
851d2f061b
Removed qdebug calls (forgot about those).
2014-07-03 11:14:51 +02:00
Marc Zinnschlag
607445d40c
Merge branch 'editorfixes'
2014-07-03 10:34:23 +02:00
Marc Zinnschlag
9ce92302d7
interpret empty filter strings as no filter instead of a broken filter ( Fixes #1311 )
2014-07-03 10:22:39 +02:00
Marek Kochanowicz
0bfc408ea2
removed debug code
2014-07-02 14:10:11 +02:00
Marek Kochanowicz
bb675ff41d
Removing rows and undo works
2014-07-02 13:29:25 +02:00
Marek Kochanowicz
77afb754e5
adding new rows works
2014-07-02 13:13:03 +02:00
scrawl
6cd6578a88
Handle Deleted moved references (Bug #1613 )
2014-07-01 21:47:27 +02:00
scrawl
e666ddfe18
Fix list of moved references being discarded ( Fixes #1613 )
2014-07-01 21:42:11 +02:00
scrawl
df62c06acf
Print exterior grid position in betaComment
2014-07-01 21:41:23 +02:00
Marek Kochanowicz
c50cecdc64
Small cleanup
2014-07-01 21:13:27 +02:00
Marek Kochanowicz
fcd082c6a5
added option to add or remove rows
2014-07-01 20:52:27 +02:00
Marc Zinnschlag
37a2b48fa2
added missing type columns to body part table
2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49
added body part table
2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18
added other missing columns for enchantment table; fixed dialogue subviews for enchantment records
2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a
added enchantment type column to enchantment table
2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b
Merge branch 'editorfixes' into tables
2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6
added enchantments table
2014-06-30 20:40:34 +02:00
Marek Kochanowicz
172f1a1301
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-06-30 20:06:44 +02:00
Marek Kochanowicz
3ebc469f04
prepering for merge
2014-06-30 20:06:18 +02:00
Marc Zinnschlag
4f08efc4d7
added missing combat, magic and stealth columns for creatures (Feature #1312 )
2014-06-30 19:51:59 +02:00
scrawl
205e039a39
Allow modCurrent instructions to decrease below zero (Bug #1589 )
2014-06-30 17:58:08 +02:00
Marc Zinnschlag
a25321f07e
update paged scene view according to changes made to cell records
2014-06-30 17:57:38 +02:00
scrawl
2506c16bf5
Add a dummy GetStat function returning 0 ( Fixes #1589 )
2014-06-30 17:49:01 +02:00
Marc Zinnschlag
5fb2e1a877
do not render deleted exterior cells in scene view
2014-06-30 17:33:03 +02:00
Marek Kochanowicz
6dc199743c
store undoStack in the nestedtable
2014-06-30 16:03:38 +02:00
Marek Kochanowicz
c96d48fb91
Nested model supports editing now.
2014-06-30 14:12:57 +02:00
Marek Kochanowicz
5eac32e3d3
added nestedtable for displaying nested content.
2014-06-30 13:09:10 +02:00
Marc Zinnschlag
af59106533
for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files)
2014-06-30 12:35:34 +02:00
scrawl
85a1f9d37b
Fall back to resolution selected from list when switching to fullscreen ( Fixes #1599 )
2014-06-30 00:08:39 +02:00
Marek Kochanowicz
8c6a0d9a4f
created new files
2014-06-29 21:12:31 +02:00
scrawl
082b6125a9
Fix crash during spell creation when an effect targeting a skill/attribute doesn't have one assigned yet ( Fixes #1598 )
2014-06-29 17:02:29 +02:00
scrawl
5ec96c5394
Add missing visibility flags
2014-06-29 16:02:43 +02:00
scrawl
1de406cb6d
Catch exception from invalid scripts during save&load ( Fixes #1590 )
2014-06-29 16:02:43 +02:00
Marc Zinnschlag
b5650f5d4f
Merge branch 'cells'
2014-06-29 16:00:26 +02:00
Marc Zinnschlag
2fe2def64c
added cell rendering in paged worldspaces
2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8
added cell rendering in unpaged worldspaces
2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +02:00
Marc Zinnschlag
604509ac7e
Merge remote-tracking branch 'scrawl/master'
2014-06-29 10:34:48 +02:00
scrawl
e25fa6c157
Refactor non-distant land terrain path to a grid based implementation ( Fixes #1562 )
2014-06-29 02:42:36 +02:00
scrawl
4949aa1fbb
Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)
2014-06-28 18:21:56 +02:00
scrawl
10ef0a34d9
Update effects even when main animation is paused ( Fixes #1585 )
2014-06-28 17:54:14 +02:00
scrawl
f929004635
Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm)
2014-06-28 17:44:52 +02:00
scrawl
65e36793fc
Fix messagebox on crash showing wrong path
2014-06-28 15:31:55 +02:00
scrawl
3b2358888b
Attempt to fix player position after using coc/coe
2014-06-28 15:19:32 +02:00
scrawl
8e361bb879
Make targeted spells collide with water ( Fixes #1500 )
2014-06-28 14:49:07 +02:00
scrawl
92f5898b32
AiWander: Make sure we have 8 idle values ( Fixes #1583 )
...
The AiWander instruction may specify more (or less) than 8.
2014-06-28 14:22:27 +02:00
Marc Zinnschlag
c35b87de95
various Object class fixes
2014-06-28 11:25:28 +02:00
scrawl
523c2715e3
AiCombat: Handle Start to Min and Min to Max durations of 0 (found in Riekling animation)
2014-06-28 01:31:34 +02:00
scrawl
516014c071
Trigger hit on start key if there's no hit key ( Fixes #1574 )
2014-06-28 01:06:53 +02:00
scrawl
911bd0e340
Use walk animation as fallback if there's no run animation ( Fixes #1578 )
2014-06-28 00:07:13 +02:00
scrawl
78d02d97da
Find text keys in reverse (Bug #1578 )
2014-06-28 00:06:08 +02:00
scrawl
2451eead8a
Some additional wrapping for faction rank instructions
2014-06-27 20:07:19 +02:00
scrawl
7f26843dc3
Reset key focus when the key focus widget is hidden ( Fixes #1568 )
2014-06-27 19:35:41 +02:00
scrawl
37c85f0af4
Don't update object root controllers with no time source ( Fixes #1564 )
2014-06-27 19:35:41 +02:00
scrawl
6a900e0aad
Update weapon and shield controllers for creatures
2014-06-27 19:35:41 +02:00
Marc Zinnschlag
3541d03809
fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)
2014-06-27 12:29:23 +02:00
Marc Zinnschlag
099c406226
Merge branch 'objects'
2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f
make preview watch for changes in modification state of relevant records
2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024
disabled preview function for deleted records
2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09
fixed some function names
2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +02:00
Marc Zinnschlag
3100206b28
replaced an assert with an exception
2014-06-27 08:37:41 +02:00
scrawl
8b340ddd5e
Implement slower movement against storms ( Closes #41 )
2014-06-27 03:22:00 +02:00
scrawl
07d0f4458d
Rotate clouds/particles to come from red mountain ( Fixes #245 )
2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70
Make flying creatures fall when paralyzed ( Fixes #1494 )
2014-06-27 03:21:50 +02:00
scrawl
e19bbfd1b5
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text ( Fixes #1543 )
2014-06-26 20:49:22 +02:00
scrawl
865f4648b0
Fix flying creatures not falling on death
2014-06-26 17:15:07 +02:00
scrawl
44fd526c98
Don't show disposition bar for creatures
2014-06-26 15:36:19 +02:00
scrawl
4aab4e1c26
Ignore item condition when determining value, except in trade ( Fixes #1557 )
2014-06-26 14:59:33 +02:00
scrawl
869fa08a32
Fix disarming a trap when key is used ( Fixes #1556 )
2014-06-26 14:30:19 +02:00
scrawl
e5254ff8ef
Set render queue for rain
2014-06-26 14:26:53 +02:00
Marc Zinnschlag
06e89d8bd3
reduced loading batch size (making the the loading progress bars a bit more responsive
2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec
display record count in loading window
2014-06-26 11:41:21 +02:00
scrawl
7b1e1d03d8
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/sky.hpp
2014-06-26 04:29:03 +02:00
scrawl
697329f128
Fix crash for in_dagoth_bridge00.nif ( Fixes #1561 )
...
This one is causing trouble by using an unnamed node, will need some more work.
2014-06-26 03:33:09 +02:00
scrawl
15b486e149
Don't trigger changed flag if a script with no locals is configured
2014-06-26 01:21:15 +02:00
scrawl
2d17d8f61a
Savegame: start in (0,0) cell if player's cell no longer exists
...
This happens frequently when saves are loaded that were created in a different MW language.
2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99
CellRef uninitialized fixes
2014-06-25 19:52:14 +02:00
scrawl
f6a568c995
Implement rain (Feature #41 )
2014-06-25 18:20:21 +02:00
scrawl
09926a86cb
Fix comparing outdated listener position with up-to-date cell ( Fixes #1499 )
2014-06-25 18:10:26 +02:00
scrawl
2bcbc6ab7d
Potential crash fix, either way should have a better error message now
2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47
Merge remote-tracking branch 'scrawl/master'
2014-06-25 09:58:00 +02:00
scrawl
ec64f1a53a
Reset accumulation root when its animation finishes
...
Fixes a position flicker after standing up from knockdown.
2014-06-25 02:46:39 +02:00
scrawl
ee098de0a6
Don't ignore lighting values of particles not attached to a character
2014-06-25 01:14:21 +02:00
scrawl
b259c5def2
Make GetFactionReaction garbage argument optional
2014-06-25 01:12:57 +02:00
scrawl
3d9bdad8ba
Correct run speed for creatures (by Hrnchamd - Fixes #1136 )
2014-06-25 00:51:02 +02:00
scrawl
7f1d0fc2a2
Fix disposition for npcs in same faction, by Hrnchamd
2014-06-25 00:12:51 +02:00
scrawl
8a8ecce1e5
Fix some uninitialized data written to savegames
2014-06-25 00:11:25 +02:00
Marek Kochanowicz
a0146e2e28
Added undo for delete command
2014-06-24 19:34:02 +02:00
Marek Kochanowicz
d73f4cbd7b
added add nested command
2014-06-24 19:19:40 +02:00
Marek Kochanowicz
7b5bf637ab
Changes needed to add new nested row.
2014-06-24 19:03:29 +02:00
scrawl
693a097b21
Implement idlestorm animation (Feature #41 )
2014-06-24 18:37:38 +02:00
scrawl
36135293e8
Fix moving object from an inactive to another inactive cell
2014-06-24 15:29:36 +02:00
scrawl
b52977e44c
Add dummy Face implementation for now (Bug #1541 )
2014-06-24 15:09:13 +02:00
scrawl
36132e054a
Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41 )
2014-06-24 15:00:15 +02:00
Marek Kochanowicz
befdeb1889
use beginRemovRow when removing nested row.
2014-06-24 12:42:49 +02:00
Marek Kochanowicz
7430e1e1bb
Added delete nested rows command (undo still needs to be done)
2014-06-24 12:35:26 +02:00
Marek Kochanowicz
c45061614b
Added code to delete nestedRows
2014-06-24 12:21:40 +02:00
Marek Kochanowicz
88c5288eaf
Create removeNestedRow (for deleting rows of nested columns)
2014-06-24 10:22:42 +02:00
scrawl
1d46ac19ff
Fix being able to activate through terrain
2014-06-24 02:24:32 +02:00
scrawl
320ab1b2c1
Don't say voice when using startcombat for a dead actor ( Fixes #1542 )
2014-06-23 22:00:17 +02:00
scrawl
0b34d8d2fd
Add support for animated collision shapes ( Fixes #1549 )
2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
64a4c2785e
Fix water walking
2014-06-22 22:30:30 +02:00
scrawl
d296c6e9b7
Handle fog density values of 0 (Bug #1549 )
2014-06-22 22:30:29 +02:00
scrawl
cbec0ffaee
Exception fix
2014-06-22 22:30:29 +02:00
slothlife
ead801f2d0
Fix for compiling Win32 debug.
2014-06-21 21:15:41 -05:00
scrawl
e23a7694f3
Don't throw exception when using ModDisposition on creatures ( Fixes #1548 )
2014-06-22 00:34:32 +02:00
scrawl
e002acdeae
Physics: Create actor shapes outside of BulletNifLoader
...
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
2014-06-21 23:37:16 +02:00
scrawl
98329a94b4
Add case sensitivity workaround for spine bones ( Fixes #1547 )
2014-06-21 19:54:12 +02:00
scrawl
a4ce9d6a7f
Always show the script name when a script fails to compile
2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6
Implement toggleMenus
2014-06-20 18:51:00 +02:00
Marek Kochanowicz
894c98ee89
Added extra columnid type to use for ID of the inventory item
2014-06-20 14:22:40 +02:00
scrawl
ad0a182b7e
Improve error message for unknown cells
2014-06-19 20:08:53 +02:00
scrawl
091f9a8fdc
Optimize global map render slightly
2014-06-19 19:14:59 +02:00
scrawl
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
2014-06-19 19:03:12 +02:00
Marek Kochanowicz
a076798f8f
Quick and dirty prototype of actual nested header data implementation
2014-06-19 18:46:09 +02:00
Marek Kochanowicz
256b075914
getting rid of not needed abstract class
2014-06-19 16:11:31 +02:00
scrawl
11b05c352f
Fix exception when casting Bound Gloves spell
2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed
Merge remote-tracking branch 'scrawl/master'
2014-06-19 10:35:28 +02:00
scrawl
4648524df4
Improve getLOS (use eye level). Also, don't crash when used with non-actors.
2014-06-19 04:53:25 +02:00
scrawl
185ff279a3
Add missing sound effect for mages guild transport
2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8
Fix very slow movement on some creatures, e.g. rats (Bug #1136 )
...
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
2014-06-19 02:36:10 +02:00
scrawl
6760f4c897
Make cached GMSTs in MWClass::Npc/Creature safer
2014-06-19 02:09:46 +02:00
scrawl
4234c70232
Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers)
2014-06-19 02:00:40 +02:00
scrawl
d878456d0f
Don't add an extra path separator
2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a
Don't crash in StatsWindow for invalid faction rank values
...
PcRaiseRank: don't allow to raise rank beyond max rank
2014-06-18 23:50:55 +02:00
scrawl
2193977eec
Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway
...
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
2014-06-18 22:59:18 +02:00
scrawl
4e71db7081
Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.
2014-06-18 21:39:17 +02:00
Marek Kochanowicz
873cfcf447
implemented basic headerData (still work in progress)
2014-06-18 17:34:21 +02:00
scrawl
8a4227ec38
Heal player while in jail
2014-06-18 16:57:54 +02:00
scrawl
9a6737073f
Fix broken swimdeath in first person
2014-06-18 16:57:54 +02:00
scrawl
e95483c40f
Fix crash for on target spells cast by non-actors ( Fixes #1529 )
2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719
Make Weakness effects apply to all subsequent effects within the same spell ( Fixes #1150 )
2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39
Fix being able to steal undetected just after invisibility breaks
2014-06-18 16:57:53 +02:00
scrawl
80f66e2157
Fix crash when avformat_open_input fails ( Fixes #1522 )
2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55
Fix level up dialogue layout ( Fixes #1393 )
2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc
Disable QuickKeysMenu in werewolf form
2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956
Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked)
2014-06-18 16:57:53 +02:00
Marek Kochanowicz
b63f2f4cd5
Actually using new nestedmodel
2014-06-18 16:56:37 +02:00
scrawl
1dc9e151cb
Count werewolf kills ( Fixes #1525 )
2014-06-18 16:56:36 +02:00
Marek Kochanowicz
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c
Column is responsible for telling that it can nest columns now.
2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015
Nested table sits inside it's own layout now.
2014-06-17 20:12:14 +02:00
scrawl
1244da85df
Make Detect Life spell detect NPCs when in werewolf form ( Fixes #1527 )
2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c
Fix broken AI movement on Z axis
2014-06-17 15:25:54 +02:00
Marek Kochanowicz
5bee682bb3
modified: ../../view/world/dialoguesubview.cpp
2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5
Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
...
into NonTableFields
I have no idea what I'm doing
Conflicts:
apps/opencs/model/world/idtable.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/model/world/refidadapterimp.hpp
2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754
Merge branch 'dialog-fix' into NonTableFields
...
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marc Zinnschlag
2683aa9503
Merge remote-tracking branch 'filkry/bug640_luminescent_water'
2014-06-17 13:08:06 +02:00
Marek Kochanowicz
187fccc8cc
Merge branch 'dialog-fix' into NonTableFields
2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61
Trying to merge.
2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c
fixed base flag in content file loader code
2014-06-17 11:01:17 +02:00
Marek Kochanowicz
bbe7854968
Corrected formatting to follow our standard better.
2014-06-17 10:46:54 +02:00
scrawl
2477456f99
Implement Murder crimes and OnMurder instruction ( Fixes #1315 )
2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba
Add delay to sneak icon update and skill progress ( Fixes #1321 )
2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555
Use fFight<Crime> GMSTs to control attacks in response to crimes
2014-06-17 04:05:27 +02:00
scrawl
8ac019611d
Fix Potion use action removing the potion even when the action is not executed ( Fixes #1521 )
2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47
Fixed underwater issue
...
I had accidentally deleted some interpolation parameters.
2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9
WIP fix
...
Bug is fixed, but appears to have broken vision underwater. Notes:
+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
2014-06-16 17:08:02 -04:00
scrawl
28feb260eb
Implement disposition/distance based aggression ( Fixes #1520 )
2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7
Fix positionCell not properly teleporting actors from inactive to active cells ( Fixes #1516 )
2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42
Fix getDistance not detecting references in inactive cells properly
2014-06-16 20:05:47 +02:00
Marek Kochanowicz
d6288a8055
Remove unneded revert and delete slots
2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a
refactoring dialogue subview
2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae
Fixed complitaion.
2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb
Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix
2014-06-16 09:44:49 +02:00
scrawl
47bd170d7e
Crashcatcher: create temp file in /tmp, not working directory (which may not have write access)
2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9
Fix crash when stealing items with the owner not around ( Fixes #1512 )
2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0
Allow following NPCs to fast-travel ( Fixes #1501 )
2014-06-16 03:17:31 +02:00
scrawl
78f30e2970
Fix a journal layout bug
2014-06-16 02:52:25 +02:00
scrawl
345ba99c17
Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497 )
2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8
Fix weapon incorrectly showing when saving and loading with spell equipped
2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f
Clear MyGUI's clipboard, since we don't want to use it ( Fixes #1277 )
...
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71
Add items to player inventory upon drag start ( Fixes #1507 )
2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1
Attempt to open companion window if no greetings are found (Bug #1507 )
2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d
Make Bipedal creatures always able to walk and swim ( Fixes #1509 )
...
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e
Savegame: Store AiSettings and summoned creatures
...
CreatureStats state is now completely stored (Closes #1174 )
Also play VFX_Summon_Start and VFX_Summon_End visual effects.
2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f
Disable fProjectileThrownStoreChance when shooting at player ( Fixes #1490 )
2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce
Implement BetaComment instruction (dumps reference info)
2014-06-15 16:11:16 +02:00
scrawl
326c747508
Don't run scripts when in pause menu ( Fixes #1495 )
2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b
Clear message boxes in windowmanager cleanup ( Fixes #1496 )
2014-06-15 14:18:16 +02:00
scrawl
e288437885
Disable all other animations on death ( Fixes #1483 )
2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0
Sort using ciLess, not ciEqual
2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa
Don't allow scripted dialogue with dead actors ( Fixes #1493 )
2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18
Remove a squareroot in pathfinding
2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee
Move AiWander arrival check to time-critical section
2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614
Consider moved references in CellStore::listRefs
2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f
Fix incorrect trigger of change flag for static doors
2014-06-15 14:18:16 +02:00
scrawl
395f98e476
Fix triggering changed flag for all references when cell is visited
...
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.
Also clean up RefData interface slightly.
2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f
Don't clear AiSequence if there are no saved packages (eg for old savegames)
2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434
Merge remote-tracking branch 'mrcheko/master'
2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa
fix bug when you were able to kill somebody from large distance without
...
being spotted
2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96
fix http://bugs.openmw.org/issues/1340
...
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6
Use Ogre::Math::PI
2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac
Another way of getting M_PI
2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7
Fix missing M_PI define on Windows
2014-06-14 13:29:55 +02:00
scrawl
832f1a4857
Fix merge mistake
2014-06-14 02:31:01 +02:00
scrawl
0637cde267
Bug #1417 : Make sure to reset all position/rotation fields when placing items
2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e
Bug #1417 : Use fmod to wrap local rotations (more efficient and robust)
2014-06-13 23:40:35 +02:00
scrawl
54d8606b78
Fix logging fatal exceptions to cerr, and log them to openmw.log
2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196
Merge remote-tracking branch 'origin/master'
2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620
fix bug http://bugs.openmw.org/issues/1470
2014-06-13 23:22:00 +04:00
scrawl
3334078d4d
Add first person meshes to refraction render ( Fixes #1481 )
2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-06-13 19:31:33 +02:00
scrawl
8114f48469
Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame.
2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27
Merge remote-tracking branch 'upstream/master'
...
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case
Conflicts:
apps/openmw/mwmechanics/character.cpp
2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2
Savegame: Store death counter ( Fixes #1477 )
2014-06-13 02:26:53 +02:00
scrawl
797134aa51
Handle activation scripts in AiActivate ( Fixes #1478 )
2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe
Fix a sign error
2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8
Show base item value in tooltip, not real value ( Fixes #1469 )
2014-06-13 02:26:52 +02:00
scrawl
604d5ac000
Fix console reference label not resetting when loading save
2014-06-13 02:26:52 +02:00
mrcheko
df7213185f
warning fixes
2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070
Merge remote-tracking branch 'cc9cii/master'
2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6
For compiling with MSVC 2012
2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3
Cell merge fix (reference context position was not saved correctly)
2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
2014-06-11 19:47:42 +02:00
scrawl
013916fca3
Fix for broken physics in exteriors ( Fixes #1446 )
...
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7
Don't play the same music track twice in a row ( Fixes #746 )
2014-06-11 18:11:16 +02:00
scrawl
d60df66811
Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108 )
2014-06-11 16:56:41 +02:00
scrawl
73be457805
Merge ESM::Cell fields by subrecord
...
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +02:00
Marc Zinnschlag
2faeceacfa
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/main.cpp
2014-06-11 08:51:18 +02:00
scrawl
0f31e31088
Allow opening journal during dialogue ( Fixes #1460 )
2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8
Handle Quadratic and Linear attenuation independently ( Fixes #1456 )
2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e
Write logs in log directory
...
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec
split getStartTime
2014-06-11 00:20:46 +04:00
scrawl
07d20c212b
Fix crash activating quick key 1
2014-06-10 21:34:47 +02:00
scrawl
10758d6297
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b
Fix character selection caption when there is no character in settings.cfg
2014-06-10 19:01:18 +02:00
scrawl
5a955279bb
Fix main menu background showing when resizing window during load
2014-06-10 18:49:42 +02:00
scrawl
3788fb042e
Implement MenuTest script instruction ( Fixes #1454 )
2014-06-10 18:49:42 +02:00
scrawl
6ba112619a
Fix dropped items ending up inaccessible when standing in objects with no collision ( Fixes #1441 )
2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
a90245147b
Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor ( Fixes #1423 )
2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1
Implement text replacement for journal topic responses ( Fixes #1429 )
2014-06-10 15:42:50 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
scrawl
4119038f1d
Remove an old workaround ( Fixes #1458 )
2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5
Combat music; some minor combat fixes
2014-06-10 14:20:29 +04:00
scrawl
65d5311037
Revert "Don't try to show exceptions in a message box if SDL was not initialized"
...
According to SDL docs, "This function may be called at any time, even before SDL_Init()".
Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.
This reverts commit 39eea24dc3
2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490
Don't list non-usable items in QuickKeysMenu selection ( Fixes #1427 )
2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc
Savegame dialog: Grey out buttons if no save is selected
2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
2014-06-10 02:27:38 +02:00
scrawl
881ae33b74
Don't allow Creatures with no movement abilities to move ( Fixes #1457 )
2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4
Move video skip detection to WindowManager
...
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
2014-06-10 01:57:54 +02:00
scrawl
7721e54191
Use descriptive names for save files and character folders ( Fixes #1449 )
2014-06-10 00:22:00 +02:00
scrawl
e796fa2313
Add another french morrowind font workaround ( Fixes #1447 )
2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef
old bug + comment fix
2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067
merge openmw master
2014-06-09 22:37:49 +04:00
Marek Kochanowicz
8763309a1b
reformatting to make code easier to read
2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9
check if index is valid before attempting to use it
2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac
correcting problems
2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644
Merge remote-tracking branch 'master/refs' into dialog-fix
...
Conflicts:
CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/world/dialoguesubview.cpp
2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3
subview does not store row number anymore
2014-06-09 11:37:48 +02:00
Marek Kochanowicz
21a1f6f4ae
working on the issue
2014-06-09 10:35:39 +02:00
Marek Kochanowicz
29231b8fc9
starting new branch
2014-06-09 10:26:53 +02:00
scrawl
1bab74a98d
Fix punishment for stealing 0 value items ( Fixes #1435 )
2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3
Change npc training skills to prefer skills with lowest ID if skill values are the same ( Fixes #1445 )
2014-06-09 03:40:14 +02:00
scrawl
a3752da79f
Store Always Run control state in settings
2014-06-08 19:50:39 +02:00
mrcheko
67abc60264
aiming to moving target in ranged combat ai
...
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
2014-06-08 20:59:26 +04:00
Marc Zinnschlag
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02:00
Marc Zinnschlag
b717e3fcb8
Merge remote-tracking branch 'filkry/bug1196jumpdialog'
2014-06-08 11:25:34 +02:00
scrawl
d2dca27067
Correct wrong assertions ( Fixes #1425 )
2014-06-08 11:25:10 +02:00
scrawl
b9dadff5a3
Recognize DELE subrecords at the end of the record ( Fixes #1414 )
2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d
Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )
2014-06-08 11:22:37 +02:00
scrawl
69855097ca
Fix an always true condition (Bug #1355 )
2014-06-08 11:22:37 +02:00
scrawl
b470596206
Handle failed savegame file operations ( Fixes #1413 )
2014-06-08 11:22:37 +02:00
scrawl
2ec324c80b
Consider all splash screens in the Splash folder ( Fixes #1416 )
2014-06-08 11:22:37 +02:00
scrawl
927ae00454
Fix code that stopped animation immediately after starting it, due to thinking it has completed ( Fixes #1370 )
2014-06-08 11:22:37 +02:00
slothlife
51c45796b1
Fix physics to not trigger Bullet assert in Debug
...
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02:00
Fil Krynicki
1d3a220d94
Added A_Use command to player controls.
2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Marc Zinnschlag
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02:00
Marc Zinnschlag
0668019c86
Merge remote-tracking branch 'scrawl/master'
2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6
Fix warning
2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd
Remove unused map
2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5
Don't reserve Pauldron parts for robes ( Fixes #1396 )
2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e
Fix for Bug #1409
2014-06-06 15:13:25 +02:00
scrawl
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
2014-06-06 15:08:44 +02:00
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
scrawl
40d6c8abf7
Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )
2014-06-06 02:24:51 +02:00
scrawl
d442853b3e
Allow opposite gender's parts as fallback ( Fixes #1404 )
2014-06-06 01:30:23 +02:00
scrawl
c36decb855
Fix being able to place items on top of actors ( Fixes #1403 )
2014-06-06 00:43:24 +02:00
scrawl
3d103f3785
Don't block hits when in hand-to-hand combat (shield not visible)
2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4
Don't use armor mitigation for fall damage
2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9
Fix AiCombat being incorrectly added to player ( Fixes #1356 )
2014-06-05 21:51:57 +02:00
scrawl
1173957e56
Fix item weight displaying as 1e+3 for Stendarr's Hammer
2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6
Add missing padding for item tooltip magic effects
2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1
Fix forced switch to third person on death not always working
...
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab
Fix crash when loading a savegame after dying ( Fixes #1389 )
2014-06-05 17:01:22 +02:00
scrawl
4e235516c3
Work around missing character in french morrowind font (Bug #1390 )
2014-06-05 16:16:16 +02:00
scrawl
85c9871178
Use question mark for not found glyphs in the font
2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9
Fix not reacting to quit request while video is playing
2014-06-05 15:52:02 +02:00
scrawl
c0f1449004
Cycle with equipped items if all slots are occupied ( Fixes #1395 )
2014-06-05 14:54:07 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
00775035af
Add missing hasItemHealth for lockpicks/probes ( Fixes #1385 )
2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f
Fix overlapping text in SpellWindow when the window is too small
2014-06-03 01:12:31 +02:00
scrawl
d777739425
Fix a crash on exit when projectiles were active
2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95
Fix for dereferencing past end of mGuiModes.
2014-06-02 17:21:13 -05:00
scrawl
577ed3943b
Show wallpaper when loading a savegame
2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31
Re-enable collision when an actor is resurrected
2014-06-02 20:45:25 +02:00
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +02:00
scrawl
996e49c534
Change CharacterManager to use list instead of vector
...
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
2014-06-02 20:24:35 +02:00
scrawl
68afac6a19
Fix large size_t being truncated to int
2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c
Merge remote-tracking branch 'slothlife/cmake-fixes'
2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0
Properly handle exceptions when saving the game
...
Add message boxes when an exception occurs while loading or saving the game
2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869
Silence a clang warning
...
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
2014-06-02 10:30:44 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a
Fix loading a savegame when some of its content files were disabled
...
Fixes #1380
2014-06-01 23:11:38 +02:00
Marc Zinnschlag
538aa6607e
Merge remote-tracking branch 'scrawl/master'
2014-06-01 10:25:53 +02:00
Fil Krynicki
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86
1196/1217 fix
...
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
2014-05-31 19:51:21 -04:00
scrawl
dcc0e2d105
When dialogue goodbye is forced, allow using either the red link or the goodbye button
...
Fixes #1373
2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4
Fix trade exploit
...
Using the Max Sale button it was possible to "invert" the buying/selling state.
2014-05-31 18:28:00 +02:00
scrawl
865486604f
Make trade disposition changes temporary again, as in vanilla
2014-05-31 13:57:07 +02:00
scrawl
a1bdf20958
Make trade balance label editable
2014-05-31 13:53:36 +02:00
scrawl
de7fcf0beb
Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item)
...
Fixes #1368
2014-05-31 13:45:47 +02:00
scrawl
16ac6e7aac
Merge DialInfo objects by subrecord instead of overwriting the object
...
Fixes #1360
2014-05-31 13:01:11 +02:00
Rohit Nirmal
4f4a37896e
Check if player's CellStore is non-NULL before configuring fog.
...
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
2014-05-30 22:37:13 -05:00
Fil Krynicki
6cc6172779
Update in response to comments.
...
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
2014-05-30 15:12:57 -04:00
scrawl
8761aa5795
Loop main menu video when it's finished playing
2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29
Small fix for menu background
2014-05-30 14:28:04 +02:00
Marc Zinnschlag
f5e587f566
Merge remote-tracking branch 'puppykevin/master'
2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548
silenced two warnings
2014-05-30 10:18:05 +02:00
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +02:00
pvdk
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
2014-05-30 02:50:17 +02:00
pvdk
0cc7c06262
Ensure the launcher is not shown when the wizard is run
2014-05-30 02:41:09 +02:00
pvdk
6348af586e
Fixed some problems with the launcher and the wizard
2014-05-30 02:12:48 +02:00
scrawl
b81c7d05c6
Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless)
...
Can still be used by editing the config file, however.
2014-05-29 23:16:36 +02:00
pvdk
a390dde818
Fixed importing configurations of existing installations
2014-05-29 21:17:49 +02:00
pvdk
2a6a26c0d0
Minor fixes
2014-05-29 21:02:06 +02:00
pvdk
88064f4946
Fix for MOC error due to Boost includes
2014-05-29 20:35:07 +02:00
Marc Zinnschlag
2f56b11530
Merge remote-tracking branch 'digmaster/master'
2014-05-29 18:57:16 +02:00
scrawl
6a882e1e8d
Don't show hidden factions in StatsWindow (e.g. Nerevarine)
2014-05-29 18:09:04 +02:00
Marc Zinnschlag
ae50632774
implemented cell and reference saving int OpenCS
2014-05-29 18:08:40 +02:00
pvdk
5af12d193a
Cleaned up old wizard stuff from launcher
2014-05-29 17:57:41 +02:00
scrawl
3b3b53d665
Support animated main menus (menu_background.bik)
...
Closes #1362
2014-05-29 17:24:25 +02:00
scrawl
a6788cfb0e
Support lights that do not have a model ( Fixes #1361 )
2014-05-29 16:44:50 +02:00
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +02:00
scrawl
95b3026c7e
Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game
2014-05-29 16:34:05 +02:00
Digmaster
03d7137655
Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button
2014-05-29 06:19:25 -04:00
Digmaster
a5cfa8a049
Removes add behavior when pressing escape while waiting.
2014-05-29 01:52:41 -04:00
scrawl
c6a4506ac2
Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2 )
2014-05-28 22:35:36 +02:00
Kevin Poitra
8516b837ff
Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."
...
This reverts commit b897080156
2014-05-28 15:04:35 -05:00
scrawl
41a04b9c65
Slightly adjust menu button position
2014-05-28 21:50:08 +02:00
scrawl
e9ab7c85c6
Fix exception when there are spaces in INI-imported color settings
2014-05-28 21:29:09 +02:00
Kevin Poitra
3f00f00426
Remove some debug code.
2014-05-28 14:20:04 -05:00
scrawl
18e24a2007
Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found)
...
Fixes #1357
2014-05-28 21:08:20 +02:00
Kevin Poitra
16a6edbd0e
Fix a possible crash due to a null pointer.
2014-05-28 12:58:45 -05:00
Marc Zinnschlag
f112c78858
Merge remote-tracking branch 'scrawl/master'
2014-05-28 19:47:36 +02:00
Kevin Poitra
251df73407
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-28 12:29:40 -05:00
Kevin Poitra
b897080156
Started implementing sound time tracking so we can have NPCs' mouths move as they talk.
2014-05-28 12:26:35 -05:00
scrawl
e68600eda2
Make Activate instruction work properly even when onActivate was not called in the same frame.
...
There are two major differences to the old implementation:
- Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
- The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes #1166 and #1346 .
2014-05-28 19:23:50 +02:00
scrawl
42ea43c3d1
Fix container scripts not getting removed properly on cell change
...
Broken by f99eda1a54
2014-05-28 18:45:07 +02:00
Marc Zinnschlag
bb011f278e
Merge remote-tracking branch 'cc9cii/master'
2014-05-28 14:45:57 +02:00
scrawl
56ff399f30
Say attack voiced dialogue *after* the target is set up
...
Required for the CreatureTargetted filter to function properly
2014-05-28 13:59:31 +02:00
cc9cii
bbe77d656a
Minor fixes from static analysis.
2014-05-28 21:15:50 +10:00
Arthur Moore
9be219beba
Fixes Bug #1348 "Evidence Chest unlocking when arrested."
2014-05-27 22:09:37 -04:00
Marc Zinnschlag
be39395ce7
Merge remote-tracking branch 'scrawl/master'
2014-05-27 21:09:24 +02:00
Digmaster
033f1850f9
Fixed crass on character creation, allowed some character creation windows to be Esc-able
2014-05-27 14:30:26 -04:00
Digmaster
060a50f94a
Fixed issue with QuickKeyMenu and ItemSelectionDialog
2014-05-27 13:50:24 -04:00
Fil Krynicki
91f4967614
Fix for bug 1196.
...
This bug would cause the player to jump when jump was assigned to
Space and they closed a dialog with Space. I tested vanilla
MW for behaviour and found that Jump was the only basic input which
MW does not allow when closing dialogs (i.e. if Space is assigned to
move forward, MW will move you forward after closing the dialog).
There were two reasons for the bug:
1) OpenMW GUI does not consume UI events
2) Jump occurs so long as key is down (not only on first key down)
To minimally fix the bug, I made it so that keypress events can be
consumed by the GUI and not passed along to the player control
input manager (1). However, if the player holds space, they will still
jump (as the subsequent key held events will be captured and cause
a jump).
Unfortunately, there is no idiomatic way that I could find in the
OpenMW input manager to perform events only on key down. Instead,
I introduced a variable which tracks whether the jump key has been
pressed for the first time within the current frame (2).
Note: I was initially concerned that limiting the jump event to
KeyDown and not Key Hold would cause issues with swimming,
levitating, or variable height jumping. However, after a bunch
of testing in vanilla MW and exploration of the OpenMW codebase
I could find nothing suggesting the need to capture the jump
key being held.
2014-05-27 13:12:27 -04:00
scrawl
0b45a9e6b2
Fix case folding for faction reaction from ESX records
2014-05-27 19:02:48 +02:00
scrawl
2b15b85af1
Fix position adjustment not working properly for rotated objects
2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85
Consider hit normal for item drop test ( Fixes #995 )
2014-05-27 17:39:04 +02:00
scrawl
f476aa4ade
Remove MyGUI color codes when copying to system clipboard
2014-05-27 17:07:14 +02:00
scrawl
49a6579d3a
Fixed esmtool
2014-05-27 15:37:04 +02:00
scrawl
3e2eed9269
Implement getFactionReaction function
...
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +02:00
Marek Kochanowicz
6720d85a04
fixed compilation, thanks greye
2014-05-27 14:50:21 +02:00
Marc Zinnschlag
27c795483b
Merge remote-tracking branch 'ace/win-build-fix'
2014-05-27 14:32:20 +02:00
Marek Kochanowicz
41db48720d
does not compile
2014-05-27 14:01:15 +02:00
scrawl
578adb4ef6
PcJoinFaction and friends: make sure the given faction exists
2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson
d3357cc279
The MSVC linker is really pedantic with this.
...
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...
unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
2014-05-27 13:27:18 +02:00
Marc Zinnschlag
1665822224
Merge remote-tracking branch 'puppykevin/master'
2014-05-27 12:42:48 +02:00
Marc Zinnschlag
e0ba9a4bf2
added reference collection stage to saving operation (preparation for cell saving)
2014-05-27 12:39:26 +02:00
Digmaster
2b3b11d848
Give access to the main menu when at a choice in dialogue
2014-05-27 05:33:25 -04:00
Digmaster
ee7b5fa5c2
Fixed crash when Esc-ing out of Save "are you sure" dialog.
2014-05-27 04:38:13 -04:00
Digmaster
e0356cf89d
Added support to close modal windows with Esc
2014-05-27 03:00:31 -04:00
Kevin Poitra
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
2014-05-27 01:47:57 -05:00
Marc Zinnschlag
9e21da9636
Merge remote-tracking branch 'scrawl/master'
2014-05-27 08:34:54 +02:00
Digmaster
e0d55116a4
Dims and disabled Goodbye button in dialogs when unavailable.
2014-05-27 00:30:37 -04:00
Digmaster
79d0ed64d9
Undo some changes I made in the past that shouldn't exist
2014-05-26 23:31:40 -04:00
Digmaster
1ca921d6e2
Merge remote-tracking branch 'upstream/master'
2014-05-26 23:26:23 -04:00
Digmaster
e3e51324a4
Esc button exits all non-modal GUI windows
2014-05-26 23:13:37 -04:00
scrawl
cf68f6da96
Fix ESX dependencies not being checked except for the first one
2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca
Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations)
2014-05-26 20:52:38 +02:00
scrawl
5660f283dd
Fix actor models incorrectly being rotated on X/Y axes
2014-05-26 20:52:38 +02:00
scrawl
0966755a0c
Store death animation index in CreatureStats
2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b
Merge remote-tracking branch 'scrawl/master'
2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
2014-05-26 17:34:36 +02:00
scrawl
f629307f60
Fix frame delay for sound listener position ( Fixes #1180 )
2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681
Fix potential NpcStats overwriting issue
2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65
minor cleanup and silenced a warning
2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19
Merge remote-tracking branch 'mrcheko/master'
2014-05-26 10:08:40 +02:00
Thomas
7697b9e868
Ensures nothing bad will happen if we try to lock a door that never had a lock level
2014-05-26 01:48:24 -04:00
Thomas
b3ffd5b868
Fix for bug Bug #1098
2014-05-26 01:42:11 -04:00
mrcheko
8fa7fcdbee
fix bug http://bugs.openmw.org/issues/1335 (1304 as well)
...
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
2014-05-25 21:03:37 +04:00
Marek Kochanowicz
befc7a4078
adding column for the content of the container
2014-05-25 17:02:40 +02:00
scrawl
10d835a55c
Some more missing isInCell checks
2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwscript/cellextensions.cpp
2014-05-25 14:58:47 +02:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
130af28fa5
Merge remote-tracking branch 'cc9cii/master'
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c
Merge branch 'openmw-30'
2014-05-25 11:55:25 +02:00
mrcheko
c62187bd55
fix bug at http://bugs.openmw.org/issues/1155
...
Though it still can happen sometimes but not in such stupid manner.
2014-05-25 13:31:46 +04:00
cc9cii
d2794165ba
Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp"
2014-05-25 18:56:50 +10:00
mrcheko
559c772906
Merge remote-tracking branch 'upstream/master'
2014-05-25 10:21:54 +04:00
cc9cii
4f94a31b54
Fix crash starting a new game.
2014-05-25 07:50:19 +10:00
mrcheko
56881cb7c9
fix bugs in aisequence::execute
2014-05-24 23:05:30 +04:00
scrawl
a05c8fd3ce
Make applyEnchantment return the record ID instead of modifying Ptr
2014-05-24 14:58:48 +02:00
scrawl
1d8da95756
Warning fix
2014-05-24 14:47:51 +02:00
scrawl
08cf58204f
Merge branch 'master' of github.com:scrawl/openmw
2014-05-23 16:45:28 +02:00
scrawl
f09c8ddc9e
Remove a pointless assert
2014-05-23 16:44:51 +02:00
scrawl
a7d525245c
Fix missing include
2014-05-23 16:07:02 +02:00
Scott Howard
c9011f707f
missing #include <iostream> in mwiniimporter
...
missing #include <iostream> in mwiniimporter/main.cpp
2014-05-23 08:41:49 -04:00
cc9cii
367acd9676
Enable video but without sound.
2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc
Disable video for Windows until the crash issues are fixed.
2014-05-23 21:07:01 +10:00
Marc Zinnschlag
f4334da42e
added changed reference tracking for cells
2014-05-23 09:32:34 +02:00
scrawl
b47b2b84f3
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwdialogue/filter.cpp
apps/openmw/mwgui/waitdialog.cpp
2014-05-23 08:39:48 +02:00
Marc Zinnschlag
6ac700a501
Merge remote-tracking branch 'potatoesmaster/getClass'
2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
scrawl
a2f156be8e
Prevent magic bolts from colliding with their caster
2014-05-22 23:34:32 +02:00
scrawl
df8e095c83
Small cleanup
2014-05-22 23:27:54 +02:00
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
Emanuel Guevel
20cfdd4b43
Move LiveCellRefBase ctor where it belongs to
2014-05-22 20:50:00 +02:00
scrawl
cba50c7338
Optimize ManualRef: look up correct Store instead of searching
2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644
Remove useless throwing of exception
2014-05-22 15:29:36 +02:00
greye
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
scrawl
3380e1e1c5
Fix ShouldAttack filter
...
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
2014-05-22 12:20:25 +02:00
scrawl
c6c254d279
Do not trigger levelup if rest was interrupted
2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec
Fix layout glitch when autosaving
2014-05-22 11:03:45 +02:00
greye
cb598f0455
the same for data-local entry
2014-05-22 01:13:27 +04:00
greye
28b59f4008
process paths as UTF-8 in launcher
2014-05-22 01:08:03 +04:00
scrawl
cf07d2ab93
Fix swapped position of Save and Load menu buttons
2014-05-21 16:38:50 +02:00
scrawl
f812746010
Auto-select first save in load dialog
2014-05-21 16:36:55 +02:00
scrawl
3a7e2f8bb5
Allow invoking Journal instruction with non-existing index
...
This is used by the MG_EscortScholar1 quest.
2014-05-21 14:18:14 +02:00
greye
8b94e31062
try to set relative path to resources
2014-05-21 15:39:58 +04:00
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
2014-05-21 10:41:03 +02:00
scrawl
b39b572c5a
Moved mStartupScript to World, so that it is executed for a New game
2014-05-21 09:25:45 +02:00
scrawl
9fe505c8fa
Only run --script-run commands when bypassing the menu
...
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
2014-05-20 18:35:17 +02:00
scrawl
abd6b6ab33
Fix not returning to main menu on failed loads when using quickload
2014-05-20 17:11:26 +02:00
scrawl
7ab98f0c6f
Clear choices when dialogue starts
...
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
2014-05-20 16:57:38 +02:00
greye
b728a919a2
write dependency on boost::locale to CMake files
2014-05-20 12:59:58 +04:00
scrawl
220ab86eca
Simplify new game movie player
2014-05-20 10:07:08 +02:00
Marc Zinnschlag
e0b6bf6aeb
implemented reference record deleting
2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc
implemented reference record merging
2014-05-20 09:02:22 +02:00
greye
9dbe3f21d9
keep non-const signature for argv after conversion
2014-05-20 10:42:21 +04:00
greye
130349e0cd
open files in binary mode when necessary
2014-05-20 08:14:29 +04:00
Marc Zinnschlag
58afa58549
Merge remote-tracking branch 'mrcheko/master'
2014-05-19 22:07:32 +02:00
mrcheko
638df221a6
memory leak fix
2014-05-19 23:29:35 +04:00
greye
20527e0bd4
use boost::filesystem instead of boost::iostreams
2014-05-19 16:56:41 +04:00
scrawl
6bd0bbb8df
Do not load (0,0) on new game
2014-05-19 14:09:16 +02:00
greye
db16bb8983
fix OpenCS saving to Unicode path destination
2014-05-19 15:52:19 +04:00
greye
9c6224c74d
fix saving to Unicode path destination
2014-05-19 15:43:25 +04:00
scrawl
6f03694d50
Fixes #1334 : Only unequip item if the sell/drag action is actually successful
2014-05-19 08:03:55 +02:00
Marc Zinnschlag
7c149e98e0
Merge branch 'openmw-30'
2014-05-18 22:38:52 +02:00
Marc Zinnschlag
37f1a49352
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 22:36:40 +02:00
mrcheko
fa14df62b7
fix crash on disappeared target
2014-05-18 23:15:22 +04:00
Marc Zinnschlag
aa05acd26e
Merge remote-tracking branch 'scrawl/master'
2014-05-18 18:50:18 +02:00
Marc Zinnschlag
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 18:42:23 +02:00
mrcheko
e1249f6a31
actor handle and id confusing fix
2014-05-18 20:13:46 +04:00
scrawl
a87b64d2da
Fix some ancient code
2014-05-18 16:34:58 +02:00
scrawl
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
mrcheko
66307dd889
travis fix #3 :(
2014-05-18 16:10:14 +04:00
mrcheko
74697f8116
travis fix #2
2014-05-18 15:41:15 +04:00
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
greye
18b3cfebdb
fix importer crash on empty lines (thanks to Ace)
2014-05-18 14:55:05 +04:00
greye
b4950509bc
use converted widechars in ini importer
2014-05-18 14:55:05 +04:00
greye
cd990a665a
create QString from utf-8 when expected
2014-05-18 14:55:05 +04:00
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
2014-05-18 12:53:21 +02:00
mrcheko
69c1eb28c5
travis compile fix
2014-05-18 14:39:04 +04:00
scrawl
90ec19c3ac
Remove unneeded MWScrollView
2014-05-18 10:30:03 +02:00
scrawl
150b920ef1
Fix long journal entries not being displayed
2014-05-18 10:14:03 +02:00
scrawl
5fc2b1a41b
Allow setting a journal index even if there's no related journal entry
...
This is used by the MV_SlaveMule quest.
2014-05-18 07:39:16 +02:00
scrawl
e1458453f3
Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
...
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.
Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
2014-05-18 06:52:15 +02:00
cc9cii
12dc5cf4ea
Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.
2014-05-18 12:05:08 +10:00
mrcheko
aa5647b45e
merge master, resolve conflicts
2014-05-17 19:20:57 +04:00
cc9cii
8971db8962
SceneWidget windowHandle fix for Windows.
2014-05-17 23:53:33 +10:00
scrawl
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
2014-05-17 14:30:31 +02:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
92c5bb56e0
Un-reverted actorId for AiPursue
2014-05-17 05:34:54 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
9adb990143
Fix potentially unsafe use of MWWorld::Ptr
2014-05-17 02:52:24 +02:00
scrawl
e5a21aca53
Refactor projectiles to no longer use MW-objects
2014-05-16 13:33:30 +02:00
scrawl
18852c09d0
Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.
2014-05-16 12:28:23 +02:00
scrawl
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
2014-05-16 12:11:34 +02:00
scrawl
028e00c98f
Add missing status report for some toggle commands
2014-05-16 09:21:28 +02:00
scrawl
868e38a07c
Fix Assault crimes being reported when striking in self-defense
...
Last missing fix for Bug #1134 .
2014-05-16 08:32:00 +02:00
scrawl
940a434479
Use ItemModel for moving items from a container to the world
...
Fixes owner not resetting when moving an item from a corpse to the world.
2014-05-16 03:19:38 +02:00
scrawl
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
2014-05-16 00:58:12 +02:00
mrcheko
5be37f04ef
Feature 1314: make npc fight creatures
2014-05-16 00:03:48 +04:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
0bc33fa86a
Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
...
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?
This reverts commit a6e1d7ffd6
2014-05-15 10:14:47 +02:00
scrawl
b16d444f0f
Fix never clearing graveyard. Oops
2014-05-15 10:05:35 +02:00
scrawl
6de7e16550
Fix searchPtrViaActorId not skipping over deleted references
...
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
2014-05-15 09:57:09 +02:00
scrawl
b6a7aee42e
Fix player not being allowed to use his own items
2014-05-15 09:54:10 +02:00
scrawl
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
2014-05-15 09:54:10 +02:00
scrawl
bac4d875df
Fix a potential exploit that made it possible to reset the owner of any item
2014-05-15 09:54:10 +02:00
scrawl
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
2014-05-15 09:54:10 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +02:00
scrawl
2f13a17a39
Add some more safety checks to spellcasting
2014-05-15 09:54:10 +02:00
scrawl
f2c193ce3d
Fix searching the player's actorId
2014-05-15 09:54:10 +02:00
scrawl
a609dc5674
Fix exception when getting hit by a trap
2014-05-15 09:54:10 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
37b9d2fb0c
Fix a wrong use of reference that causes potential crash
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
Marc Zinnschlag
2116f16289
Merge remote-tracking branch 'digmaster/master'
2014-05-14 21:16:24 +02:00
Thomas
d2aada95b4
Fixed AiPursue by fixing underlying issue is Pathto()
2014-05-14 14:11:34 -04:00
Thomas
2425d2c2ab
Added stuck mitigation for AiAvoidDoor
2014-05-14 13:38:10 -04:00
Marc Zinnschlag
c2ea92b93a
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239
ignore all drops that will not create usefull filter
2014-05-14 11:56:23 +02:00
Thomas
993ef1be43
Actor avoiding door asks all surrounding actors to do the same.
2014-05-14 04:05:18 -04:00
scrawl
1141c1f3f2
Change projectiles to use actorIds
2014-05-14 09:48:16 +02:00
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
scrawl
dfacf8c044
Change ActiveSpells to use ActorId
2014-05-14 07:14:08 +02:00
scrawl
67e942e733
Bug #869 : Some fixes to the previous fix
2014-05-14 07:13:12 +02:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
scrawl
7697ab37e0
Fixes #1129 : Change summoned creatures to use ActorId
...
Gracefully handles summoned creatures that are left behind in inactive cells.
2014-05-14 06:37:31 +02:00
Thomas
7cd4c93fa4
Changed getNearbyDoor to use MWWorld::Ptr
2014-05-13 23:46:00 -04:00
scrawl
99b4bc721b
Don't attempt to inflict spells on dead actors
2014-05-14 05:37:53 +02:00
scrawl
6c7b3074f5
Fix self-defense for creatures when attacked with a spell
2014-05-14 05:31:19 +02:00
Thomas
58bf7624be
Made code a bit more efficient
2014-05-13 21:52:05 -04:00
scrawl
3cdbcf3c28
Merge branch 'actorid' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/creaturestats.cpp
2014-05-14 02:35:05 +02:00
Thomas
203ef580cf
Fixed moving activatable object being incorrectly activated.
2014-05-13 20:32:29 -04:00
scrawl
365ca6c7e1
Fixes #1331 : Manually disable movement state for dead actors.
...
For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
2014-05-13 21:47:45 +02:00
Thomas
6d540c4e07
Removed merging error
2014-05-13 14:24:48 -04:00
Thomas
680890c846
Clarification on some documentation points
2014-05-13 14:21:59 -04:00
Thomas
d6d4d9f75d
Removed destructor documentation
2014-05-13 14:08:08 -04:00
Thomas
ee36ace00b
Undid some code clean up changes, and changed how some includes work
2014-05-13 13:43:50 -04:00
Thomas
598221a8e7
Forgot some files
2014-05-13 13:07:27 -04:00
scrawl
e591d23880
Fixes #894 : Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur.
2014-05-13 19:01:02 +02:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2db3c89a9e
Ensures destination is far enough to care about getting stuck
2014-05-13 04:09:21 -04:00
Marc Zinnschlag
6c8e4b27d3
Merge remote-tracking branch 'scrawl/master'
2014-05-13 10:00:18 +02:00
Thomas
cbfa282f8d
Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
...
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
- Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
2014-05-13 03:58:32 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
386604bc9d
Fixes #869 : Added methods to control external and internal collision modes separately
...
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.
Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
2014-05-13 01:43:52 +02:00
mrcheko
725f6cac5e
AiPursue infinite package updating bug resolved
2014-05-13 00:05:30 +04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
mrcheko
e4fe78937a
Merge remote-tracking branch 'upstream/master'
2014-05-12 22:06:26 +04:00
Marc Zinnschlag
3c5fe28857
Merge branch 'config'
2014-05-12 10:33:10 +02:00
Marc Zinnschlag
8279d307c4
text encoding configuration (was using hardcoded settings before)
2014-05-12 10:32:57 +02:00
scrawl
117b812fb1
Fix invisibility not breaking on certain actions
2014-05-12 02:20:56 +02:00
scrawl
b0fbea9d57
Removed a wrong assertion. Max drowning time is defined by GMST.
2014-05-11 21:03:27 +02:00
scrawl
2bc2684a66
Fixes #275 : force updating exterior cell maps even if already in cache
2014-05-11 18:01:47 +02:00
scrawl
54a893994a
Also update local map when paused, to make it update properly when teleporting via GUI/console
2014-05-11 18:01:47 +02:00
scrawl
7428511ea0
Bug #772 : Do not show door markers for disabled doors
2014-05-11 18:01:47 +02:00
scrawl
961c4d4dc4
Fixes #772 : Give scripts a chance to run before updating map, so that disabled objects are not visible
2014-05-11 18:01:47 +02:00
scrawl
ac8abd3398
assert -> exception to gracefully handle corrupted savegames
2014-05-11 18:01:47 +02:00
Marc Zinnschlag
368c868623
Merge remote-tracking branch 'scrawl/master'
2014-05-11 11:10:51 +02:00
Marc Zinnschlag
a85c73cf35
Merge remote-tracking branch 'filkry/bug1047dialoglinks'
2014-05-11 11:07:23 +02:00
scrawl
c39a0368cf
Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D.
...
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88
Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip
2014-05-11 02:27:43 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
7b46e9f914
Get rid of no longer needed widget names
2014-05-11 01:05:49 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
scrawl
07d9845aa0
Fix a bug in ESMStore code that checks for duplicate record insertions
2014-05-11 00:10:28 +02:00
Fil Krynicki
eb5ef270ba
Bug 1047 update - defaults and edge case
...
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.
Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
2014-05-10 17:47:21 -04:00
scrawl
dab4db87ff
Fix a bug in marker placement for interior maps
2014-05-10 23:47:00 +02:00
Fil Krynicki
9095a45ba7
Bug 1047 Fix
...
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
2014-05-10 17:05:15 -04:00
scrawl
b358cf2423
Fix a potential crash when loading script locals from savegame
2014-05-10 21:31:49 +02:00
scrawl
9fb5cef287
Oops, committed debug code
2014-05-10 21:31:49 +02:00
Marc Zinnschlag
8f5acf4741
Merge branch 'openmw-30'
2014-05-10 17:49:02 +02:00
Marc Zinnschlag
5b5bf6f37e
removed a redundant (and unsufficiently configured) copy of ConfigurationManager
2014-05-10 17:46:10 +02:00
Marc Zinnschlag
804bf523ba
removed two unused files
2014-05-10 17:35:11 +02:00
Marc Zinnschlag
5b9e90744e
Merge branch 'load'
2014-05-10 13:49:25 +02:00
Marc Zinnschlag
6fdbd4d3f9
minor adjustment to UniversalId
2014-05-10 13:49:19 +02:00
Marc Zinnschlag
96ca9500ca
generate error messages when encounting non-critical problems during load
2014-05-10 13:47:22 +02:00
Marc Zinnschlag
79d59153c1
improved layout of loading window
2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de
display load error messages in loading window
2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d
added load error log
2014-05-10 12:04:36 +02:00
Marc Zinnschlag
31b8dad4e0
Merge remote-tracking branch 'scrawl/master'
2014-05-10 10:52:47 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
242e19a136
Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic
...
(Fixes #1300 )
2014-05-10 01:37:34 +02:00
scrawl
5163358478
Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker
2014-05-10 01:14:12 +02:00
scrawl
d86585b153
Fix clearing of local map markers
...
destroyWidget changes the child count, so the for loop is flawed.
2014-05-10 01:07:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
scrawl
136813a882
Bug #1319 : Fix references not coming from a content file incorrectly overwriting each other
2014-05-10 00:01:30 +02:00
scrawl
e7a004824c
Fix a search that should have been find
2014-05-09 23:58:24 +02:00
scrawl
872d9be1b4
Fix potential issue with dialogue globals
...
Make sure they are updated throughout the conversation
2014-05-09 19:19:21 +02:00
scrawl
731bc9c275
Fix broken isClass check and renamed variable for clarity
2014-05-09 18:45:49 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10:00
scrawl
312dc84fa4
Fix a bug where the player's inventory could be opened as a container
...
If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.
2014-05-08 20:40:45 +02:00
Marc Zinnschlag
cf90da6cd8
minor fix
2014-05-08 15:23:29 +02:00
Marc Zinnschlag
6eff5ecaad
Merge branch 'operations' into load
...
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
2014-05-08 13:17:24 +02:00
Marc Zinnschlag
205306ee3d
changed message passing format from QString to a UniversalId/std::string pair
2014-05-08 12:42:29 +02:00
graffy76
0e7d40de6a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
upstream merge
2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5
Decoupled setting definitions from the Setting class. QSettings
...
implementation is now fully responsible for managing user settings.
2014-05-07 21:59:26 -05:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2
Removed unneeded includes, cleaned up code, added comments
2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3
Removed error code for missing opencs.ini files.
2014-05-06 19:22:45 -05:00
mrcheko
01810f24b0
A* misses 1st closest node fix
2014-05-06 23:29:39 +04:00
Marc Zinnschlag
729e079b0b
Merge remote-tracking branch 'scrawl/master'
2014-05-06 20:18:19 +02:00
scrawl
1c8c26072d
Crime and self defense fixes
...
- NPCs should still shout messages such as "thief" even if they did not report the crime
- Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
- Fixed self defense for creatures (Fixes #1203 )
2014-05-06 19:15:43 +02:00
scrawl
d2beb814e7
Remove superfluous attack phrases (already done by startCombat)
2014-05-06 18:05:53 +02:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
Marc Zinnschlag
a30d816982
fixed a mixup in CSMTools::Tools constructor/destructor
2014-05-06 11:44:20 +02:00
Marc Zinnschlag
492620c8cf
handle exceptions thrown during loading and report them to the user
2014-05-06 09:39:39 +02:00
scrawl
dd9117809d
Say an attack phrase when combat starts
...
Move combat start to a helper method
Added some todo comments
2014-05-06 00:13:31 +02:00
scrawl
d4492b56db
Added header file missing from CMakeLists
2014-05-05 23:52:09 +02:00
scrawl
536fc5e192
Fix autosaves
2014-05-05 22:38:08 +02:00
graffy76
5cba828cc9
Removed unneeded code from setting manager. Moved some code to user
...
settings
2014-05-05 06:26:00 -05:00
graffy76
74fa115d20
fixed check for missing ini files
2014-05-05 06:07:41 -05:00
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
Jeffrey Haines
d4812c3af9
fixed placement of else statement
2014-05-04 17:54:33 -04:00
Jeffrey Haines
78f76842a6
Added else statement
...
Its still dodgy though
2014-05-04 16:56:30 -04:00
Jeffrey Haines
7d5dab214c
#58 - Sneak Skill: functional sneaking
...
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
2014-05-04 16:20:09 -04:00
Jeffrey Haines
a65e8393bb
Merged files
2014-05-04 11:33:27 -04:00
Marc Zinnschlag
df97a1b57f
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-04 17:11:43 +02:00
mrcheko
f596b698d9
fixes to slow-down at jump startup and infinite air intertia growth
2014-05-04 18:15:07 +04:00
Marek Kochanowicz
f51f826dad
fixed compilation
2014-05-04 15:13:03 +02:00
Jeffrey Haines
a469444e53
Player can't detect self
2014-05-04 08:05:32 -04:00
Marc Zinnschlag
7f78c29bb5
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-05-04 14:03:56 +02:00
Marek Kochanowicz
4a502226e6
added flag to distingiush widgets
2014-05-04 12:41:06 +02:00
Marc Zinnschlag
e43913e7c2
Merge remote-tracking branch 'graffy76/master'
2014-05-04 12:17:44 +02:00
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00
graffy76
3f737bbb44
implemented QDial into RangeView class
2014-05-03 22:02:16 -05:00
graffy76
4f876574c1
Implemented slider widget in rangeView class
2014-05-03 21:50:08 -05:00
graffy76
0a3ab3dcd1
Commented out "proxy selection test" demo page in user settings
2014-05-03 19:48:04 -05:00
graffy76
35d1502308
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-05-03 19:16:42 -05:00
graffy76
1c26741c56
Implemented rangeview with spinbox as only control. Simplified setting
...
class constructor.
2014-05-03 18:58:43 -05:00
graffy76
bc6197c552
Added custom spin box class
2014-05-03 18:57:34 -05:00
Thoronador
be89654eef
remove audiere_decoder + mpgsnd_decoder from CMake file for openmw
2014-05-03 22:05:21 +02:00
Thoronador
620a8ccaf3
remove Audiere and MPG123+Sndfile decoder sources
2014-05-03 21:49:57 +02:00
Marek Kochanowicz
00b21449a2
replaced type_cell with type_scene
2014-05-03 19:47:13 +02:00
Jeffrey Haines
e1e23447f2
Removed initial check form setSneak
...
It wasn’t needed.
2014-05-03 13:16:07 -04:00
Jeffrey Haines
05e326bdc3
Added update sneak to actors
...
Intends to check the state of a players sneak by asking the question if
each npc can see the player.
2014-05-03 12:48:07 -04:00
scrawl
658c37a299
AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime.
...
Fixes guards in pursuit activating the dialogue too early.
Also tweaked the activation distance.
2014-05-03 17:17:00 +02:00
Marc Zinnschlag
e9c2f24faa
intercept close button clicks in loading window
2014-05-03 17:14:17 +02:00
Marc Zinnschlag
3fdd72f204
added cancel button to loading window
2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222
record loading progress bar
2014-05-03 15:33:35 +02:00
Marc Zinnschlag
6692d2dc72
split up load function in a start and continue part
2014-05-03 15:05:02 +02:00
Marc Zinnschlag
0b309d9ef4
Merge branch 'master' into load
...
Conflicts:
apps/opencs/view/doc/viewmanager.cpp
2014-05-03 14:36:06 +02:00
Marek Kochanowicz
5e99381019
Drag and drop works.
2014-05-03 14:00:30 +02:00
Marc Zinnschlag
e0e2ad8316
content file loading progress bar
2014-05-03 13:01:29 +02:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
Marc Zinnschlag
e09218f164
moved load code from Document to Loader class
2014-05-03 12:07:05 +02:00
scrawl
7331a64e34
Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4)
2014-05-03 11:33:20 +02:00
scrawl
1b074e5524
Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response.
2014-05-02 22:38:39 +02:00
scrawl
df1694c27b
Console autocompletion: List candidates when repeatedly pressing tab (bash-style)
2014-05-02 22:19:02 +02:00
scrawl
92467ba6bc
Fix sunlight for interiors
2014-05-02 21:20:27 +02:00
Marek Kochanowicz
7f1df878f6
make getDropType static and public.
2014-05-02 20:28:28 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
f8cc328b5e
Slightly prettier backdrop when loading game from main menu.
2014-05-02 12:48:01 +02:00
scrawl
6381b1e938
Fixes #1309 : Do not allow saving while dialogs are opened, just like vanilla
...
This limitation could be removed post-1.0 by serializing the state of open windows.
2014-05-02 11:20:43 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
Marek Kochanowicz
c2b070f097
trying to do it right.
2014-05-01 19:17:33 +02:00
Marek Kochanowicz
ea1aaef8ca
replace paged with unpaged (and vice versa)
2014-05-01 18:25:28 +02:00
scrawl
fc7e79027a
Fixes #1144 : Don't refreshCurrentAnims when adding already dead actors
2014-05-01 16:55:16 +02:00
scrawl
64a30ad182
Fix another leak
2014-05-01 16:55:16 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
scrawl
f99eda1a54
Fixes #1302 : Do not attempt to set OnPcAdd before the script has been added
2014-05-01 16:55:15 +02:00
scrawl
5415ca6a63
Fix exception when shift+click on empty space in save dialog
2014-05-01 16:55:15 +02:00
Marek Kochanowicz
d00dbf47d5
working on worldspace drops
2014-05-01 15:09:47 +02:00
Marc Zinnschlag
ab94e70724
more cleanup of document setup
2014-05-01 13:04:48 +02:00
Marek Kochanowicz
57131332f4
fixing minor issues
2014-05-01 12:34:54 +02:00
Marc Zinnschlag
6a809064df
Merge remote-tracking branch 'mrcheko/master'
2014-05-01 10:07:43 +02:00
mrcheko
9e79fb5b87
fix to broken aiwander logic
2014-05-01 11:41:25 +04:00
Marc Zinnschlag
634311c86c
Merge remote-tracking branch 'mrcheko/master'
2014-04-30 22:45:26 +02:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
Marek Kochanowicz
9e01a54d72
minor correction
2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8
paged worldspace drop
2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86
that would be it
2014-04-30 14:27:11 +02:00
Jeffrey Haines
5c9c467b26
Improved sneak.
2014-04-30 08:06:36 -04:00
Jeffrey Haines
14ebd8b110
Fixed logic in commit crime
2014-04-30 07:44:29 -04:00
Marek Kochanowicz
4d79f00e28
enable dragging on the region map cells
2014-04-30 13:32:54 +02:00
Thomas
10a5bb9464
Made code a bit more standardized and added a good bit of documentation.
2014-04-29 23:40:59 -04:00
Marek Kochanowicz
eeb18b533e
moved editlock to the dragrecordtable
2014-04-29 21:41:57 +02:00
Marc Zinnschlag
0c2843b0f7
some missing cleanup
2014-04-29 19:56:33 +02:00
Marek Kochanowicz
d376efe30b
handle dragging not-existing records
2014-04-29 19:34:06 +02:00
Marc Zinnschlag
9a1b5dc1c6
a bit of cleanup
2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d
added actor ID
2014-04-29 15:27:49 +02:00
cc9cii
7d990abd37
OpenCS changes to allow compilation with MSVC 11.0.
2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059
moved new flag from setupData function to Document constructor
2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6
added basic loading GUI
2014-04-29 14:17:25 +02:00
Marc Zinnschlag
2906ade531
string fix
2014-04-29 13:16:58 +02:00
Marc Zinnschlag
4eeed4e2c7
Merge remote-tracking branch 'scrawl/return'
2014-04-29 12:27:27 +02:00
Marek Kochanowicz
18fc8acc71
able to drag existing cells from the regionmap
2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3
added new, later common, base for the regionmap and the table
2014-04-29 11:44:21 +02:00
scrawl
28ef236f0e
Don't allow setting a new return position if there already is one and we haven't reached it yet
2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a
Merge remote-tracking branch 'mrcheko/master'
2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
scrawl
3780503275
Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar
2014-04-29 07:07:03 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
scrawl
7a0aeeaa38
Allow to delete savegames (shift + click)
2014-04-28 20:57:45 +02:00
scrawl
7f37f2c2be
Fixes #1187 : Make GetDistance handle actors in remote cells gracefully
2014-04-28 19:23:25 +02:00
Marc Zinnschlag
2e7b4e798e
Merge remote-tracking branch 'digmaster/master'
2014-04-28 19:22:54 +02:00
scrawl
a35f7c73ae
Fixes #1286 (Dialogue topic list clips with window frame)
...
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
2014-04-28 18:40:29 +02:00
scrawl
518a32c19d
Fixes #1195 : Make NPCs equip torches in interiors under certain conditions
2014-04-28 18:33:42 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
Lars Söderberg
04e5b9c72c
Right aligned version/revision
...
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.
Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.
Comments?
2014-04-28 16:23:07 +02:00
scrawl
84961d7843
Fixes #1254 : PcRank should return first rank if not in the faction
2014-04-28 15:31:18 +02:00
scrawl
b2119441b9
Fix bug in PcRank / PcNextRank
...
It was using the first faction instead of the actor's faction.
2014-04-28 15:26:40 +02:00
Marc Zinnschlag
421679b319
Merge remote-tracking branch 'scrawl/master'
2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478
Removed asserts
2014-04-28 15:00:52 +02:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
scrawl
0796815da0
Ignore dead actors in getActorsFollowing/Fighting
...
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d
Merge remote-tracking branch 'thoronador/fix-minor-stuff'
2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77
Merge remote-tracking branch 'scrawl/master'
2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7
Remove unused variable
2014-04-28 10:26:24 +02:00
scrawl
b89463db09
Fix #1207 : Remember previous choice in class creation dialog
2014-04-28 09:12:03 +02:00
scrawl
1da19585dc
Remove some unneeded includes
2014-04-28 07:49:08 +02:00
Thomas
dc54bd5a5f
Merge remote-tracking branch 'upstream/master'
2014-04-27 20:56:45 -04:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
Thoronador
f69d61976e
minor performance improvements in other apps subdirectories
2014-04-27 23:25:02 +02:00
mrcheko
22cdb166f2
warning fix, vars renaming
2014-04-27 22:38:04 +04:00
Thoronador
1b8c975d5b
minor performance improvements in apps/openmw
...
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.
For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
2014-04-27 19:10:23 +02:00
Marc Zinnschlag
ca097e146b
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-27 17:35:10 +02:00
Jeffrey Haines
edbc319c42
fixed logic. ||
2014-04-27 10:05:34 -04:00
Jeffrey Haines
52bb7c3f69
fixed logic. !
2014-04-27 09:55:38 -04:00
Jeffrey Haines
7599b26d30
Fixed: creatures won't witness crimes
...
and potential crash.
2014-04-27 09:37:43 -04:00
Jeffrey Haines
0409e18a0e
revert
2014-04-27 09:35:49 -04:00
Jeffrey Haines
b9bd4bc126
broken
2014-04-27 09:34:59 -04:00
Jeffrey Haines
ce106d3bec
Revert "NPCs detect crime exclusively"
...
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.
Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2014-04-27 09:34:33 -04:00
mrcheko
82121e0401
some checks reworked
2014-04-27 16:59:21 +04:00
scrawl
e42855d522
Minor fix for spell icon
2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a
merge master
2014-04-27 13:49:31 +04:00
Marc Zinnschlag
85dbf393d2
Merge remote-tracking branch 'graffy76/master'
2014-04-27 11:44:15 +02:00
scrawl
3eb1e4e117
Fixes #1241 : Removed disposition-based combat conditions
...
The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.
The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.
Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.
Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
2014-04-27 09:43:54 +02:00
scrawl
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
3161647809
Fix for not being able to pick up scrolls during combat
...
This is the behaviour I observed in vanilla morrowind.
2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf
Fix a stacking issue
2014-04-27 06:08:15 +02:00
scrawl
93b76a603b
Fixes #1100 : Looting a corpse is no longer considered stealing
2014-04-27 06:08:08 +02:00
graffy76
985af15a12
removed qdebug references
2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0
Converted SettingType enums to indicate widget type.
2014-04-26 21:32:36 -05:00
scrawl
e8210c92c6
Fixes #1240 : Don't hardcode drowning time
2014-04-27 04:27:26 +02:00
graffy76
b94466dbb4
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-04-26 21:24:02 -05:00
cc9cii
1fb2c8d87b
NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented.
2014-04-27 07:38:31 +10:00
Thomas
c2b692e124
getActorsFollowing/Fighting no longer returns dead actors
2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0
code refining + minor fixes
2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4
Merge remote-tracking branch 'scrawl/master'
2014-04-26 18:05:04 +02:00
scrawl
04964595ef
Fixes #1270 , Fixes #1201 : Update active weapon/spell icons every frame
2014-04-26 16:44:20 +02:00
graffy76
ab33e78b67
Added RangeView class files
2014-04-26 09:40:58 -05:00
scrawl
d5dd864404
Fixes #1236 : Disable all controls while playing movie
2014-04-26 14:33:45 +02:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
Marc Zinnschlag
ddb0496dca
replaced return value of removeDocument with a signal
2014-04-26 13:11:27 +02:00
scrawl
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
ef39b0f6ab
Fixes #1291 : Faction rank saving issue
...
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b
Fixes #1295 : Support partial matches in Cell filter
2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb
Fixes #1296 : Streamlined cellChanged detection
2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7
Fix dynamically placed objects being discarded when loading game
2014-04-26 05:01:26 +02:00
scrawl
f05606657c
Correctly insert pasted text at cursor position
2014-04-26 05:01:26 +02:00
scrawl
91e50585ff
AiWander: make sure to walk, not run
2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7
Fix a crash after loading game
2014-04-26 05:01:26 +02:00
mrcheko
f3626adc86
remake of z-moving in combat for flying/swimming enemies
2014-04-26 00:20:55 +04:00
Marc Zinnschlag
42b332775a
removed some debug statements
2014-04-25 15:30:46 +02:00
Marc Zinnschlag
c63d6437c0
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
2014-04-25 15:29:23 +02:00
Marc Zinnschlag
837fd2a4c6
Merge remote-tracking branch 'graffy76/master'
2014-04-25 15:11:19 +02:00
graffy76
2e06414b43
Fixed broken delegate display modes (Display Format settings). Moved
...
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
Marc Zinnschlag
1f6ed584c2
Merge remote-tracking branch 'digmaster/master'
...
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c
Checks the state of the passed sneak variable
2014-04-24 23:02:11 -04:00
Thomas
f3272c941f
Fix for bug #1080 , can't read/repair/make potions/use soul gems/rest/sleep while in combat.
...
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5
Reworked the accusation of actors
2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da
Sneak: Added support for state checking
...
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
2014-04-24 20:40:17 -04:00
graffy76
3f2ae950f5
Disabled view resize for open views when user setting changes. Fixed
...
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
Marc Zinnschlag
dbb192f084
moved loading to a separate thread
2014-04-24 15:09:25 +02:00
Marc Zinnschlag
9db9ad410d
fixed checks for allowing load/save and some general cleanup
2014-04-24 10:14:17 +02:00
Marc Zinnschlag
760c8c7214
removed a redundant include
2014-04-24 09:56:51 +02:00
Marc Zinnschlag
42b3233bda
removed a redundant check
2014-04-24 09:54:47 +02:00
Thomas
5b681e2199
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
2014-04-24 03:14:47 -04:00
Thomas
05b21c92af
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
2014-04-24 03:06:36 -04:00
Thomas
6a8bf71c4c
Moved autosave to before you rest, not after it.
2014-04-23 23:33:57 -04:00
Thomas
a598060071
Added autosave on rest, as well as an option in the settings menu
2014-04-23 23:12:30 -04:00
Thomas
682c395488
Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)
2014-04-23 21:39:25 -04:00
Thomas
49620968b9
Disallowed quicksave/load in character creation
2014-04-23 21:21:11 -04:00
Thomas
e873135da7
Missed a debug message
2014-04-23 21:04:52 -04:00
Thomas
f90810223a
Added quicksave and quickload
2014-04-23 21:02:09 -04:00
graffy76
ce56669339
Fixed failed signal/slot connection between UserSettings and
...
CSVWorld::SubView
2014-04-23 17:02:37 -05:00
Thomas
ee581f593b
Fixed issue which may occur if there's no evidence chest nearby
2014-04-23 13:20:43 -04:00
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
graffy76
8c6c70ee9c
Merge branch 'master' of https://github.com/graffy76/openmw
2014-04-23 07:05:34 -05:00
Thomas
6022ffbd1f
Evidence chest now locks when new evidence is added to it
2014-04-23 05:54:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
Thomas
cac8e52154
Seperated locked and lock level, to allow for relocking doors to previous lock level.
...
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Thomas
e71a119c23
Made aifollowers run when long distances (800 or 10000, depending) from what they're following.
2014-04-23 02:57:48 -04:00
graffy76
4b607d658f
Re-link user settings to editor main application
2014-04-22 22:19:53 -05:00
graffy76
e3384e3999
relocate support.hpp / remove support.cpp
2014-04-22 22:19:03 -05:00
graffy76
331df17b48
Added new framework files
2014-04-22 22:17:19 -05:00
graffy76
d3148555fa
Delete old framework files
2014-04-22 22:16:14 -05:00
mrcheko
fbd0ffe86f
enable z-moving for flying/water combatants
2014-04-22 22:59:39 +04:00
scrawl
9998c2783e
Fix travis
...
Why again do we need a unit test for something that was never used?
2014-04-21 17:37:06 +02:00
Marc Zinnschlag
e324450118
replaced return value of DocumentManager::addDocument with a signal
2014-04-21 09:02:58 +02:00
mrcheko
f811abb752
pathgrid shortcutting extended
2014-04-20 20:35:07 +04:00
Marc Zinnschlag
86bd2f48dc
removed an unused function
2014-04-20 17:28:10 +02:00
Marc Zinnschlag
0eed697f9a
Merge remote-tracking branch 'digmaster/master'
2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e
Remove rotation check that was freezing NPC's.
2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d
Suppress travis warning and one more tweak.
2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb
Forgot to capitalize something. whooooops
...
dat y do
2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205
Gets default keybindings from scancode, not keyvalue.
...
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b
Fixed the rotation animation glitch.
2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7
An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.
2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e
Make idle actors face the player. Turning animation is not smooth.
2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236
Added reaction time and moved game setting variables init to the constructor.
2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743
Fixed garage value found in beta's static analysis
...
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e
Fixes to Crime System
...
Victimless crimes were removed because victims may not exist in the
case of stealing items.
Is class now uses case insensitive comparison.
Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d
Cleanup and little tweaking.
2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d
Backing off closed doors working, needs cleanup and tweaking.
2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d
Merge remote-tracking branch 'scrawl/alarm'
2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d
Merge remote-tracking branch 'scrawl/master'
2014-04-18 15:08:30 +02:00
scrawl
b3916e7744
Crime: mark witnesses as alarmed.
...
Fixes guard dialogue to properly detect if the player turned himself in.
2014-04-18 13:44:09 +02:00
pvdk
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
2014-04-18 13:17:37 +02:00
scrawl
4625adfb7f
Fix typo in a condition.
2014-04-18 11:43:37 +02:00
cc9cii
7437647f70
Forgot to add a guard :-(
2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7
Suppress compiler warning.
2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568
More cleaning up.
2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa
Cleaned up logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c
Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7
Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.
2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22
Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.
2014-04-18 14:41:43 +10:00
pvdk
af883991e2
Reimplemented the old new profile dialog behaviour
2014-04-17 02:17:18 +02:00
pvdk
5d94cb112f
Fixed segfault bug due to accessing members of unitialized struct
2014-04-17 02:16:41 +02:00
pvdk
30c3c3e245
Working on importing content lists in the launcher
2014-04-17 00:01:19 +02:00
pvdk
6ed76858d9
Fixed some minor problems with the wizard
2014-04-16 23:59:25 +02:00
pvdk
f8bb797b8a
Settings tab is fully functional now
2014-04-16 18:34:24 +02:00
pvdk
a2c129f655
Merge remote-tracking branch 'upstream/master' into wizard
2014-04-16 16:57:53 +02:00
pvdk
21c406316f
Working on the Settings tab: start the importer/wizard
2014-04-16 16:54:55 +02:00
Marc Zinnschlag
65161c3e24
Merge remote-tracking branch 'sirherrbatka/less-signals'
2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980
Merge remote-tracking branch 'sirherrbatka/AngryFix'
2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30
do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit
2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c
removed signals
2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed
fixed bug: regions can be dragged
...
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
2014-04-15 19:26:43 +02:00
Marc Zinnschlag
30d5040f2f
Merge remote-tracking branch 'cc9cii/Bug-No-1260'
2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f
Avoid hard coding "thief.dds" string.
2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9
Save state is handled correctly now.
2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050
fix for windows builds
2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7
Bug #1260 : show thief.dds image for a custom class level up menu
2014-04-14 18:31:46 +10:00
Marc Zinnschlag
71068ae3ad
Merge branch 'regionmap'
2014-04-13 17:24:08 +02:00
Marc Zinnschlag
d188e68227
added f-type hint to TableSubView
2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a
added 'view in table' action to region map
2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd
added view action to region map
2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833
added set/unset region actions to region map
2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f
added create cell menu item to regionmap
2014-04-13 14:17:18 +02:00
Marc Zinnschlag
19b31c4146
always use the cell ID instead of the exterior coordinate fields from the original cell struct
2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9
added CellId role to RegionMap model
2014-04-13 13:59:27 +02:00
cc9cii
966ed46870
Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.
2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b
Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).
2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42
Fix falling animation where vec.z is set to zero.
2014-04-13 11:34:59 +10:00
cc9cii
0bef754873
Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271 .
2014-04-13 08:46:02 +10:00
Marc Zinnschlag
2f63eb7ca4
added missing edit lock for record reordering
2014-04-12 20:07:09 +02:00
cc9cii
d2a41167d0
Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075
2014-04-11 21:24:00 +10:00
Marc Zinnschlag
d0ea23431c
replaced CellIndex typedef with new CellCoordinates class
2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253
added context menu with selection functions to region map
2014-04-10 22:12:09 +02:00
Marc Zinnschlag
7f12733463
Merge remote-tracking branch 'potatoesmaster/1071'
2014-04-08 21:08:59 +02:00
Emanuel Guevel
09bd0324c9
Fail properly when a content file is not found
2014-04-08 20:19:09 +02:00
Marc Zinnschlag
d205d5f0af
Merge branch 'cellselect'
2014-04-08 09:58:00 +02:00
Marc Zinnschlag
e0550ba336
allow multiple cell coordinates in c-type hint for scene subviews
2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883
replaced rectangular cell selection with a CellSelection object
2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c
added CellCoordinates and CellSelection classes
2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4
removed grid button (discarding the first attempt at a cell selector)
2014-04-07 10:21:26 +02:00
Marc Zinnschlag
03b3487f1b
minor cleanup
2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3
Merge remote-tracking branch 'cc9cii/PathFinder-split'
2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371
Fix visual glitch happening when closing inventory while sneaking
...
(bug #1255 )
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0
Merge remote-tracking branch 'gus/AIFix2'
2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec
Cleaned up code, implemented crime ids
...
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Marc Zinnschlag
0fe67b586a
increased scene toolbar button size
2014-04-05 13:16:13 +02:00
Jeffrey Haines
df5cbe5dec
Minor changes
2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7
One more comment fix.
2014-04-04 18:17:42 +11:00
cc9cii
f59226265a
Remove redundant parameter from aStarSearch. Also update some comments.
2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a
Removed witnesses and minor changes
2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933
Remove logging.
2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4
Move PathgridGraph into separate files.
2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde
Added witnesses to the mix
2014-04-03 14:53:31 -04:00
Marc Zinnschlag
baf30ba292
added grid tool (does not work yet)
2014-04-03 14:44:48 +02:00
cc9cii
a8b2eb1fe9
Make Travis happy.
2014-04-03 22:49:22 +11:00
Marc Zinnschlag
3a58da9ad7
size adjustment
2014-04-03 13:30:22 +02:00
cc9cii
325d0616bb
Cleanup debug statements.
2014-04-03 22:17:45 +11:00
Marc Zinnschlag
5d422fec8a
fixed scene toolbar layout problems
2014-04-03 13:00:19 +02:00
cc9cii
98f77714ce
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
...
This version still has debugging statements and needs cleaning up.
2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38
Cleaned up code
2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be
Crime is now checked every frame call
2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac
Replaces broken code with todo
2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d
Moved mWitnesses into Player. resetCrime for paying fine.
2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e
Ai pursue now controls guards pursuit of crimes
...
Should extend AiActivate in the future
2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b
Feature 1154 & 73: Crime and NPC reactions
2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e
Feature 1154 & 73: NPCs react to crime
2014-04-01 14:15:55 -04:00
Marc Zinnschlag
5b5069535e
keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly
2014-04-01 10:04:14 +02:00
Marc Zinnschlag
12e46c5dc7
Merge remote-tracking branch 'megaton/master'
2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa
Merge remote-tracking branch 'scrawl/master'
2014-03-31 10:11:54 +02:00
pvdk
cfe66abbc5
Started working on the settings tab
2014-03-30 23:57:30 +02:00
pvdk
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
2014-03-30 23:16:48 +02:00
pvdk
14b164a03d
Reverted an unneeded fix
2014-03-30 23:11:38 +02:00
scrawl
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
pvdk
10d2ca82f7
Implemented a simple logger
2014-03-30 22:58:50 +02:00
scrawl
1265131203
Set the selected index after all items are added (workaround for MyGUI bug)
2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb
MSVC uses C version of locale.
2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1
Revert 6b28c06..98fd381
...
This rolls back to commit 6b28c06b2c
2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Compiling fix
2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Partially implemented
2014-03-29 21:23:34 -04:00
scrawl
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6
Don't show version text in the pause menu
2014-03-30 00:07:32 +01:00
gus
d9ea7107b7
compile fix.
2014-03-29 18:36:32 +01:00
gus
bee057346b
Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f
Revert "Revert "made mReceiver private""
...
This reverts commit 33aecc5218
2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218
Revert "made mReceiver private"
...
This reverts commit 3e8f7b3bae
2014-03-29 07:45:36 -04:00
pvdk
eb04fa85b7
Added background image to the last page too
2014-03-29 11:57:25 +01:00
pvdk
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-29 11:56:35 +01:00
Marc Zinnschlag
c7b969821f
silenced a warning
2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb
Merge remote-tracking branch 'cc9cii/AiWander-improvements'
2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b
Minor comment clarification.
2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94
My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points.
...
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
2014-03-29 19:35:52 +11:00
cc9cii
267855c44e
Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.
2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c
Allow interrupting a walking NPC to trigger a greeting.
2014-03-29 19:35:52 +11:00
Marc Zinnschlag
04baa4a573
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae
made mReceiver private
2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427
Feature #1233 Bribe gold not in inventory
...
Gold is now put into inventory receivers when bribing.
2014-03-28 21:16:42 -04:00
Marc Zinnschlag
86e5179fd8
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8
Feature #953 Trader Gold - Unused code/warning resolved
...
Removed unused code
getBaseGold throws proper error
2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee
getBaseGold implemented in MWWorld::Class for NPC and Creature
...
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d
Gold Pool implemented for Vendors
...
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
4f852daf45
Don't play company logo when using --skip-menu
2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46
Merge remote-tracking branch 'rohitnirmal/load-weap-icon'
2014-03-27 14:57:55 +01:00
Marc Zinnschlag
ce792cf182
Merge branch 'light'
2014-03-27 14:39:40 +01:00
Marc Zinnschlag
50f1679a4c
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-27 13:40:06 +01:00
Jeffrey Haines
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Marc Zinnschlag
53c4878d52
fix for inconsistent case in topic records
2014-03-27 10:01:42 +01:00
Jeffrey Haines
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01
Only update the icon if player is NOT unarmed, to avoid bad dereference.
2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af
Update weapon icon in HUD when save is loaded.
2014-03-26 21:08:31 -05:00
scrawl
27956f3624
Savegame dialog: Hide main menu after successful load
2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52
Ask for confirmation to exit OpenMW
2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e
Add Credits button to main menu (plays mw_credits.bik)
2014-03-26 21:38:57 +01:00
scrawl
23f4bbc5b0
Videoplayer: only pause previous sounds if there is an audio stream
2014-03-26 21:36:57 +01:00
scrawl
5562c78ac4
Ask for confirmation when selecting 'New Game'
2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93
Savegame dialog: use locale-aware datetime format
2014-03-26 20:56:39 +01:00
scrawl
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
scrawl
793649c854
ToggleAI: Report current status on toggle
2014-03-26 19:55:52 +01:00
scrawl
688415ce54
Play deathknockout/deathknockdown animations when appropriate
2014-03-26 18:55:16 +01:00
Marc Zinnschlag
ed524b2fd4
added bright lighting mode
2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32
added night lighting mode
2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27
added day lighting mode
2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8
added lighting switching
2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30
some ambient light cleanup
2014-03-23 13:40:56 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6
Just some notes for future maintenance.
2014-03-23 13:38:11 +11:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4
fix for previous commit
2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78
include local variable state in saved games
2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a
Merge remote-tracking branch 'scrawl/master'
2014-03-22 09:54:42 +01:00
scrawl
0c207f7212
Fix build error
2014-03-22 02:08:09 +01:00
scrawl
394284d0f8
Fixes #1209 : Tarhiel never falls
...
There are a few pitfalls with this code:
- Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
- The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
2014-03-22 02:08:04 +01:00
Alexander "Ace" Olofsson
317f1e0b63
Update dialoguesubview.cpp
...
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160
compensated for different coordinate systems
2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717
update/close on deletion of reference/referenceable
2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3
update preview title on changed referenceableID (preview for references only)
2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67
deal with empty and invalid referenceable ID fields
2014-03-21 12:44:06 +01:00
Marc Zinnschlag
1a9df4bc56
Merge branch 'preview'
2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299
better fix
2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5
fixed encoding problems
2014-03-21 11:56:48 +01:00
Marc Zinnschlag
10ce47938b
update preview on reference/referenceable changes
2014-03-21 11:22:43 +01:00
Marc Zinnschlag
2128d3008c
Merge branch 'master' into preview
2014-03-21 08:12:06 +01:00
slothlife
6dce3e5186
Fixed include to use C99 header, not C++11 header
2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179
Move weather state save/load to a new class
2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921
Play item sound when trying to sell a bound item, too.
2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2
Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'
2014-03-20 22:27:28 +01:00
Marek Kochanowicz
fbb619db73
…
2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa
where was my mind…
2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd
moved buttons down
2014-03-20 19:53:03 +01:00
Marek Kochanowicz
832a10b2ac
solving problems
2014-03-20 18:40:10 +01:00
Marc Zinnschlag
1a1d52c513
fixed a column ID problem
2014-03-20 14:19:50 +01:00
Marek Kochanowicz
5c34823bb0
added some placeholder icons
2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1
prevent deleting already deleted record
2014-03-20 08:59:04 +01:00
slothlife
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27
Play item sound even if merchant doesn't purchase it.
2014-03-19 20:08:01 -05:00
Marek Kochanowicz
ea9b6fa37e
view button
2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65
added preview button
2014-03-19 11:43:25 +01:00
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
Marek Kochanowicz
010160d047
missed those :/
2014-03-18 20:56:55 +01:00
Marek Kochanowicz
c0b2b783cb
use more proper creators
2014-03-18 20:53:21 +01:00
Marek Kochanowicz
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
2014-03-18 19:24:10 +01:00
Marek Kochanowicz
db774b02d7
clone and create buttons work
2014-03-18 09:36:22 +01:00
pvdk
ef617fdf3d
Fail on the first error whilst extracting an archive
2014-03-18 00:33:31 +01:00
pvdk
667b0de250
Fixed problems with cd content autodetection
2014-03-17 23:39:21 +01:00
pvdk
2e1248537e
Minor fixes, installation should stop after one error message now
2014-03-17 21:33:44 +01:00
Marek Kochanowicz
95afca0558
delete record button
2014-03-17 19:28:41 +01:00
Marek Kochanowicz
7296b09357
revert button
2014-03-17 19:18:18 +01:00
pvdk
9e5e19f9cb
Improved existing installation handling
2014-03-17 18:28:05 +01:00
pvdk
ae5f783a16
Added some eye-candy to the wizard: a watermark and a placeholder icon
2014-03-17 17:50:51 +01:00
Marek Kochanowicz
09ba547630
use tool buttons with icons
2014-03-17 15:35:36 +01:00
pvdk
254fe0a424
Made install functions use file finding methods and improved error handling
2014-03-17 14:31:50 +01:00
scrawl
128a47570e
One more fix
2014-03-17 14:15:52 +01:00
scrawl
4443e22387
Build fix
2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
pvdk
ef16b46148
Wizard now autodetects correct installation archive
2014-03-16 22:09:20 +01:00
scrawl
81dfc26d26
mwscript/locals was added twice
2014-03-16 21:39:46 +01:00
pvdk
b2156351d8
Work in progress commit, working on data1.hdr autodetection
2014-03-16 20:07:54 +01:00
pvdk
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
2014-03-16 20:05:12 +01:00
Marc Zinnschlag
20ea859aac
adjusted the far clip distance
2014-03-16 17:14:44 +01:00
sirherrbatka
3c8eeb8c48
added comment
2014-03-16 17:11:13 +01:00
Marc Zinnschlag
6b11265fbc
consider scale and orientation when previewing reference
2014-03-16 17:06:45 +01:00
Marc Zinnschlag
48ea93d890
less random camera start position
2014-03-16 17:06:30 +01:00
sirherrbatka
4a0d1ba272
do not cast and check multiple times
2014-03-16 17:06:11 +01:00
Marc Zinnschlag
fa042a8aca
use proper title for reference prewview subviews (avoid internal ID)
2014-03-16 13:22:32 +01:00
Marc Zinnschlag
8b36de6c67
Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'
2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467
Merge remote-tracking branch 'cc9cii/AiWander-fix'
2014-03-16 12:47:30 +01:00
Marc Zinnschlag
c36dfef972
prewview subview
2014-03-16 12:44:01 +01:00
cc9cii
f71fb83bfc
Cleaned up more inaccurate comments.
2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f
Revert to original variable names.
2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7
Remove unnecessary comment.
2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700
Apparently fall trace needs to be done with the middle of the object.
2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4
Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.
2014-03-16 08:09:14 +11:00
scrawl
d08394bf78
Fixes #1205 : apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)
2014-03-15 21:00:25 +01:00
scrawl
61955111f1
Fixes #1204 : Any health value < 1 should show as empty life bar.
2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2
Fixes #1197 : incorrect mouse wheel step
2014-03-15 20:34:12 +01:00
scrawl
3880247017
Fixes #1206 : effect texture override was not accounted for
2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf
Merge remote-tracking branch 'gsedej/master'
2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8
Oops. Fix typo picked up by Zini.
2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2
Fix spelling errors in comments.
2014-03-14 07:04:39 +11:00
Marek Kochanowicz
4a623ace71
disabling works
2014-03-13 18:41:37 +01:00
Marek Kochanowicz
c97172d89c
fixed segfault and prevent drops from other documents
2014-03-13 17:00:14 +01:00
Marek Kochanowicz
e1a4b64efb
fixed segfault
2014-03-13 16:50:04 +01:00
cc9cii
d54ae58ec9
Bug #900 fix - minor update to comments
2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9
Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.
2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8
reworked code for player positioning on startup and new game
2014-03-13 13:19:32 +01:00
Marek Kochanowicz
dd755a00e4
fix for the bug (?)
2014-03-13 08:52:37 +01:00
Marek Kochanowicz
cc1ceb35ce
drag and drop works
2014-03-12 20:34:55 +01:00
Marek Kochanowicz
fd4829141d
succesfully connected the signals
2014-03-12 19:55:51 +01:00
Marek Kochanowicz
1bf67e7390
added the new qlineedit subclass
2014-03-12 19:36:46 +01:00
Marek Kochanowicz
30a0c82e22
this code segfaults, but i don't know why
2014-03-12 16:28:10 +01:00
Marek Kochanowicz
919065db32
fixed segfault
2014-03-12 16:06:59 +01:00
Marek Kochanowicz
d1290ac556
skip deleled or erased records
2014-03-12 15:46:27 +01:00
Marek Kochanowicz
2278eb5e91
handle locking
2014-03-12 15:17:49 +01:00
Marek Kochanowicz
1a9d4204d2
correction
2014-03-12 15:07:17 +01:00
Gašper Sedej
43a12fffd5
indentation issue...
2014-03-12 14:37:44 +01:00
Marek Kochanowicz
2e226e63b6
change universalid of base subview after pressing next or prev
2014-03-12 13:04:40 +01:00
Gašper Sedej
d72a2f1ffb
Added code to test if git hash is availible
2014-03-12 12:33:42 +01:00
Marek Kochanowicz
cb9bcc3cc1
buttons are functional
2014-03-12 12:25:37 +01:00
scrawl
0cd40294a2
Fixed ranged combat for creatures
2014-03-12 11:30:44 +01:00
Marek Kochanowicz
299b7a6ce6
Added buttons, they don't do anything.
2014-03-12 11:08:04 +01:00
Gašper Sedej
06e02ed77f
Added version and revision number to mainmenu
2014-03-12 10:53:56 +01:00
Marek Kochanowicz
8d50af547a
created editwidget
2014-03-12 10:39:28 +01:00
Marek Kochanowicz
865e6b52ae
scroll area
2014-03-11 21:21:05 +01:00
Marek Kochanowicz
c422dc6eed
Refactorisation.
2014-03-11 20:40:31 +01:00
Marek Kochanowicz
5ad572346b
referencables also work now
2014-03-11 13:02:25 +01:00
Marek Kochanowicz
1edf5a4414
registered additional subviews.
2014-03-11 10:47:30 +01:00
Marek Kochanowicz
87286232d7
fixed bug, god bless overloading
2014-03-11 09:38:53 +01:00
Marek Kochanowicz
a25271f0b6
moving bloat away from the dispatcher
2014-03-11 09:14:13 +01:00
Marc Zinnschlag
ef1364878f
moved test cube from SceneWidget to WorldspaceWidget
2014-03-10 18:35:49 +01:00
Marek Kochanowicz
17b521cec8
additional check
2014-03-10 17:57:40 +01:00
Marek Kochanowicz
f4614c2c63
use qlabels for not editable fields
2014-03-10 17:52:45 +01:00
Marek Kochanowicz
089732419a
introduce longString
2014-03-10 17:18:29 +01:00
Marek Kochanowicz
cc96a38921
use qlinedit for the var
2014-03-10 13:27:52 +01:00
Marek Kochanowicz
874847c959
handle color
2014-03-10 13:25:01 +01:00
Marc Zinnschlag
7812427836
added Preview submenu item; fixed View issues regarding exterior cells
2014-03-10 12:44:34 +01:00
Marek Kochanowicz
73cb3ac0ed
embelishing
2014-03-10 12:04:03 +01:00
Marek Kochanowicz
361bc55973
dont force trying display
2014-03-10 09:47:41 +01:00
Marek Kochanowicz
9ab920bd80
display id and other not editable data
2014-03-10 09:37:53 +01:00
Marek Kochanowicz
b2fdaa74b0
trying to set the size policy
2014-03-09 18:44:04 +01:00
Marc Zinnschlag
2b17f5dde9
register resources locations on editor startup
2014-03-09 12:32:21 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
Marek Kochanowicz
7eb10756d4
some extra views enabled
2014-03-09 08:58:24 +01:00
scrawl
6eaa7553f8
Fixes #1181 : Enable controls when loading a savegame
2014-03-09 03:34:49 +01:00
Sandy Carter
72a3c50eb8
( #1191 ) Disallow picking up if inventory disabled
...
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
2014-03-08 13:45:54 -05:00
Marek Kochanowicz
0447be7e7a
register extra views. do not display id
2014-03-08 17:24:00 +01:00
Marek Kochanowicz
1f1774b5e1
changing the enumdelegate seteditordata
2014-03-08 16:54:05 +01:00
Marek Kochanowicz
9612c6a6fd
handle also bool boxes
2014-03-08 16:50:42 +01:00
Marek Kochanowicz
08ccae6b49
handle comboboxes
2014-03-08 16:21:49 +01:00
Marek Kochanowicz
a8b11829d4
disable not editable widgets
2014-03-08 15:18:40 +01:00
Marek Kochanowicz
3c60345d6b
nest wrapper into the proxy class
2014-03-08 15:15:00 +01:00
scrawl
072dc6d438
Feature #50 : Implement marksman mechanics.
2014-03-08 06:03:45 +01:00
scrawl
12de0afb03
Feature #50 : Spawn projectiles
...
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
2014-03-08 01:31:27 +01:00
Marek Kochanowicz
2e6b45dafb
edit view, savind works
2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f
just saved progress
2014-03-07 17:15:43 +01:00
cc9cii
f36bea03ab
Bug #1189 fix by scrawl
2014-03-07 19:36:44 +11:00
Marek Kochanowicz
b0ae78e889
basicly enabled code
2014-03-06 20:10:13 +01:00
Marc Zinnschlag
f1353dc84f
Merge branch 'scene'
2014-03-06 16:46:44 +01:00
Marc Zinnschlag
516a3b9abd
close interior cell view when cell is deleted
2014-03-06 16:40:08 +01:00
Marc Zinnschlag
0254a209f6
some general cleanup
2014-03-06 13:51:21 +01:00
Marc Zinnschlag
f04348fb8e
do not offer view action for cells flagged as deleted
2014-03-06 13:43:06 +01:00
Marc Zinnschlag
4a119c8f46
ambient lighting in interior cells
2014-03-06 13:02:21 +01:00
Marc Zinnschlag
7e0f0c8402
fixed SceneWidget destructor
2014-03-06 12:42:09 +01:00
Marc Zinnschlag
397921e457
specialising WorldspaceWdiget into paged and unpaged subclasses
2014-03-06 10:13:39 +01:00
Marc Zinnschlag
7386d3eb0b
moved navigation into the WorldspaceWidget
2014-03-06 10:01:23 +01:00
scrawl
e08f6c9ce3
Bug #416 : Copy framebuffer to a texture instead of not clearing
...
Potentially faster than the previous workaround, and should work for triple buffering too.
2014-03-06 04:01:25 +01:00
scrawl
83b6fcf22e
Bug #416 : Workaround for page flipping problem
2014-03-05 22:24:05 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069
Set StaticGeometry origin
...
Fixes an exception for coordinates far away from (0,0,0).
2014-03-05 21:46:37 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
scrawl
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
2014-03-05 21:46:37 +01:00
scrawl
065b6d3331
Terrain: moved ESM::Land load to earlier in the startup procedure
...
Required for background loading as we cannot load ESM::Land data from background threads.
2014-03-05 21:46:36 +01:00
scrawl
8730b61362
Render maps after *all* cells have finished loading
...
Still not fixing Bug #772 , but at least this will allow for background loading of terrain.
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
cc9cii
ce8d327e8e
Debug MSVC build of openmw needs number of sections beyond 2^16
2014-03-05 22:11:10 +11:00
gus
d84319300a
fix
2014-03-05 11:27:16 +01:00
gus
f4879dacd5
add AIfollow to summoned creatures
2014-03-05 11:24:39 +01:00
Marc Zinnschlag
a264e86e13
subclasses scene widget for worldspace scenes
2014-03-04 14:47:43 +01:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
0ae9cc0106
removed unused function
2014-03-03 08:21:16 +01:00
Marc Zinnschlag
26c2f28879
replaced global world->scene menu item with individual view context menu items in cell and reference tables
2014-03-02 22:43:44 +01:00
Marc Zinnschlag
55195f819a
changed edit requests from row index format to UniversalId/hint format
2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee
added hint parameter for UniversalId viewing requests
2014-03-02 13:29:02 +01:00
Marc Zinnschlag
cb3994281c
changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)
2014-03-02 13:11:15 +01:00
Marc Zinnschlag
ca30f2af3d
minor fix
2014-03-02 11:03:37 +01:00
Marc Zinnschlag
536a0e0ab0
added orbit navigation mode
2014-03-01 14:15:04 +01:00
scrawl
a99aa15d14
Fix a copy&paste mistake leaving start rotation uninitialized
2014-02-28 17:23:58 +01:00
Marc Zinnschlag
4d3abeedcb
keep camera upright in 1st person mode
2014-02-28 13:37:01 +01:00
Marc Zinnschlag
ae637d6abc
rolling
2014-02-28 11:58:03 +01:00
Marc Zinnschlag
0926501717
Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29
2014-02-27 15:45:45 +01:00
Marc Zinnschlag
4eea2c7a86
added free navigation mode
2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756
moved implementation of the 1st person camera into a separate file
2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62
added navigation class
2014-02-27 14:46:06 +01:00
cc9cii
56ae85df0c
Fix 32bit Windows crash while taking the save screenshot.
2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480
sync with upstream
2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
pvdk
05f8af0757
Use the correct encoding for the ini importer
2014-02-25 18:15:29 +01:00
pvdk
6b9082c6ba
Support different Tribunal patch .esm location, as seen on German GoTY disk
2014-02-25 17:36:55 +01:00
pvdk
d30c4edb14
Support separate Splash directory, found in some installation media cabinets
2014-02-25 17:23:26 +01:00
pvdk
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
2014-02-25 15:33:30 +01:00
Marc Zinnschlag
8f73cc9268
added navigation mode selection
2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51
inverted ctrl key
2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de
fixed mouse button release detection
2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508
camera rotation via ctrl-left button drag
2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949
getting rid of some magic numbers
2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013
camera panning via left button drag
2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0
mouse wheel zooming
2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5
moving the camera with A and D keys
2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259
use shift key to speed up camera movement
2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6
moving the camera with W and S keys
2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3
added navigation mode enum to SceneWidget
2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1
re-enabled OGRE in OpenCS; cleaned up startup
2014-02-25 11:58:32 +01:00
cc9cii
5b48ca114f
aicombat pathfinding fix - check the correct list
2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f
Minor cleanup for aicombat pathfinding workaround.
2014-02-25 08:30:52 +01:00
pvdk
36d4287da4
Fixed openmw.cfg handling: file should not be cleared anymore
2014-02-24 15:59:44 +01:00
Nikolay Kasyanov
76c1d60d23
Fixed OpenCS build on OS X
2014-02-24 15:59:05 +01:00
pvdk
fb59112b74
Merge remote-tracking branch 'upstream/master' into wizardhead
2014-02-24 13:58:51 +01:00
Marc Zinnschlag
c62a352956
Merge branch 'cellstore'
2014-02-24 10:03:13 +01:00
Marc Zinnschlag
9b18e01507
keep track of which cells have state that needs to be saved
2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0
encapsulated reference collections
2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144
make Ptr a bit more pointer-like
2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58
encapsulated water level
2014-02-23 17:34:18 +01:00
gus
95ff869163
Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2
2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06
encapsulated mIds
2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8
encapsulated mState
2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0
aicombat pathfinding workaround
2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c
Back out unnecessary change.
2014-02-22 23:22:23 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Nikolay Kasyanov
59508e914f
Fixed OpenCS build on OS X
2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9
accept drops from filters table. Cool. ☺
2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543
additional check on droping to prevent exception
2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0
Installing basic event filter
2014-02-21 12:48:39 +01:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
Marek Kochanowicz
55e9083570
refactorisation
2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf
fixed bugs, added extra display_type
2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1
Features implemented. Time to debug.
2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92
try with the passing action
2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015
We can handle droping multiple records
2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c
correcting
2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f
Const correctness
2014-02-20 12:43:09 +01:00
Marc Zinnschlag
736644de05
Revert " #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
...
This reverts commit 51fb9f65ea
2014-02-20 12:31:40 +01:00
Marek Kochanowicz
eb3cbaa4e1
Create filter on droping record.
2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa
Propagate signal to the edit widget
2014-02-20 11:07:04 +01:00
pvdk
755c99df3c
Some minor fixes
2014-02-19 19:26:51 +01:00
pvdk
6916c0bc94
Wizard now writes valid Morrowind.ini files
2014-02-19 19:26:51 +01:00
pvdk
e8170adde5
Some minor changes, implemented suggestions
2014-02-19 19:26:50 +01:00
pvdk
ceb66d0790
Also install the separate Sounds directory for Tribunal
2014-02-19 19:26:50 +01:00
pvdk
5024f1bf77
Added a warning when trying to install tribunal after bloodmoon
2014-02-19 19:26:50 +01:00
pvdk
2ccf4d6112
Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl!
2014-02-19 19:26:50 +01:00
pvdk
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
2014-02-19 19:26:07 +01:00
Marek Kochanowicz
fca7701359
Column titles retrived and passed to the filterbox.
2014-02-19 16:15:51 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
Marek Kochanowicz
d7a1abb30b
emit signal with types (will be connected to the tablesubview)
2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c
Accept drops on the filterbox
2014-02-19 12:32:48 +01:00
Marek Kochanowicz
569533eeae
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-19 11:23:53 +01:00
scrawl
d25b3ad9cb
Fix AiCombat for creatures with weapons
2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf
Don't list unnamed quests in the quest book
2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
bc376e6649
Closes #888 : Treat "Bip 01" as animation root if existing
2014-02-19 11:23:03 +01:00
scrawl
439018e706
Get rid of useless return values
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marek Kochanowicz
e9664d80bd
make convert enumns public static
2014-02-19 11:22:47 +01:00
Marc Zinnschlag
550e5eb686
Merge remote-tracking branch 'corristo/osx-music-fix'
2014-02-18 09:12:02 +01:00
gus
d8f24ac499
bug fix
2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77
Merge remote-tracking branch 'gus/AIFix2'
2014-02-17 10:54:07 +01:00
gus
84959eea28
woops, thanks scrawl
2014-02-17 10:50:10 +01:00
gus
6e1425321b
remove cout spam
2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6
clean up
2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507
Improvements.
2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041
allow _foo ids without qoute
2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e
May only include alphanumeric characters and underscores and may not start with a number.
2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3
very basic, but safe putting down " "
2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3
Fixed build on OS X
2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f
checking for the source of the drop, reject those from other files for now
2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26
Merge remote-tracking branch 'potatoesmaster/disable-crash'
2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95
removed misplaced bracket
2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195
Put the id in the quote.
2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88
-journalinfo +topic
2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4
implemented whitelist of allowed types in the scripts
2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a
allow drag and drop into the script edit window.
2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf
created new files
2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479
Fix breaking of enchanted items casting
2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5
fixed referenceable-loading in case of more than one content file
2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902
improved script check error messages
2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956
small reformatting
2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5
more readable code.
2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957
fixing case broke sorting in script context
2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6
disable warnings by default in script verifier
2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8
Checking if the drop comes from same document.
2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e
store const ref to the document in the table.
2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec
long line split.
2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147
Splited very long line.
2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3
Documentation, corrections.
2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a
added script verifier
2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff
fixed CSMWorld::ScriptContext::isJournalId
2014-02-14 12:56:05 +01:00
gus
a315d5cc2b
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538
nicer formatting
2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d
added missing implementation for CSMWorld::ScriptContext::getMemberType
2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8
added missing implementation for CSMWorld::ScriptContext::getGlobalType
2014-02-14 11:59:33 +01:00
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
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030
bug with sequence of knockouts; giving sense to some hit state code
2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4
added support for serialisation of CustomData state
2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484
Fix gold bugs ( Fixes #1145 , Fixes #1146 )
2014-01-29 15:37:27 +01:00
scrawl
305e78c981
Fix creature attack bug
2014-01-29 15:37:27 +01:00
scrawl
e717694b36
Reset Run stance in AiWander
2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc
Fixes #1143 : Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
...
This makes the Mehra Milo script work properly.
2014-01-29 15:37:27 +01:00
scrawl
434fd21584
Don't set journal index if a higher index is currently set
...
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
2014-01-29 15:37:27 +01:00
scrawl
edff88542b
Allow double click / Enter key for accepting race/class/birthsign
2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce
Don't crash when deleting or disabling a moving door
2014-01-29 15:37:26 +01:00
scrawl
190512156d
Use some more GMSTs for enchanting
2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2
Move WhenStrikes skill success to a more appropriate place
2014-01-29 15:37:26 +01:00
scrawl
b8db151da7
Add missing skill increases for armor hits
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
scrawl
cc40cec395
Move levelup to NpcStats
...
The code came from back in the days where NpcStats did not derive from CreatureStats.
2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8
Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail.
...
This caused an exception when looting a creature that had moved cells.
2014-01-29 15:37:26 +01:00
scrawl
365ae15532
Drag&Drop: auto-hide windows that can't be drop targets on mouseover
2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8
attacktypes error fix
2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096
Merge remote-tracking branch 'sirherrbatka/cloning'
...
Conflicts:
apps/opencs/model/world/refiddata.cpp
2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab
Corrections, according to the comments. Thanks for the review. :-)
2014-01-28 11:16:48 +01:00
pvdk
1262eab03a
Added some nice error messages to the installation process
2014-01-28 01:03:47 +01:00
pvdk
2736527e5a
Did some cleanup work on the unshield thread: more code re-use
2014-01-27 22:54:14 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
pvdk
802448b217
Added a settings page to the launcher
2014-01-27 20:14:02 +01:00
Marek Kochanowicz
d3000ce099
whitespaces removed again.
2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066
Cleared whitespaces.
2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1
Removed needless includes
2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef
Corrected bug mentioned by zini.
2014-01-27 16:59:18 +01:00
pvdk
3fd88aca59
Re-added support for GoTY disks and added a messagebox, displayed when done
2014-01-27 16:51:22 +01:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
pvdk
8db333c8d0
Made the getter/setter functions thread-safe
2014-01-27 15:12:02 +01:00
Marek Kochanowicz
ed0ba906cf
removed needless include
2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c
ok, that should be enough
2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1
formatting
2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be
spaces around operators
2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435
reforfucking
2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6
still reformating
2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827
reformating
2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610
reformating
2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f
reformatting
2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7
removed needless member value.
2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8
Removed pointless includes.
2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754
Chaninging variables name to follow our policy.
2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3
removed needless argument for cloning
2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89
corrected mistake in data
2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87
removing coordinates handling
2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd
Fix massive console spam regarding the scrib's idle3 animation
2014-01-26 02:49:32 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b1047bbe43b2
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2ffec26342cd
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
pvdk
cdbf5c68b0
Implemented selection of installation media and added forgotten file
2014-01-24 22:25:22 +01:00
Marek Kochanowicz
032c542396
improving the cell cloning.
2014-01-24 20:34:33 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77
Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame
2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a
Fix being able to activate magic bolts mid-flight
2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62
Fix projectile bug
2014-01-24 13:22:30 +01:00
Marek Kochanowicz
01be9386d6
Id to the coordinates with the boost and explicit specialisations of template member functions.
2014-01-24 11:22:20 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
Marek Kochanowicz
f390c7f4b0
Disable widgets in the cell creator.
2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d
Disable reference creator widget when in the clone mode.
2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8
Disable not needed referencable creator widget when in cloning mode.
2014-01-23 16:00:44 +01:00
Marek Kochanowicz
1b1ecafdd8
introduced missing columns to data
2014-01-23 15:13:37 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
scrawl
70264eae3b
Feature #764 : Quest completetion status in quest book
2014-01-23 13:08:56 +01:00
scrawl
849ee54399
Feature #764 : Show quest names in quest book if present
2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa
ignore deleted references that did not came from a content file
2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f
Closes #1060 : Fix incorrect message box size
2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
Marek Kochanowicz
4d9d31b25e
refrences cloning does not work
2014-01-23 09:41:09 +01:00
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0
Fix GetPcCell bug
2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f
Fix PC Health Percent function
2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
Marek Kochanowicz
b3b51992ef
copying references.
2014-01-21 21:37:21 +01:00
Marc Zinnschlag
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517
adding missing cleanup for SoundManager
2014-01-21 14:13:13 +01:00
scrawl
82a07af72c
Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.
2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9
Use fCombatDistance
2014-01-21 12:30:23 +01:00
scrawl
a4404054bb
Feature #1130 : Add race power spells for NPCs as well, not just the player
2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29
Feature #1130 : Add auto-calculated NPC spells
2014-01-21 12:30:23 +01:00
scrawl
851a7d5014
Feature #957 : Handle area effects for "on touch" range
2014-01-21 12:30:15 +01:00
Marek Kochanowicz
bc0130f8d8
do not double check if record is deleted
2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b
Cloning works for referencables as well.
2014-01-21 09:43:02 +01:00
Marek Kochanowicz
7594bcf97a
Small refactoring.
2014-01-21 08:27:29 +01:00
Marek Kochanowicz
d0a52b7b24
mostly refreshing view.
2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef
Small correction.
2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05
Properly check if clone is deleted.
2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701
implemented check for deletion. But it seems flawed.
2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a
added setId to adapter
2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6
lower case in command, not in the collection
2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b
Cloning works for single record type tables. Well, kinda.
2014-01-20 13:59:00 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
42284603f7
Properly handle on target effects with mArea=0
2014-01-20 13:44:38 +01:00
scrawl
9cedd3bb2e
Fix spell area not displaying in tooltip
2014-01-20 13:11:34 +01:00
scrawl
205e8aa4e9
Feature #957 : Implement area magic
2014-01-20 13:11:29 +01:00
scrawl
ba5300b071
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a
Loop projectile sounds
2014-01-20 11:50:52 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
scrawl
fec26342cd
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02:00
scrawl
05e75e1214
Closes #1127 : Fix for subtitles for idle dialogue appearing outside of hearing range
2014-01-19 20:54:05 +01:00
scrawl
bea161331c
Play 'hello' voiced dialogue entries in AIWander
2014-01-19 20:53:58 +01:00
Marek Kochanowicz
0ea2bb7c4c
Working on commands
2014-01-19 16:49:39 +01:00
scrawl
0adc0f56ed
Issue #777 : Consider weapons in Creature::hit
2014-01-19 16:13:16 +01:00
scrawl
9723263730
Bug #1126 : Tweak creature attack distance a bit (still no idea where this should come from)
2014-01-19 14:47:58 +01:00
scrawl
1a00f26390
Bug #1126 : Golden saints and many other creatures only have "Bip01 Head"
2014-01-19 14:33:41 +01:00
scrawl
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2
Don't complain about missing jump animations
2014-01-19 13:46:40 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
scrawl
198bb0de60
Issue #777 : Add CreatureAnimation variant for creatures with weapons/shields
2014-01-19 13:05:26 +01:00
Marek Kochanowicz
b3e45c55bc
progressing with the cloning
2014-01-19 11:44:47 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
69ca03c308
Issue #777 : Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
2014-01-19 09:43:41 +01:00
scrawl
947b6c9645
kOgrePi unused
2014-01-18 22:16:31 +01:00
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f
on load check player record for dangling ID references
2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01
reset reference to player NPC record during cleanup
2014-01-18 14:53:25 +01:00
mrcheko
969340d61b
fixed StartCombat script
2014-01-18 12:55:17 +02:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
scrawl
c04a8afc8b
Make sure onPcEquip is also set for Equip script instruction
2014-01-18 10:51:52 +01:00
scrawl
9653355cf1
Feature #701 : Spawn levelled creatures in cells
2014-01-18 07:26:27 +01:00
mrcheko
df4df5b094
fixed weapRange for creatures/startcombat script(?)
2014-01-17 23:30:28 +02:00
scrawl
5049f3b134
Fix the group for creature attack animations
2014-01-17 20:18:35 +01:00
mrcheko
a11a6b616b
Merge remote-tracking branch 'upstream/master'
2014-01-17 21:00:55 +02:00
mrcheko
435bbdd530
one more mismatch fixed
2014-01-17 20:55:21 +02:00
mrcheko
46a4790cb1
final warnings removal
2014-01-17 20:33:49 +02:00
mrcheko
7df8273d71
fix for everybody
2014-01-17 20:01:15 +02:00
scrawl
3dcb292bc1
Do not soul trap creatures without a soul (which apparently exist)
2014-01-17 18:43:45 +01:00
mrcheko
5357f569e6
fix for scrawl
2014-01-17 19:36:22 +02:00
scrawl
149d77dedf
Feature #960 : Add knockdown and hit recovery for creatures
2014-01-17 17:41:16 +01:00
scrawl
9b32b1403b
Feature #960 : Implement Creature::hit
2014-01-17 17:19:08 +01:00
scrawl
228254c890
Handle creature attack animations in character controller
2014-01-17 16:31:27 +01:00
scrawl
c76a0448a3
Closes #1123 : Implement SlowFall magic effect
2014-01-17 15:47:34 +01:00
scrawl
27d0d9c592
Fix exception when clicking on statics when in the inventory window
2014-01-17 15:27:59 +01:00
scrawl
5fc38e7ac4
Don't use blood effects for fatigue damage
2014-01-17 15:20:28 +01:00
scrawl
c548dcee13
Quick keys menu: make sure selected spell still exists
2014-01-17 15:20:22 +01:00
pvdk
0f7f3391f7
WIP: Working on the installation of addons
2014-01-17 13:21:44 +01:00
Marc Zinnschlag
1b7697a4b2
handle missing player specific state during load/save
2014-01-17 13:07:57 +01:00
scrawl
805843d7ff
Closes #1086 : Implement blood effects
2014-01-17 11:27:13 +01:00
scrawl
240d96a0f1
Renamed AnimationValue to AnimationTime
2014-01-17 10:55:46 +01:00
scrawl
11394d83c5
Feature #1086 : Import blood models/textures in MWIniImporter
2014-01-17 10:55:46 +01:00
scrawl
ddc432c7ef
Fix stealing bug
2014-01-17 10:55:46 +01:00
scrawl
e410eb5273
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
2014-01-17 10:55:46 +01:00
scrawl
2836c7c927
Do not set owner when adding items to a container, as opposed to NPC/creatures
2014-01-17 10:55:46 +01:00
scrawl
fe66012bcd
Closes #1115 : Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.
2014-01-17 10:55:46 +01:00
scrawl
f070d9966d
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-17 10:55:46 +01:00
mrcheko
f2ad1c18f2
fix merging problem/some logic fixes
2014-01-16 22:24:05 +02:00
Alexander "Ace" Olofsson
ddf72c06de
Update statswindow.cpp
...
Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)
2014-01-16 12:09:50 +01:00
Marc Zinnschlag
c300cd9375
loading/saving of some player state (cell/coordinates and some other bits)
2014-01-16 12:03:23 +01:00
mrcheko
d5f794d4fb
update to combat ai behaviour
2014-01-15 22:56:55 +02:00
scrawl
ea8f60eddf
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-15 16:30:16 +01:00
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
7534fc968d
Minor acrobatics fixes
2014-01-15 14:53:30 +01:00
scrawl
28a2585106
Unsheath weapon in AiWander
2014-01-15 14:53:29 +01:00
scrawl
dff67bb0b6
StopCombat: mark as non-hostile
2014-01-15 14:53:29 +01:00
scrawl
da3295d69c
Closes #1106 : Move stance to CreatureStats, since creatures also have separate run/walk animations.
2014-01-15 14:53:29 +01:00
scrawl
03b2e99802
Remove unused Combat stance
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f
Minor fix
2014-01-15 14:53:28 +01:00
scrawl
a432661b8a
Minor correction
2014-01-15 14:53:28 +01:00
scrawl
de64c57179
Fix some typos and accidental commit
2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957
Being any idiot is hard.
2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104
Corrected brackets.
2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc
ooops, using search id
2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06
Localised version of morrowind will no longer spam false positives. Don't check diff, please.
2014-01-15 10:30:43 +01:00
Marek Kochanowicz
344cae8f99
added new entry to the context menu
2014-01-14 15:44:04 +01:00
greye
61707694e8
fix memory leak in AISequence
2014-01-14 16:22:50 +04:00
Marek Kochanowicz
6397d9d40e
Added mCloneAction member
2014-01-14 13:12:15 +01:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8
Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P
2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9
Moving back to boost for case insensitive comparsion.
2014-01-14 09:16:59 +01:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
69381c49c7
Added a todo comment
2014-01-14 07:39:44 +01:00
scrawl
b8583124e0
Correction for RemoveSoulgem instruction
2014-01-14 06:13:30 +01:00
scrawl
90b92a8f41
Move levelled list code out of ContainerStore
2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0
Revert "Bug #991 : Don't autoequip items with harmful permanent enchantments"
...
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e71d9755ef1
2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f
Closes #1105 : Do not reduce magicka if unable to cast
2014-01-14 03:34:30 +01:00
scrawl
396efd580b
Fix a leftover of the old coordinate system
2014-01-14 03:26:56 +01:00
scrawl
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
2014-01-14 03:08:37 +01:00
scrawl
95651857f3
Fix code duplication
2014-01-14 02:52:34 +01:00
scrawl
0d0005c433
Fix fatigue not restoring when waiting
2014-01-14 02:20:13 +01:00
Marek Kochanowicz
e34cb9e931
changed according to the scrawl sugestion
2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58
Creature check was not invoked.
2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c
fixed bug resposnsible for exception throwed.
2014-01-13 18:34:28 +01:00
scrawl
ba27b693f8
Increase sneak skill on successful pickpocket
2014-01-13 10:18:03 +01:00
scrawl
73268a8606
Fix skill progress not working
2014-01-13 10:18:03 +01:00
scrawl
cd06b2177d
Automatically knock down when fatigue goes below zero
2014-01-13 10:18:03 +01:00
scrawl
413bf127de
Allow drain fatigue effect to reduce below zero
2014-01-13 10:18:02 +01:00
scrawl
3a1b6dd354
Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.
2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5
Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.
2014-01-13 10:18:02 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
63cd70f810
some junk removal
2014-01-13 10:03:25 +01:00
scrawl
7983b07b10
Get bk_treasuryreport script to work properly:
...
- OnPcEquip needs to be set on *using* any item, not just equipping
- Handle PcSkipEquip
- Execute item's script once immediately after setting OnPcEquip
- Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
2014-01-13 06:20:18 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
gus
0e46c40cb5
Make ACtionTeleport non player specific and teleport actors following the teleporting actor
2014-01-12 14:03:11 +01:00
gus
1ae62665d6
get all actors following a given actor
2014-01-12 14:02:40 +01:00
gus
dd870e35db
get all actors following a given actor
2014-01-12 14:02:15 +01:00
gus
2446abe076
Allow getting current active package
2014-01-12 14:01:54 +01:00
gus
7e96a391da
FollowCell duration = 0 -> infinite time
2014-01-12 11:39:42 +01:00
gus
7066844e52
Follow you until a certain cell is reached
2014-01-12 11:38:58 +01:00
scrawl
f78b846f9e
Handle CasterLinked magic effect flag
2014-01-12 10:21:49 +01:00
scrawl
767c72e619
Fix diagonal movement being faster than forward movement
2014-01-12 10:04:06 +01:00
scrawl
fb778f8ecd
Use fEncumbranceStrMult
2014-01-12 04:09:51 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
921ef6cd9c
Closes #1093 : Show weapon when initializing the character controller with a weapon equipped
2014-01-12 00:42:27 +01:00
scrawl
10ddea45e9
Move crime from onHit to hit, since failed hits are apparently also a crime
2014-01-11 23:12:21 +01:00
scrawl
44b2380874
Closes #947 : Decrease fatigue when running, swimming and attacking
2014-01-11 22:28:50 +01:00
scrawl
dddc0979a2
Fix another fatigue cap issue
2014-01-11 22:28:50 +01:00
scrawl
224f288359
Don't attempt to change disposition for creatures
2014-01-11 21:30:26 +01:00
scrawl
3db299f1b2
Fix fall damage crash
2014-01-11 21:30:26 +01:00
gus
051d7141be
check position to stop AIFollow
2014-01-11 20:32:38 +01:00
Marc Zinnschlag
5ea25dc269
player state cleanup
2014-01-11 15:34:32 +01:00
Marc Zinnschlag
b1ffb64a1f
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 14:33:27 +01:00
gus
ccf07f9406
Bugfix
2014-01-11 12:07:10 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
gus
0609b71df9
fix pathfinding
2014-01-11 11:57:07 +01:00
Marc Zinnschlag
a0872b2646
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 11:51:53 +01:00
Marc Zinnschlag
1b03eec63e
Merge remote-tracking branch 'scrawl/master'
2014-01-11 11:43:12 +01:00
gus
828e5841d8
Windows SDL fix
2014-01-11 11:00:34 +01:00
scrawl
a2ba0dde31
Implemented GoToJail
2014-01-11 06:47:58 +01:00
scrawl
3896c88403
Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any
2014-01-11 05:58:05 +01:00
scrawl
9ddee8fd8c
Autocalculate NPC reputation as according to research wiki
2014-01-11 04:03:13 +01:00
scrawl
9127839cc1
Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.
2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
909494ff35
Implement Assault crimes. In other words, NPCs now fight back!
2014-01-11 03:08:16 +01:00
scrawl
12944f2459
Fix an auto equipping bug that allowed twohanded weapon and shield at the same time
2014-01-11 03:07:35 +01:00
scrawl
d4a98ffc27
Increase fight rating when being the victim of a crime
2014-01-11 02:27:44 +01:00
scrawl
aba72ffefe
Fix up the merge a bit
2014-01-11 02:12:41 +01:00
scrawl
727aa30347
Dead actors are unaware of everything
2014-01-11 02:06:54 +01:00
scrawl
d01f89b153
Rewrite some awful code
2014-01-11 00:24:21 +01:00
scrawl
e9f63270d9
Speed fix for "on target" spells
2014-01-10 22:51:42 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
d9d6f37619
Use iVoiceHitOdds
2014-01-10 22:44:40 +01:00
scrawl
15e48107f7
Use i1stPersonSneakDelta + some cleanup
2014-01-10 22:39:01 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
3bf36515d5
Implement Trespassing crime
2014-01-10 21:26:24 +01:00
scrawl
f5a70dccf0
Fix title of buttons in generate class result dialog
2014-01-10 21:13:03 +01:00
scrawl
627dcddb33
Do not allow training skills above their governing attribute
2014-01-10 20:53:53 +01:00
Marc Zinnschlag
f62497dfdc
Merge remote-tracking branch 'mrcheko/master'
2014-01-10 19:08:35 +01:00
mrcheko
ffcb7fb280
fix for bug scrawl mentioned
2014-01-10 19:04:07 +02:00
Marek Kochanowicz
cb0d3794f7
Final check is not performed with just +1! Something is not right.
2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62
replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.
2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c
Splited another long line in the header.
2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340
camel case in the header
2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64
splited long lines in the header.
2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89
Shameful bug fixed.
2014-01-10 09:42:36 +01:00
mrcheko
d41f27451b
appropriate camera vanity<>preview mode switch + hit recoils fix
2014-01-09 23:36:40 +02:00
scrawl
546b0cee76
Closes #1077 : Replace tags before trying to get the message length
2014-01-09 22:17:51 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
Marc Zinnschlag
5e2eb8caf8
Merge remote-tracking branch 'swick/master'
2014-01-09 09:47:42 +01:00
Marc Zinnschlag
85707b5e3e
Merge remote-tracking branch 'scrawl/master'
2014-01-09 09:35:54 +01:00
scrawl
768d9f7237
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
2014-01-09 02:21:03 +01:00
scrawl
223c1d5a38
Use GMSTs for crime bounty
2014-01-09 02:20:52 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1
Gold fixes (when did this break?)
2014-01-09 01:34:10 +01:00
Sebastian Wick
925d28e4a7
crashcatcher uname error checking
2014-01-09 00:52:37 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
372cd437d1
Add a utility function for counting items in a container
2014-01-08 23:00:29 +01:00
scrawl
c55f9bd0aa
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
2014-01-08 20:19:47 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Marc Zinnschlag
a7be755db0
Merge remote-tracking branch 'mrcheko/master'
2014-01-08 20:13:31 +01:00
scrawl
bf02b77c1d
Closes #1090 : Don't throw an exception if a cell has no region in GetPCCell
2014-01-08 19:57:13 +01:00
scrawl
154fae9f25
Don't suppress exceptions thrown while running scripts
2014-01-08 19:52:57 +01:00
scrawl
9baa1bef78
Expell player from faction when committing a crime against a faction member
2014-01-08 19:26:03 +01:00
scrawl
19d63f392f
Clean up the NpcStats expelled interface. Show message box when expelled.
2014-01-08 18:59:00 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
b99ca92fee
Add missing line of sight check
2014-01-08 17:18:13 +01:00
Nikolay Kasyanov
bc90443aeb
Revert "Music playback on OS X >= 10.9 works again. Fixes bug #1041."
...
This reverts commit fc21dd1f3a
2014-01-08 18:07:58 +04:00
mrcheko
46519062d3
hit recoils/knockdowns feature
2014-01-08 16:05:14 +02:00
scrawl
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
2014-01-08 02:35:36 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
728365b48d
Remove an unused hook
2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1
Implement theft detection
2014-01-07 19:58:17 +01:00
scrawl
d2d76f4f47
Fix disintegration bug
2014-01-07 19:21:19 +01:00
scrawl
c4ab2f417a
Fix exception closing container window
2014-01-07 18:11:19 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Marc Zinnschlag
48a08c4c4d
Merge remote-tracking branch 'endorph/master'
2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e
tabs -> spaces
2014-01-07 14:32:14 +02:00
Marc Zinnschlag
72a81a2381
Merge remote-tracking branch 'scrawl/master'
2014-01-07 10:17:33 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
ea3ee4407f
oops, didn't mean to commit this
2014-01-07 02:48:44 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
d536ff3cdc
printAIPackage: changed field name from Unknown to ShouldRepeat too.
2014-01-07 04:58:59 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
887db76ed2
Don't consider swimming or in-air characters as sneaking
2014-01-07 01:22:04 +01:00
scrawl
29c823b9d4
Implement awareness check function. Use this for combat AI and GetDetected instruction.
2014-01-07 00:51:09 +01:00
scrawl
4a3d148a48
Fixes #1089 (skill increases)
2014-01-07 00:37:52 +01:00
Marek Kochanowicz
b85fe2becf
Changes according to the comment.
2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
68b87714bb
Addition to 2f35e5a04e: companions should still auto equip
2014-01-06 22:14:11 +01:00
mrcheko
2591ff2d5a
bug repairing
2014-01-06 22:00:01 +02:00
Marek Kochanowicz
06f8537087
added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.
2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
Marc Zinnschlag
0ad7aa1f53
Merge remote-tracking branch 'scrawl/master'
2014-01-06 10:22:07 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e
Stop merchants from autoequipping items sold to them
2014-01-05 22:43:09 +01:00
Marc Zinnschlag
e63b4964b2
Merge remote-tracking branch 'scrawl/master'
2014-01-05 21:27:06 +01:00
scrawl
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
2014-01-05 20:53:45 +01:00
scrawl
73f8161d1e
Fix spell deletion not resetting the selected spell correctly
2014-01-05 19:40:05 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
2014-01-05 18:38:21 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
Marek Kochanowicz
c69814ed14
corrected one, additional name to follow policy
2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307
static is a keyword. renamed static to staticElement
2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f
npc instead of NPC.
2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204
forgot to save the file before comit -_-'
2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce
Chainging names to comply our policy.
2014-01-05 17:04:57 +01:00
scrawl
ce013315ba
Nothing to see here, move along.
...
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
Marek Kochanowicz
c1f4a9cb0e
Added proper id check.
2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa
Removing name check from listCheck. Id can't be empty to be sure.
2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865
changed ID check in leveled list to name.
2014-01-05 11:30:03 +01:00
scrawl
44e96fcaaa
Implement Charm magic effect
2014-01-05 01:56:36 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
634a53211c
Make sure materials are built before trying to determine their transparency
2014-01-04 22:56:06 +01:00
pvdk
92234cf783
Changed crashcatcher's uname system info retrieval and cleaned indentation
2014-01-04 21:46:38 +01:00
scrawl
c4e4a8fb57
Closes #1083 : Fix werewolf change handling
2014-01-04 20:50:18 +01:00
scrawl
f4517c8221
For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire
2014-01-04 20:50:18 +01:00
mrcheko
7002412760
resolve conflict in character.cpp
2014-01-04 17:55:09 +02:00
Marek Kochanowicz
e860717105
replaced raw values with enums.
2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571
implemented list of magical bolts for skipping.
2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551
Various style corrections.
2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60
Splited some long argument lists to the multiple lines.
2014-01-04 13:05:19 +01:00
Marc Zinnschlag
356b53bd22
Merge remote-tracking branch 'scrawl/master'
2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
2014-01-04 07:46:29 +02:00
scrawl
16838595a3
Another console fix: discard text markup when getting the command line's text
2014-01-04 05:24:32 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
710a1e2f37
Smash case for manual reference IDs as well, consistent with references in data files
2014-01-04 04:39:06 +01:00
scrawl
557652112f
Show the target HP bar also when casting a heal effect (same as MCP)
2014-01-04 04:21:44 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
09d491d1ba
Move a piece of functionality to its appropriate place
2014-01-04 01:13:19 +01:00
scrawl
be2ebc5cac
Closes #1081 : Implement disease contraction
2014-01-03 23:33:14 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
c0fbcf413f
Use the playermagic and playerfighting control switches
2014-01-03 22:44:35 +01:00
scrawl
e9bd43e2da
Use GMSTs for bound items/creatures
2014-01-03 20:54:14 +01:00
Marek Kochanowicz
1c3296fb64
Some changes in weapons check.
2014-01-03 18:25:06 +01:00
scrawl
617a65cdd2
Print message to dialogue window after successful trade
2014-01-03 17:40:14 +01:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
Marc Zinnschlag
ee621245bb
Merge remote-tracking branch 'scrawl/master'
2014-01-03 15:59:06 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
Marek Kochanowicz
7b63e1942c
style corrections
2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98
Finishing stuff.
2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf
Inventory item template.
2014-01-03 09:16:41 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
2014-01-03 03:48:43 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
623cdef69f
Code cleanup
2014-01-02 21:49:12 +01:00
scrawl
eba60858dd
Closes #1078 : Show stat bar text even when 0
2014-01-02 21:48:33 +01:00
Marc Zinnschlag
3b75f6676c
Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28
2014-01-02 21:27:08 +01:00
scrawl
299690631f
Implement SoulTrap magic effect
2014-01-02 21:21:28 +01:00
mrcheko
79e972bdb6
resolved accompanying minor problems
2014-01-02 21:54:41 +02:00
Lukasz Gromanowski
b017a3be3e
Bug #1074 : Inventory paperdoll obscures armour rating
...
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-02 20:20:57 +01:00
scrawl
596e0c8a49
Correct Dispel effect (use magnitude as chance)
2014-01-02 20:15:07 +01:00
scrawl
94d2ec8e4e
Add missing spells update
2014-01-02 20:02:28 +01:00
Marc Zinnschlag
5d3b696eb6
Merge remote-tracking branch 'scrawl/master' into openmw-28
2014-01-02 19:52:47 +01:00
scrawl
12de351feb
Check if levitation is enabled before levitating
2014-01-02 16:38:23 +01:00
scrawl
0990ca4b75
Closes #1072 : Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
2014-01-02 15:58:00 +01:00
scrawl
e6c0e187bc
Closes #1073 : Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
2014-01-02 15:44:58 +01:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
c558e12212
Don't try to move objects that are not in a cell
2014-01-02 03:06:48 +01:00
scrawl
993edf0384
Bug #1063 : Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.
2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb
Implement water walking
2014-01-02 02:03:44 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0
Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.
2014-01-02 01:03:44 +01:00
scrawl
899214a906
Use fVanityDelay
2014-01-02 00:13:23 +01:00
scrawl
c6421276bd
Closes #841 : Correct activation distance in third person mode
2014-01-01 23:59:17 +01:00
scrawl
24aa743573
Add function for converting feet to game units
2014-01-01 23:34:18 +01:00
scrawl
f6387d5979
Implement Telekinesis magic effect. Remove some duplicate code.
2014-01-01 23:30:58 +01:00
pvdk
691e007524
Redid the unshield thread stuff, this time the way it should be done
2014-01-01 22:46:29 +01:00
scrawl
531bef6193
Shorter Vector3 initialisation
2014-01-01 22:46:10 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702
error fix
2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd
Add starting spells when building player (F_PCStart flag)
2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04
more improvements
2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4
Remove redundant finding of default exterior position height
2014-01-01 18:05:28 +01:00
pvdk
a2ca7b92a2
Working on the unshield implementation, added support for moving temp files
2014-01-01 17:15:34 +01:00
scrawl
8e5cae1081
Implement mark/recall magic effects
2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b
Correction to the e9844e1 commit.
...
Restored interrior check in WeatherManager::update().
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf
Fix weird formatting added during the merge
2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea
Remove redundant setTeleported calls
2014-01-01 15:18:25 +01:00
Marc Zinnschlag
b19b277f18
temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)
2014-01-01 15:16:51 +01:00
Marc Zinnschlag
c3482b6f24
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
...
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd
Remember the last known exterior position of the player in case we fail to map the interior to a world position.
2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d
Fixes #417 : Apply weather instantly when teleporting
...
Correction to previous commit - WeatherManager->update()
will always be called.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37
Fixes #417 : Apply weather instantly when teleporting
...
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44
Closes #994 : Don't cap skills to 100 when set via console (except for modX variants)
2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65
Merge remote-tracking branch 'ace/fix'
2013-12-31 18:37:12 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
be1938ee90
Closes #805 : Don't add entities that are supposed to be invisible to static geometry
2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c
improved, added knockdown after falling
2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4
Don't try to set a cursor before one exists
2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91
added npc hit reactions
2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
Marek Kochanowicz
cb723710fe
Corrected stupid typo.
2013-12-30 19:24:53 +01:00
scrawl
b8ac37347c
Code cleanup for Class::canBeEquipped
2013-12-30 19:04:35 +01:00
Marek Kochanowicz
79bc149c73
reverting refidata.hpp
2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4
reverting refiddata.cpp
2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec
correcting
2013-12-30 18:41:16 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Marek Kochanowicz
3758fe3834
reformatted
2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390
Check for head and hair. Correct faction check.
2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Marek Kochanowicz
842e26b8e5
added comment
2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166
Dynamic_casting, checking rank. Commented out faction check, since it will not work.
2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1
Added faction check.
2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc
removing member size values, since this does not work properly.
2013-12-29 20:15:00 +01:00
Lukasz Gromanowski
c65f018760
Fixes #417 : Apply weather instantly when teleporting
...
Corrected constant name.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48
Fixes #417 : Apply weather instantly when teleporting
...
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2
Closes #1065 : Don't apply fall damage when landing in water
2013-12-29 00:36:36 +01:00
Marek Kochanowicz
bf0383fe05
Last fixes.
2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3
small oops + added new variables to the constructor
2013-12-28 17:35:04 +01:00
scrawl
2a8ab932ef
Bug #951 : Only recalculate derived stats when attributes change
2013-12-28 17:19:35 +01:00
Marek Kochanowicz
b9d1047ad6
Small fix for lights.
2013-12-28 16:18:16 +01:00
Lukasz Gromanowski
100edda8c0
Fixes #417 : Apply weather instantly when teleporting
...
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
Marek Kochanowicz
be6e47bcb6
Corrections
2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd
still working on npc check
2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a
Code compiles now
2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9
Check if threads are joinable before joining (issue with boost 1.52)
2013-12-27 22:38:30 +01:00
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
2013-12-27 22:13:55 +01:00
scrawl
85ec80100c
Bug #1005 : Hide torches/shields during spellcasting and hand-to-hand combat
2013-12-27 22:00:16 +01:00
scrawl
7265b427fe
Bug #1013 : Rewrote fall height detection
2013-12-27 21:21:18 +01:00
scrawl
02277db685
Bug #1052 : Don't use set/getOnlyText which discards escape characters
2013-12-27 19:52:10 +01:00
scrawl
686d9efac3
Bug #1060 : Fix incorrect spell type checks
2013-12-27 18:58:35 +01:00
scrawl
27092a4494
flagAsModified should be private
2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0
Use the material controller manager for effects with overridden texture
2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0
Bug #1054 : Set render queue group for effects
2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5
Add header to CMakeLists
2013-12-27 14:42:22 +01:00
scrawl
561c661156
Reset starting angle / position when adding world item to a container
2013-12-27 01:57:08 +01:00
scrawl
608bd0f525
Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028
2013-12-27 01:34:56 +01:00
scrawl
30b1da996b
Issue #1029 - Quick keys menu: Select compatible replacement when tool used up
2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01
Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.
2013-12-27 00:41:19 +01:00
scrawl
d09a86e208
Issue #1018 : Don't allow view mode switching while performing an action
2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1
Bug #991 : Don't autoequip items with harmful permanent enchantments
2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
a3ff9e5be8
Change destruction order - fixes a shutdown crash discovered with mesa
2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4
Rename nosound to no-sound for consistency
2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2
Remove unused command line option
2013-12-26 20:53:51 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc
Bug #1007 : Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible
2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed
Slight performance improvement for WindowManager::updateVisible
2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0
Fix an issue with items that have no UI icon
2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Marek Kochanowicz
f04a727af6
removed set sizes, consted sizes, added itemleveledlist check
2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790
checkin leveled items lists
2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf
added creature leveled list check
2013-12-26 18:16:54 +01:00
pvdk
3a55d88bac
Working on the installshield thread
2013-12-26 18:02:34 +01:00
Marek Kochanowicz
360a939aa0
Working on leveled lists now.
2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4
Added ingredient check
2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa
Added door check with related methods.
2013-12-26 12:59:43 +01:00
pvdk
40486370d9
Working on the Unshield functionality
2013-12-25 18:52:34 +01:00
pvdk
dddd9cba57
Added data path retrieval from openmw.cfg, to use as existing installs
2013-12-25 15:50:02 +01:00
pvdk
095ff4e17a
Moved launcher settings stuff into components, so they can be reused in the wizard
2013-12-25 00:50:25 +01:00
pvdk
3a37761d76
Some minor cleanups
2013-12-24 23:47:04 +01:00
pvdk
445f96434e
Added Morrowind.ini detection logic
2013-12-24 23:09:31 +01:00
Nikolay Kasyanov
9fabae5198
OS X: force Cocoa API for Ogre windows in OpenCS
2013-12-25 00:26:15 +04:00
pvdk
8ea31e5050
Working on a Morrowind.ini reader
2013-12-24 19:38:21 +01:00
Marek Kochanowicz
e4e7d50623
Added creatureCheck. I don't know meaning of all data fields here.
2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d
added mCreaturesSize
2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5
Added getCreatures
2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986
added container check
2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237
added mContainersSize.
2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de
added getContainers
2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42
Added armor check and related stuff.
2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb
Added armor check
2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf
Added check for non-positive quality of alchemical apparatus
2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b
Works, but it seems that I miss something in referencables. I will write post on the forum.
2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e
Added enchantmnet check for books.
2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8
Adde potionCheck method
2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e
Getting size of potions.
2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377
Small optimization.
2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0
Renamed getActivator to getActivators.
2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5
added getpotions
2013-12-21 10:58:05 +01:00
Lukasz Gromanowski
900bc06d2c
Fixes #845 : NPCs hold torches during the day
...
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.
Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.
Since this commit autoEquip() method doesn't automatically equip lights.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 22:38:23 +01:00
Marek Kochanowicz
f69465d7e0
Added aditional checks for books. Activator check.
2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792
Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
...
Currently only books are checked, and only if name is present.
2013-12-20 20:02:42 +01:00
Marc Zinnschlag
18e7e83585
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c
using gmst string
2013-12-20 14:04:59 +02:00
Lukasz Gromanowski
abc126e2af
Fixes #845 : NPCs hold torches during the day
...
Added check for Player character so it won't be affected by showing,
or hidding torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5
Fixes #845 : NPCs hold torches during the day
...
Added equipping/unequipping torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b
Fixes #845 : NPCs hold torches during the day
...
Simplified a bit code which shows and hides light.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-19 21:11:07 +01:00
mrcheko
3816a09c6f
bug 428 ask to load recent saved game
2013-12-19 22:08:34 +02:00
Marc Zinnschlag
16b3927f17
Merge remote-tracking branch 'scrawl/master'
2013-12-19 14:26:41 +01:00
scrawl
9afdf71af3
Fix crash with player->position command
2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63
Fix highlighted topics being selectable when in a choice
2013-12-19 00:26:08 +01:00
scrawl
876fb9a899
Addition to bb4bd999ba : adjust position for objects placed from inventory
2013-12-19 00:11:14 +01:00
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-17 19:33:32 +01:00
pvdk
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
2013-12-16 20:40:58 +01:00
mrcheko
a854eb73db
StateRunning check returns
2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2
Remove more unused code
2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
2013-12-16 15:40:47 +02:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
56893a097d
Don't stack used torches
2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39
Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.
2013-12-16 13:22:27 +01:00
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6
bug fix http://bugs.openmw.org/issues/428
2013-12-15 18:50:25 +02:00
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
2013-12-15 16:16:50 +01:00
pvdk
30710bad70
Modified components widget so the checked items can be stored for all pages to access
2013-12-15 15:13:49 +01:00
pvdk
77fe73799a
Enabled language setting to be accessable from different pages
2013-12-15 13:12:48 +01:00
Nikolay Kasyanov
fc21dd1f3a
Music playback on OS X >= 10.9 works again. Fixes bug #1041 .
2013-12-14 17:26:09 +04:00
pvdk
7132b9b0c5
Implement default installation path support for all platforms
2013-12-13 23:48:55 +01:00
Marc Zinnschlag
0890fa66b0
Merge remote-tracking branch 'mrcheko/master'
2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b
bug fix at http://bugs.openmw.org/issues/985
2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a
Revert "bug fix http://bugs.openmw.org/issues/985 "
...
This reverts commit 7a9b64c6f4
2013-12-13 19:02:25 +02:00
pvdk
c82f0ec35f
Implemented the language selection page
2013-12-13 15:30:49 +01:00
pvdk
d7f9604140
WIP: Working on the installation selection and added the ui for the language page
2013-12-13 13:38:49 +01:00
scrawl
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4
bug fix http://bugs.openmw.org/issues/985
2013-12-12 16:09:38 +02:00
Marc Zinnschlag
2a35c7d33a
fixed running global scripts a second time after they have been stopped
2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f
globals script cleanup; fixed potential case folding bug
2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91
store global variables in saved game files
2013-12-12 12:19:25 +01:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21
removed a redundant function for listing global variables
2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3
rewrote global variable storage (using ESM variant type now)
2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7
removed a redundant new
2013-12-10 12:31:18 +01:00
Emanuel Guevel
357ecd92b2
Do not display negative stat values
...
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
2013-12-10 00:41:36 +01:00
Emanuel Guevel
fc8bd1aacb
Allow fatigue stat to become negative when fatigue damages are taken
2013-12-09 21:53:04 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546
Ignore invisible targets for combat AI
2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
pvdk
0e1d3237fe
Added some logic to the page switching
2013-12-08 22:58:29 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
pvdk
8162f8370b
Added all the pages to the wizard
2013-12-08 21:35:57 +01:00
pvdk
f458f0c6c1
Added the Wizard .ui/resource files and some basic source to get started
2013-12-07 23:17:50 +01:00
Lukasz Gromanowski
8d63f8eea2
Fixes #998 : Setting the max health should also set the current health
...
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
scrawl
bb70deabb1
Add an incomplete implementation of SayAnimationValue (lip animation)
2013-12-07 14:15:45 +01:00
Marc Zinnschlag
1c13a9037a
save and load dynamic records
2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
e01085cac5
Fixes #1015 : Player status window scroll state resets on status change
...
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 02:57:30 +01:00
Marc Zinnschlag
48b779af80
Merge remote-tracking branch 'ace/win-fix'
2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4
Another windows build fix
2013-12-06 11:37:29 +01:00
Marc Zinnschlag
14eff87339
removed some junk from ESM store
2013-12-06 11:34:24 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
9ab8fe1038
Fix bsatool warning
2013-12-05 15:46:33 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
Marc Zinnschlag
ee6ddc3404
block saving while chargen is in progress
2013-12-05 14:56:30 +01:00
Marc Zinnschlag
8b7889f8e5
setup player after loading a saved game
2013-12-05 14:22:08 +01:00
Marc Zinnschlag
a7b42b867b
more cleanup
2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b
make sure player record stays in place across cleanups
2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e
first round of cleaning up world cleanup
2013-12-05 12:49:25 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marc Zinnschlag
63721682f6
GUI fix: previous character was selected when saving new character
2013-12-03 15:19:13 +01:00
Marc Zinnschlag
34cdd2bb1f
deal with dialogue/info records that don't exist anymore
2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe
storing and loading the journal
2013-12-03 14:28:46 +01:00
Marc Zinnschlag
2fe135d85f
journals subview was bound to the wrong universal ID type
2013-12-02 16:25:26 +01:00
Marc Zinnschlag
0f971163f7
use Entry instead of plain string for topic and quest entries
2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387
splitting JournalEntry into Entry and JournalEntry
2013-12-01 14:44:27 +01:00
Marc Zinnschlag
16e2d67b1f
added overloaded start/endRecord functions to ESMWriter
2013-12-01 13:32:11 +01:00
Marc Zinnschlag
c94f006307
Merge remote-tracking branch 'scrawl/master'
2013-11-30 15:06:09 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
Marc Zinnschlag
43f5f16731
removed a todo comment
2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
2013-11-30 12:41:18 +01:00
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
2013-11-30 12:08:37 +01:00
Marc Zinnschlag
eed46960fe
some spelling fixes
2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33
store text in journal entries
2013-11-30 11:57:33 +01:00
Marc Zinnschlag
8b3e852ffc
Merge remote-tracking branch 'scrawl/master'
2013-11-30 11:09:38 +01:00
Marc Zinnschlag
aebc2791a5
fixed selecting current character based on value stored in settings
2013-11-30 11:08:41 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98
Merge remote-tracking branch 'scrawl/master'
2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00
scrawl
bb4bd999ba
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec
Don't heal dead actors when resting
2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f
Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra".
...
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
2013-11-29 20:03:50 +01:00
scrawl
ffc885853a
Fix bolt for magic effects that don't have one specified
2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f
Fix some problems with the previous commit
2013-11-28 21:49:15 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
scrawl
20ccfe2324
Play sound when enchanting
2013-11-28 11:37:30 +01:00
Marc Zinnschlag
5aea6ef80f
some clean up for the cleanup code
2013-11-28 11:22:34 +01:00
Marc Zinnschlag
35e8e23037
keep track of total play time per character
2013-11-28 09:33:50 +01:00
Marc Zinnschlag
7e2819c62e
store year in saved game profile
2013-11-28 09:27:10 +01:00
Marc Zinnschlag
b0eb5938bf
removed some redundant code
2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160
changed interface for global variable access
2013-11-28 09:10:38 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca
Fix changePointer
2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a
Don't list deleted refs in CellStore::foreach
2013-11-27 18:49:04 +01:00
scrawl
49ea1aae67
Use GMST for sun damage reduction
2013-11-26 15:01:22 +01:00
Marc Zinnschlag
99ea63dc4a
factored out code for generating month names
2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11
removed duplicates of the cell name function
2013-11-26 11:49:07 +01:00
Marc Zinnschlag
bc6fe682c9
replaced getCurrentCellName function with a more general getCellName function
2013-11-26 11:39:58 +01:00
Marc Zinnschlag
eea433f141
restore last played character selection across sessions
2013-11-26 10:37:58 +01:00
scrawl
eba068149d
Fix AIWander crash
2013-11-25 15:38:18 +01:00
Marc Zinnschlag
ad143e0524
case fix (content file names)
2013-11-25 14:56:05 +01:00
Marc Zinnschlag
616e3aa32f
store content file list in saved games and reject saved games not matching the current game
2013-11-25 13:00:05 +01:00
Marc Zinnschlag
55544e931c
reject newer formats when scanning saved games
2013-11-25 10:21:49 +01:00
Marc Zinnschlag
e3670cff8a
improved character selection logic
2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5
fixed handling of characters without a valid slot
2013-11-24 15:05:00 +01:00
Marc Zinnschlag
18a3b38fb4
when scanning saved game directory, reject characters without a valid saved game
2013-11-24 14:42:58 +01:00
scrawl
14c9a4e1d3
Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.
2013-11-23 23:12:54 +01:00
scrawl
07408a4652
Don't allow selling gold (again - when did this get broken?)
2013-11-23 22:52:20 +01:00
scrawl
4aa9f3bcef
Don't set the enchanted item in HUD for "WhenStrikes" enchantments
2013-11-23 22:48:56 +01:00
scrawl
f3e89e9168
Fix arrow down in console
2013-11-23 22:48:39 +01:00
scrawl
d2ed77f3f2
Fix shields being visible during spellcasting
2013-11-23 20:24:52 +01:00
Marc Zinnschlag
d8c40562ae
Merge remote-tracking branch 'scrawl/light'
2013-11-23 12:44:42 +01:00
scrawl
a1fe07181c
Fix rotation offset of some lights (bug 955)
2013-11-23 05:55:03 +01:00
scrawl
0e254aa7c7
Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.
2013-11-23 03:25:55 +01:00
scrawl
39de0510a0
Fix another case of container scripts not getting re-added
2013-11-22 02:12:37 +01:00
scrawl
829512ded4
Fix container scripts not getting re-added when the player changes cells
2013-11-22 01:02:12 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f
Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.
2013-11-21 19:07:54 +01:00
scrawl
b490e56ba1
Remove redundant setLocals (already done by ContainerStore::add)
2013-11-21 17:19:41 +01:00
scrawl
61ab6e1739
Use fWortChanceValue for making ingredient/potion effects visible
2013-11-21 17:19:41 +01:00
scrawl
320ba98097
Correct getDerivedDisposition according to wiki (check if player expelled)
2013-11-21 17:19:41 +01:00
scrawl
6451b687d9
Adjust value for several item types as according to wiki
2013-11-21 17:19:41 +01:00
scrawl
b6c22ad5d9
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
2013-11-21 17:19:30 +01:00
scrawl
bab657fe2b
Add a utility function to add items to a ContainerStore by RefID
2013-11-21 17:14:30 +01:00
scrawl
6641fd4635
Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.
2013-11-21 17:14:30 +01:00
scrawl
800a2845b0
Add Bound & Summon effects (will need some adjustments later)
2013-11-21 17:14:23 +01:00
Marc Zinnschlag
2702d10911
more comments
2013-11-21 12:31:04 +01:00
Marc Zinnschlag
b5f99522c7
added a few comments
2013-11-21 12:29:24 +01:00
Marc Zinnschlag
c165894869
load saved game record
2013-11-21 12:24:24 +01:00
Marc Zinnschlag
5ba56a5ea5
character signatures
2013-11-21 11:18:56 +01:00
Marc Zinnschlag
cbbdf390ad
added function for inspection of saved characters and character slots
2013-11-21 11:10:18 +01:00
Marc Zinnschlag
fc1501a510
store character profile information in saved game file
2013-11-21 10:53:42 +01:00
Marc Zinnschlag
e938c5a0ee
changed character creation logic (create on save instead of on new game)
2013-11-21 10:20:50 +01:00
scrawl
bf153e1c8e
Fix bug applying instant effects
2013-11-21 00:41:52 +01:00
scrawl
4ed4c1e319
Add Vampirism and Sun Damage effects. Some fixes.
2013-11-21 00:41:31 +01:00
scrawl
7f735c2c4c
Release and show the cursor when focus lost
2013-11-20 16:07:14 +01:00
scrawl
5a4bd9b202
Remove software cursor option, hw cursors seem to be working well enough
2013-11-20 06:20:16 +01:00
scrawl
fa63924884
Simplify message box manager, should fix a random bug with boxes not disappearing
2013-11-20 05:49:05 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
scrawl
0b9676aaa3
Fix an issue with the AI code
2013-11-19 18:43:32 +01:00
scrawl
38a82c4b0b
Add a todo comment
2013-11-19 18:43:21 +01:00
scrawl
8b095982e9
Don't auto equip for dead actors
2013-11-19 18:42:43 +01:00
scrawl
f3ff2e4260
Handle Unreflectable flag
2013-11-19 17:33:02 +01:00
scrawl
c03c82c78a
Apply disease resistance manually as according to wiki
2013-11-19 17:15:17 +01:00
Marc Zinnschlag
8190fdb16c
Merge remote-tracking branch 'scrawl/master'
2013-11-19 16:56:18 +01:00
scrawl
654b7d9ba5
Apply disease resistance manually as according to wiki
2013-11-19 16:52:26 +01:00
scrawl
e8dcd74741
Recharge enchanted items in player's inventory over time
2013-11-19 16:42:24 +01:00
Marc Zinnschlag
9487bd33c3
removed broken save function from ESMWriter
2013-11-19 16:07:36 +01:00
Marc Zinnschlag
5e64888227
added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)
2013-11-19 15:38:26 +01:00
Marc Zinnschlag
11e254aac8
Merge remote-tracking branch 'gus/AICombat'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
scrawl
74e42a2d02
Add missing skill increases for Enchant skill
2013-11-19 07:39:07 +01:00
scrawl
cab535dd69
Implement magic item recharging via soulgem use
2013-11-19 06:48:47 +01:00
scrawl
16e5477c60
Fix an uninitalized member
2013-11-19 02:17:44 +01:00
gus
dff3cf162d
ToggleAI script instruction
2013-11-18 23:03:44 +01:00
Marc Zinnschlag
1c7a4d4b3a
adjust availability of main menu items based on game state
2013-11-18 15:52:25 +01:00
Marc Zinnschlag
f45cff8aff
flag game as ended when player dies
2013-11-18 15:38:08 +01:00
Marc Zinnschlag
82c8495338
removed boolean running flag with state enum
2013-11-18 15:15:47 +01:00
Marc Zinnschlag
e55691096c
Merge remote-tracking branch 'ace/win-fixes'
2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson
4baaf9463e
Remove crashcatcher.cpp from windows builds, it can't be built or used there.
2013-11-18 12:34:25 +01:00
gus
4559e932ae
AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState
2013-11-18 12:33:09 +01:00
scrawl
6902569d03
Implement Absorb effects (AbsorbHealth, etc)
2013-11-18 05:01:36 +01:00
scrawl
a420698237
Don't try to absorb or reflect for self casted spells
2013-11-17 23:41:24 +01:00
scrawl
0dc2e829dd
Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.
2013-11-17 23:31:08 +01:00
scrawl
fc268bf302
Initialize mFallHeight
2013-11-17 23:31:08 +01:00
scrawl
47fc3f81f5
Don't update actors while paused
2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7
Make sure the equipped weapon HUD icon is updated properly
2013-11-17 23:31:07 +01:00
scrawl
b8c358df63
Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place
2013-11-17 23:31:07 +01:00
Marc Zinnschlag
d32fcb99b5
Merge remote-tracking branch 'scrawl/master'
2013-11-17 13:39:04 +01:00
scrawl
e7993ced69
Fix invalid casts
2013-11-17 04:33:04 +01:00
scrawl
07251f0fa4
Don't apply spells to dead actors
2013-11-17 04:32:56 +01:00
scrawl
b8f5cd6cb7
Forgot to apply the same fix to companion window
2013-11-16 23:55:54 +01:00
Sebastian Wick
4a816b6c17
fix context menu
2013-11-16 23:08:03 +01:00
scrawl
eb46de54e4
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-11-16 22:48:59 +01:00
scrawl
7eb1dcb682
Fix trade windows crashing after a new game
2013-11-16 22:29:40 +01:00
scrawl
e32c73725c
Merge branch 'crashcatcher'
2013-11-16 20:56:07 +01:00
scrawl
f990ba09f0
gdb detection doesn't seem to work for the forked process
2013-11-16 20:55:41 +01:00
Marc Zinnschlag
a19242b4ec
fixed expression in if statement
2013-11-16 19:31:35 +01:00
vorenon
b2d2a3dd17
Closing message boxes with numpad enter
2013-11-16 19:15:47 +00:00
Marc Zinnschlag
985ce7c552
Merge remote-tracking branch 'scrawl/crashcatcher'
2013-11-16 18:34:08 +01:00
scrawl
20d806b40c
Change is_debugger_attached to a different hack
2013-11-16 18:15:54 +01:00
Marc Zinnschlag
c5f81e3508
don't run udpates if no game is running
2013-11-16 17:46:48 +01:00
scrawl
883140babf
Add missing include for signals to make travis happy
2013-11-16 17:00:26 +01:00
scrawl
b9899696e3
Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.
2013-11-16 15:56:15 +01:00
scrawl
aa84ce3f0d
Copy paste mistake (oops)
2013-11-16 14:44:31 +01:00
Marc Zinnschlag
ec5b2e9a7e
added running flag; moved new game code to MWState
2013-11-16 12:22:28 +01:00
Marc Zinnschlag
31ec973c9c
removed default value for --start
2013-11-16 12:08:00 +01:00
Marc Zinnschlag
b3a7c8c098
removed --new-game switch
2013-11-16 11:36:32 +01:00
Marc Zinnschlag
7a4b604376
added --skip-menu switch
2013-11-16 11:33:20 +01:00
Marc Zinnschlag
f19973450f
moved exit game flag from Environment to StateManager
2013-11-16 11:07:23 +01:00
Marc Zinnschlag
79b7fa258b
added new mwstate subsystem
2013-11-16 10:31:46 +01:00
scrawl
7474e87edc
Implement RestoreHealth/Magicka/Fatigue
2013-11-16 05:06:54 +01:00
scrawl
bb43ec9b35
Implement damage tick effects
2013-11-16 03:16:21 +01:00
scrawl
b1a29eb27e
Implement Resist & Weakness effects
2013-11-16 02:34:43 +01:00
scrawl
d49b6f19ff
Don't advance acrobatics skill for NPCs
2013-11-16 02:11:11 +01:00
scrawl
aa4b2d9504
Fix uninitialized mSkill/mAttribute for spellmaker spells
2013-11-16 01:19:39 +01:00
scrawl
c73217627e
Move code for listing effect sources to the spell management classes
2013-11-15 20:29:47 +01:00
Marc Zinnschlag
eddd6bf48d
enabled load and save items in main menu
2013-11-15 10:29:53 +01:00
scrawl
d619d0fa25
Don't grab the cursor while the console is opened
2013-11-15 03:39:25 +01:00
scrawl
065f14579f
Fix a container window regression (oops)
2013-11-15 02:57:21 +01:00
scrawl
f7befa3e54
Remove a no longer required method
2013-11-15 02:20:04 +01:00
scrawl
00af6b5617
Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.
2013-11-15 02:08:36 +01:00
scrawl
427de69b79
Allow stacking enchanted items when charge is full
2013-11-14 21:02:37 +01:00
scrawl
49125fa26e
Fix restacking unequipped items
2013-11-14 19:54:00 +01:00
scrawl
da85f3e575
Use the formula from the wiki for spell success.
2013-11-14 19:19:32 +01:00
scrawl
4083c55848
Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.
2013-11-14 19:18:27 +01:00
scrawl
5458207325
Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0.
2013-11-14 18:41:34 +01:00
scrawl
9c5847e2f4
Fix VFX not getting removed when an actor dies
2013-11-14 14:52:30 +01:00
scrawl
e26cc31e3b
Disable projectiles for now
2013-11-14 14:45:08 +01:00
scrawl
992a8e9c36
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
2013-11-14 14:41:10 +01:00
scrawl
956d8adb99
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
...
Conflicts:
apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
scrawl
0b5f5351b5
Fix continuous FX getting removed instantly
2013-11-14 13:30:48 +01:00
Marc Zinnschlag
1c020b74c8
hid ID column in info tables (not relevant for the user)
2013-11-14 13:14:37 +01:00
Marc Zinnschlag
9f0dac00ec
silenced a warning
2013-11-14 12:22:24 +01:00
Marc Zinnschlag
2af7f60488
flag reordered records as modified
2013-11-14 12:21:10 +01:00
Marc Zinnschlag
a44fad4c59
disabled revert for info tables (no easy way to make this work)
2013-11-14 11:55:02 +01:00
Marc Zinnschlag
d49b8e7443
Merge branch 'dialogue'
2013-11-14 11:40:50 +01:00
Marc Zinnschlag
780ea3a41f
added support for record reordering to model (only implemented in info collection)
2013-11-14 11:39:14 +01:00
scrawl
da5c59c8af
addEffect should check effectId, not model.
2013-11-13 19:07:44 +01:00
scrawl
ff7e4174f9
Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.
2013-11-13 18:51:28 +01:00
scrawl
a6e2f43b75
Stop continuous VFX when the effect is no longer active.
2013-11-13 15:44:43 +01:00
Marc Zinnschlag
68598f9b63
fixed handling of user directory defaultfilters file; some cleanup
2013-11-13 14:56:04 +01:00
scrawl
9b0e82a37f
Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)
2013-11-13 14:02:15 +01:00
Marc Zinnschlag
a8274e5c86
Merge remote-tracking branch 'potatoesmaster/inventory-fix'
2013-11-13 13:55:24 +01:00
Marek Kochanowicz
821d0c5c2d
Corrected filter template loading.
2013-11-13 11:38:29 +01:00
scrawl
0627e23d3c
Fix wrong skill level for spell success formula.
2013-11-13 01:26:25 +01:00
Emanuel Guevel
baf13483c0
Update actor model only when in the current cell
2013-11-13 00:04:04 +01:00
scrawl
60bec03987
Rename variables called 'slots' to work around wrong code parsing in QT Creator.
2013-11-12 23:23:19 +01:00
scrawl
027f4152e4
Missing flagAsModified()
2013-11-12 23:17:03 +01:00
scrawl
3c6a391507
Rename arguments again
2013-11-12 23:12:56 +01:00
scrawl
700d06764c
Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.
2013-11-12 22:58:56 +01:00
scrawl
0dab7031c0
Make sure effects are destroyed with the animation
2013-11-12 02:22:44 +01:00
scrawl
eccb8f38ba
Apply "cast when strikes" enchantments when hitting with a weapon
2013-11-12 02:07:51 +01:00
scrawl
5f209b120b
Use the new ContainerStore::remove method.
2013-11-12 01:26:16 +01:00
scrawl
ffdb91bb21
Add particles for Cast + Hit. Not looking quite right yet.
2013-11-11 23:43:28 +01:00
Marc Zinnschlag
2fff7fc843
save info records
2013-11-11 12:21:26 +01:00
scrawl
6f3d737498
Missing const, thanks to jeaye
2013-11-10 23:27:11 +01:00
scrawl
1773c70455
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
2013-11-10 22:03:17 +01:00
Marc Zinnschlag
ef8360f346
silenced a warning
2013-11-10 21:45:27 +01:00
Marc Zinnschlag
cfbf444628
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
2013-11-10 21:30:19 +01:00
Nikolay Kasyanov
05e19b37e3
Removed obsolete comment
2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a
Added empty line
2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1
OpenCS: proper working dir & library path on OS X
2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360
OS X: OpenCS packaging
2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
dfa900e4e3
OS X: Fixed “macro redefined” warning
2013-11-10 20:59:10 +04:00
Nikolay Kasyanov
0494fa543f
OpenCS: set current directory to bundle location on OS X, like in OpenMW binary
2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b
OpenCS.app icon & bundle properties
2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add
OpenCS as a separate app bundle
2013-11-10 19:09:05 +04:00
scrawl
6cd373c5c6
Only allow using powers once every 24 h. Apply on touch effects.
2013-11-10 15:40:31 +01:00
scrawl
71828351e6
Code cleanup: use enum instead of integer
2013-11-10 15:28:26 +01:00
Marc Zinnschlag
8c4303399f
Merge branch 'master' into dialogue
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
2013-11-10 13:21:39 +01:00
Marc Zinnschlag
583f1ae9c2
fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection
2013-11-10 13:00:46 +01:00
Marc Zinnschlag
ec6018928c
some fixes to info record sorting (doesn't address the main problem)
2013-11-10 12:09:49 +01:00
Marc Zinnschlag
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
2013-11-10 11:49:48 +01:00
Emanuel Guevel
bbfd7f4c9d
Disable equipped item re-stacking when the item is removed from inventory
...
The item was not removed if it was re-stacked.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
d2dcf0b203
Add a warning comment to RefData::setCount()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
467bd91651
Update actor model on inventory change
2013-11-10 02:45:17 +01:00
Emanuel Guevel
f428921b93
Always update the source container view on drag&drop
...
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
4fcf427e1f
InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
...
The unequipped item is also re-stacked if needed.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
37e91a278e
Add InventoryStore::unequipItem()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
12dbbde1e3
InvStore::unequipSlot: return an iterator to the unequipped item
2013-11-10 02:45:17 +01:00
Emanuel Guevel
59c963b6cc
Auto-equip items when a clothe or an armor is removed from inventory
...
This fix auto-equip on corpses.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
750f1fd760
Edit ContainerStore::stacks for clarifications and correctness
...
Rename arguments and fix some potential errors (add checks).
2013-11-10 02:45:16 +01:00
Emanuel Guevel
26e4ccb8c2
Cosmetic changes
...
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
2013-11-10 02:45:16 +01:00
Emanuel Guevel
aefa54d72d
Pass item count to ManualRef constructor
...
This remove the need to call setCount in multiple places.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
0691978603
Add item count to ManualRef constructor as optional argument
2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c
Remove duplicate code for PlaceAtMe/PlaceAtPC using a template
2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef
Move some deleteObject logic from OpDelete to MWWorld::deleteObject
2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430
Edit InventoryStore::equip() to call the new unequipSlot function…
...
…to unequip previously equipped item.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982
Update weapon/magic icons when items are removed from player inventory
2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22
Add method InventoryStore::unequipSlot()
...
This will permit to do run a treatment when an item is unequipped.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
23b8206bdc
Add remove methods to MWWorld::ContainerStore
2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21
Merge remote-tracking branch 'scrawl/magic'
2013-11-09 17:00:27 +01:00
Marc Zinnschlag
935d9241d8
first attempt at proper info record loading: partially incorrect and way too slow
2013-11-09 11:42:19 +01:00
scrawl
5c148a3d41
Fix effect source display
2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0
Merge remote-tracking branch 'scrawl/magic'
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-11-09 10:54:51 +01:00
scrawl
3e58655a90
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
2013-11-09 10:49:00 +01:00
scrawl
3ea7d58ca8
Advance skill on successfull spell cast
2013-11-09 10:34:46 +01:00
scrawl
976344f0a3
Handle CastOnce enchantments
2013-11-09 08:07:40 +01:00
scrawl
1051611ffa
Added spell failure sound
2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170
Refactor ActiveSpells to track range type. Added basic self range magic.
2013-11-09 07:51:46 +01:00
Marc Zinnschlag
3d8da2b9e0
proper sorting for newly created records and some case smashing fixes
2013-11-08 12:16:41 +01:00
Marc Zinnschlag
a06aa881cb
make sure case handling in info IDs is consistent
2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328
Topic range access in InfoCollection
2013-11-08 11:52:30 +01:00
Marc Zinnschlag
0745a86039
added InfoCreator
2013-11-08 11:51:59 +01:00
Bret Curtis
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-08 09:08:56 +01:00
Bret Curtis
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-07 23:05:45 +01:00
Marc Zinnschlag
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
2013-11-07 09:19:55 +01:00
Jordan Ayers
3fbf918751
Chargen Review Dialog: Init fix.
...
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
2013-11-06 23:19:53 -06:00
Jordan Ayers
d48cc27a89
Chargen fix: Back sequence control.
...
Related to bug #894 .
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
2013-11-06 23:19:53 -06:00
Jordan Ayers
e94da61ff0
Chargen cleanup.
...
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
2013-11-06 23:19:53 -06:00
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
9e2b1942fc
Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.
2013-11-05 22:50:53 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
Marc Zinnschlag
c545b3682a
compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)
2013-11-05 12:57:55 +01:00
Marc Zinnschlag
2d4a6c0edf
cleaned up ID handling in INFO record (including a ESMTool bug fix)
2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88
added missing columns to topic info table
2013-11-05 11:41:48 +01:00
Marc Zinnschlag
245d7b0ae4
Merge remote-tracking branch 'scrawl/windowclosefix'
2013-11-05 08:19:53 +01:00
Marc Zinnschlag
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
2013-11-05 08:19:29 +01:00
scrawl
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
2013-11-05 03:02:28 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson
468e8e3635
Missing iostream include
2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
graffy76
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
2013-11-03 21:38:10 -06:00
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
2013-11-03 16:45:18 -06:00
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
2013-11-03 22:08:38 +01:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b
added topic/journal column to info tables
2013-11-03 10:48:50 +01:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05:00
Lukasz Gromanowski
afce10cf37
Fixes #597 : Assertion `dialogue->mId == id' failed in esmstore.cpp
...
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-11-02 16:39:05 +01:00
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
scrawl
e6960d915a
Add simple Ogre widget
2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05:00
Marc Zinnschlag
ea0e8be0d3
disallow sorting (via column headers) in info tables
2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6
fixed dialogue record loading with multiple content files
2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be
split info records between journal and topic info tables
2013-10-31 12:16:45 +01:00
gus
683b8d77dd
build fix (thanks travis)
2013-10-31 11:02:26 +01:00
gus
d587f3c946
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-10-31 09:51:17 +01:00
gus
02ded18fc5
Linux backslash fix
2013-10-31 09:43:12 +01:00
gus
2a927f65d3
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
2013-10-30 20:52:23 +01:00
gus
650a112e2e
better timer
2013-10-30 20:42:50 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184
Removed a workaround from Renderer, some cleanup
2013-10-30 13:05:28 +01:00
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
2013-10-29 09:27:23 +01:00
gus
a6e7c6c104
disable AI combat for creatures
2013-10-28 23:04:46 +01:00
gus
5b20cce849
CMake fix
2013-10-28 18:36:09 +01:00
gus
0e86209224
linux fix :p
2013-10-28 18:33:10 +01:00
gus
b7a9243173
fighting should stop when the target is dead
2013-10-28 18:22:36 +01:00
gus
12d8b4e0f8
bugfix
2013-10-28 18:13:07 +01:00
gus
2d84f7d33d
NPC run
2013-10-28 18:10:00 +01:00
gus
d7584f9df7
getLineOfSight, no script instruction yet
2013-10-28 18:01:40 +01:00
Marc Zinnschlag
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f
Corrected compilation error (g++ 4.8.2) triggered by not found declaration
...
in argument-dependent lookup at the point of instantiation.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 19:57:05 +01:00
Marc Zinnschlag
c2bbbef637
Merge remote-tracking branch 'rainChu/drowning-gauge'
2013-10-27 16:10:11 +01:00
gus
2515a1239e
improved combat conditions
2013-10-27 14:22:51 +01:00
Marc Zinnschlag
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
2013-10-27 14:13:10 +01:00
gus
968968502e
NPC always face you when fighting
2013-10-27 14:03:58 +01:00
Marc Zinnschlag
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
2013-10-27 14:00:25 +01:00
gus
a0edb55f60
only NPC with fight over 80 will attack you now
2013-10-27 13:50:29 +01:00
gus
882b136b35
bugfix of bugfix ^^
2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
ea7a8eb2a4
last commit
2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52
Hide adjusterwidget for open files view
2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f
Fix an irritating error message
2013-10-25 23:47:53 +02:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801
relaxed rules for new IDs when ID is also a user visible text
2013-10-22 11:08:37 +02:00
Marc Zinnschlag
3146af34d6
some fixes for the merged filter branch
2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
70602c2c36
Removed changes in the unimplemented copy ctor.
2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b
Corrected formatting in document.hpp
2013-10-21 18:15:26 +02:00
Marc Zinnschlag
88e09159c4
splitting off characters menu from mechanics menu (was getting too big)
2013-10-21 18:04:40 +02:00
Marc Zinnschlag
743c6ea5b1
save dialogue records
2013-10-21 16:47:32 +02:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817
Removed old comment. Changed to set resources path correctly.
2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087
handle deleted dialogue records
2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e
add fixed dialogue records when creating a new omwgame file
2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7
added dialogue type column to topics table
2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912
some cleanup
2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
184456892b
Added check to load custom filters set when present.
2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3
Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.
2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
2013-10-17 18:21:41 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
8c139783b7
silenced a warning
2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8
Fixed punctuation consistency
2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3
Added a constructor to Light CustomData
2013-10-16 15:13:36 -04:00
Marek Kochanowicz
3000386443
failed attempt on switch adding.
2013-10-16 13:07:26 +02:00
Alex "rainChu" Haddad
2643214ca6
Lights extinguish underwater
2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6
Equipped torches and lights run out of fuel
2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2
Remember pressed message box button longer
...
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.
Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
2013-10-14 12:55:06 +02:00
Marc Zinnschlag
db7ea30483
allow float values in cell for value tests
2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305
corrected an error message
2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678
minor fix in ValueNode::toString
2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab
make testing empty cells against an empty string yield true
2013-10-13 21:54:36 +02:00
Marc Zinnschlag
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
2013-10-13 18:55:49 +02:00
scrawl
683ad40e21
No need for this ifdef since there is a default argument.
2013-10-13 18:28:22 +02:00
scrawl
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe
Turn off vsync while in the loading screen
2013-10-13 17:52:14 +02:00
Marc Zinnschlag
b8ae195a46
Merge branch 'scene'
2013-10-13 15:42:27 +02:00
Marc Zinnschlag
4624bed899
changed handling of scene toolbar button icons
2013-10-13 15:41:48 +02:00
Marc Zinnschlag
fc5afe430b
Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'
2013-10-13 14:40:48 +02:00
Emanuel Guevel
dcfff79460
Regenerate fatigue over time
2013-10-13 00:40:27 +02:00
Marc Zinnschlag
708cde2688
Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'
2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0
COC Command: Exterior cell selection fix.
...
Return the northernmost cell of the easternmost matching column for Ext. cells.
2013-10-12 14:48:37 -05:00
Marc Zinnschlag
608d154ad7
Merge remote-tracking branch 'rainChu/master'
2013-10-12 20:31:33 +02:00
Alex "rainChu" Haddad
cfc3093320
Reverted conditional compiling
2013-10-12 10:46:44 -04:00
Marc Zinnschlag
b5d620a8dc
fixed string filter on enum column when column is empty
2013-10-12 16:35:59 +02:00
Marc Zinnschlag
a29b8667ef
fixed string filter on boolean columns when testing against the value false
2013-10-12 16:29:36 +02:00
Marc Zinnschlag
a77044cda4
fixed column numbering
2013-10-12 16:15:47 +02:00
Marc Zinnschlag
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
2013-10-12 13:52:38 +02:00
Marc Zinnschlag
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
2013-10-12 13:40:29 +02:00
Marc Zinnschlag
458c752425
Merge remote-tracking branch 'mckibbenta/tgm'
2013-10-12 13:38:10 +02:00
Marc Zinnschlag
87cd5d4267
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
2013-10-12 13:31:06 +02:00
Marc Zinnschlag
9c4d88cd76
Merge remote-tracking branch 'potatoesmaster/acrobatics'
2013-10-12 13:20:12 +02:00
Marc Zinnschlag
c8dc6a70b7
Merge remote-tracking branch 'greye/master'
2013-10-12 13:14:47 +02:00
Marc Zinnschlag
c8695db66f
Merge remote-tracking branch 'wheybags/unshield_fixes'
2013-10-12 13:03:38 +02:00
Lukasz Gromanowski
5ce1f50fab
Cleanup in MWGui::WindowManager constructor initialzation list.
...
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:
https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c
Magic Effect descriptions: support feet / level modes.
...
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
2013-10-07 20:02:20 -05:00
gus
94069e3a7e
bugfix
2013-10-07 20:30:12 +02:00
graffy76
17950210fa
Merge branch 'master' into esxSelector
2013-10-07 06:52:20 -05:00
Marc Zinnschlag
74cee66273
consolidated magic numbers for button size
2013-10-07 11:24:53 +02:00
gus
1ac3d99c78
pathfinding now works in AICombat.
2013-10-07 10:20:02 +02:00
Marc Zinnschlag
4d6c3cdf09
removed more garbage
2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf
Fixed non-loading files
2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
Jordan Ayers
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a
Acrobatics: do not apply fall damages when slowfalling spell effect is active
...
If spell effect ends up in mid-air, calculate fall height from then.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40
Add MWWorld::isSlowFalling(Ptr)
2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a
Acrobatics: reinit fall height at current height rather than zero
...
To prevent problems.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5
Acrobatics: use calculated fatigueTerm
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2
Acrobatics: do not touch modified stats
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865
Acrobatics: cosmetic changes
2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723
Merge branch 'master' into tgm
2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400
Fixed first person offset to use world transform
...
It slipped my mind that some necks might not be perfectly vertical.
2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485
Refactored, moved logic out of NpcAnimation
...
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
2013-10-02 05:16:52 -04:00
graffy76
a5a0f61533
Fixed missing profiles combobox
2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Emanuel Guevel
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
0ddb5097fc
Revert "Bug #840 , First Person Sneaking Camera Height"
...
This reverts commit 296abfd48f
2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f
Bug #840 , First Person Sneaking Camera Height
...
Also, added comments to existing code in the area.
2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
4496244b14
Tabs to spaces
...
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
eae02ea00d
Cleaned up my hackish code for WinMain
2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad
00a776a1a8
Fixed compilation failure on my machine
...
Fixed shared records not being populated before the player record is
moved.
2013-09-30 02:54:20 -04:00
greye
4cdb57e388
workaround segfault on --new-game switch
2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad
bffbfff41c
My own fix to make it hackily compile
2013-09-30 00:32:06 -04:00
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
2013-09-29 12:19:07 -05:00
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
2013-09-29 15:49:47 +01:00
Lukasz Gromanowski
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:14:40 +02:00
Lukasz Gromanowski
9c2145eda1
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches into content in openmw
and mwiniimporter.
Extension in content files is now required.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:11:57 +02:00
gus
83a375b55d
AI now continue to hit you.
...
TODO: change the way time is handled
2013-09-28 21:17:06 +02:00
Marc Zinnschlag
7be1f1afc2
implemented SceneToolMode as a horizontal panel with radiobutton-type buttons
2013-09-28 13:10:42 +02:00
gus
2537384c50
bug fix
2013-09-28 12:25:37 +02:00
Marc Zinnschlag
0c5f07a65a
added SceneToolMode class
2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4
added scene toolbar buttons (still not doing anything)
2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f
added basic scene subview (no functionality yet)
2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0
giving Documents direct access to ConfigurationManager
2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58
load project files
2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247
moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase
2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106
added project scope filter saving
2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe
added missing column enum
2013-09-27 13:56:23 +02:00
Marc Zinnschlag
31346dde58
fixed uninitialise scope value for filters
2013-09-27 13:55:28 +02:00
Marc Zinnschlag
6f2c418a5c
(slightly) improved error reporting during save operations
2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec
added missing scope column to filter table
2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab
create project file when saving content file
2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828
made verifier ignore deleted records
2013-09-27 10:08:09 +02:00
gus
9353f4d14f
WIP AI combat
2013-09-25 18:01:36 +02:00
Marc Zinnschlag
96fd1c35bf
preserve author/descriptin meta data
2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06
set record count in TES3 header
2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b
added saving for referenceable records
2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf
make 4 byte record type accessable from record struct
2013-09-24 13:17:28 +02:00
graffy76
3b40192e90
Merge branch 'master' into esxSelector
2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
graffy76
d7cff6361e
Fixed filter issue (all addons for a gamefile are enabled for checking).
...
Note: Other dependencies are not yet automatically selected when an
addon is checked.
2013-09-23 06:51:49 -05:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
Marc Zinnschlag
6d9ff39390
set dependencies when saving (requires further refinements)
2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530
fixed save path for newly created addons
2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154
fixed missing initialisation of adjuster widget in file dialogue
2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255
use IdTypeDelegate in report table
2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c
added missing position columns to reference table
2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba
Merge branch 'master' into esxSelector
2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766
replacing tabs with spaces
2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7
Generally speaking, you should never compare iterators from two different compilers
...
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
2013-09-20 21:26:12 -04:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-19 15:14:35 +02:00
Marc Zinnschlag
8d4f4e395f
update syntax highlighting when ID list changes
2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330
changed ID listing to include deleted records by default
2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370
separate highlight colour for IDs
2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80
added signals and functions to Data for handling ID list changes
2013-09-19 12:11:27 +02:00
Marc Zinnschlag
78f7f80fc3
configured script highlighting with extensions
2013-09-19 08:58:27 +02:00
graffy76
0eb06ada39
Implemneting drag and drop
2013-09-18 02:36:23 -05:00
scrawl
d5ef843f56
Fix a missing model update
2013-09-16 19:22:08 +02:00
Marc Zinnschlag
acfd78c62a
implemented saving for all supported record types except cells, referencables and references
2013-09-16 14:17:04 +02:00
Marc Zinnschlag
03054c8160
forgot to write record ID
2013-09-16 14:10:05 +02:00
Marc Zinnschlag
bf0fba68af
added save stage for globals
2013-09-16 12:51:57 +02:00
mckibbenta
6bb6ba6372
added god mode comment
2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-15 15:49:18 -04:00
mckibbenta
644f081c60
minor changes
2013-09-15 15:48:32 -04:00
Marc Zinnschlag
db70095148
write TES3 header
2013-09-15 15:31:44 +02:00
Marc Zinnschlag
231419028d
minor fix
2013-09-15 15:03:17 +02:00
Marc Zinnschlag
fa25a068a8
basic saving (no data is written to file yet)
2013-09-15 15:00:41 +02:00
Marc Zinnschlag
8326ac9b6f
replaced dummy save implementation with a threaded dummy save implementation
2013-09-15 12:53:59 +02:00
Marc Zinnschlag
d71d282952
more Operation enhancements in preparation for save operation
2013-09-15 12:03:36 +02:00
Marc Zinnschlag
414e6abb95
more signal cleanup
2013-09-15 11:35:12 +02:00
Marc Zinnschlag
a5aebfb760
minor cleanup
2013-09-15 09:32:20 +02:00
mckibbenta
c9f1bd8735
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-14 16:38:46 -04:00
Marc Zinnschlag
b7bffc8a79
removed Verifier class (using Operation class without subclassing now)
2013-09-14 15:16:31 +02:00
Marc Zinnschlag
f4c03c6a29
added ordered-flag to Operation (currently ignored)
2013-09-14 15:12:24 +02:00
Marc Zinnschlag
077a157841
moved Operation and Stage from model/tools to model/doc
2013-09-14 14:56:23 +02:00
Marc Zinnschlag
c961abce96
added warning message to startup window
2013-09-14 14:00:07 +02:00
Marc Zinnschlag
9637e1641b
fix for building with system tinyxml
2013-09-14 13:33:49 +02:00
Marc Zinnschlag
07ff0a8de9
possible build fix for Windows
2013-09-12 20:52:05 +02:00
Marc Zinnschlag
bf8a25c2c6
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d
Initial toggleGodMod/tgm instruction. Currently only affects player health.
2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-12 08:08:07 -04:00
scrawl
09e692f1f6
Fixed polish font
2013-09-10 22:11:57 +02:00
Marc Zinnschlag
554c44892a
Merge branch 'newgame'
2013-09-10 16:45:09 +02:00
Marc Zinnschlag
e9f14449eb
added AdjusterWidget
2013-09-10 16:45:01 +02:00
gus
f9bfbc8764
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
2013-09-10 16:18:39 +02:00
gus
46a734852b
adding script instruction getLOS + some test about AI
2013-09-10 16:16:13 +02:00
Marc Zinnschlag
2dc3c0ae4f
integrated startup icons
2013-09-09 09:41:43 +02:00
Marc Zinnschlag
25b7cd33ea
added FileWidget; fixed OpenCS configuration
2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169
splitting new game and new addon functions (new game currently not working)
2013-09-08 12:06:28 +02:00
Marc Zinnschlag
f7940d7d1a
focus load document button by default in startup window
2013-09-08 11:24:06 +02:00
Marc Zinnschlag
2d9e9fe3e1
Merge branch 'startup'
2013-09-08 09:34:41 +02:00
Marc Zinnschlag
cae5eb424d
cleaned up opening the settings dialogue from a view
2013-09-08 09:33:45 +02:00
Marc Zinnschlag
efdf2961f0
open user settings dialogue centered
2013-09-08 09:28:43 +02:00
Marc Zinnschlag
0e81fb32dd
hooked up edit config signal from startup window
2013-09-08 09:26:43 +02:00
Marc Zinnschlag
17bf7e59a4
added proper startup dialogue (still missing icons)
2013-09-08 09:15:26 +02:00
graffy76
a6e7cf9a8c
Implementing drag and drop
2013-09-07 15:57:40 -05:00
Tom Mason
7b9c5c75e7
silenced unshield
2013-09-07 16:16:09 +01:00
Tom Mason
2b50e34566
Fixed issue with copy_file
...
from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705
2013-09-07 15:41:51 +01:00
Marc Zinnschlag
9b7cd5958f
Merge remote-tracking branch 'scrawl/master'
2013-09-07 08:23:25 +02:00
scrawl
10c21579bc
Item stacking case sensitivity fix
2013-09-07 01:00:38 +02:00
Marc Zinnschlag
3d66f7521e
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-06 08:44:59 +02:00
Marc Bouvier
784cba21f2
[Feature #881 ] Change Tabs to Spaces
...
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
2013-09-05 23:02:51 -05:00
Marc Zinnschlag
dc345dd43d
Merge branch 'filter'
2013-09-05 15:47:52 +02:00
Marc Zinnschlag
8f0ab29a9f
allow the use of keywords for strings without quotation marks
2013-09-05 15:47:38 +02:00
Marc Zinnschlag
645b50ef36
added support for half-sided intervals to filter parser
2013-09-05 15:38:28 +02:00
Marc Zinnschlag
f3ce9c22a1
rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half)
2013-09-05 15:22:14 +02:00
Marc Zinnschlag
9332684335
allow the use of value types in string filters
2013-09-05 15:05:49 +02:00
Marc Zinnschlag
f2e86e860e
allow the use of record types in string filters
2013-09-05 14:39:56 +02:00
Marc Zinnschlag
8bebe7179c
some UniversalId fixes
2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson
5e42c73356
Better fix for unshield, comments on changes, no more commented out code.
2013-09-05 10:39:17 +02:00
mckibbenta
ae02499eff
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-04 21:15:44 -04:00
Alexander "Ace" Olofsson
22a5f7198f
A few fixes to build on Windows
2013-09-04 23:25:47 +02:00
Marc Zinnschlag
842a616909
more cleanup
2013-09-03 14:18:34 +02:00
Marc Zinnschlag
6cd7da6547
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-03 13:47:07 +02:00
Marc Bouvier
6b11f59ed4
[Feature #881 ] Rename QLocalServer
...
The server name should be more unique to the project so there isn't a
interprocess clash.
2013-09-03 06:24:11 -05:00
Marc Zinnschlag
80f8024da7
allow specifying record modification status column enum via strings
2013-09-03 13:03:02 +02:00
Marc Zinnschlag
f80373a849
removed two unused files
2013-09-03 12:53:45 +02:00
Marc Zinnschlag
1744a64f77
in filters allow specifiying boolean columns as strings
2013-09-03 12:32:06 +02:00
Marc Bouvier
0ae2bb2fae
[Feature #881 ] Code Formatting
...
Code formatted to the OpenMW policy.
2013-09-03 05:22:48 -05:00
Marc Bouvier
563bd0b430
[Feature #881 ] Raise OpenCS New Window After Re-execution
...
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
2013-09-03 04:12:19 -05:00
Marc Bouvier
51332b86a1
[Feature #811 ] Only 1 Instance of OpenCS is Allowed
...
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
2013-09-03 01:44:21 -05:00
mckibbenta
e545f49807
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-02 18:40:37 -04:00
Marc Zinnschlag
9cb121bd04
allow specifying enums as text in filters
2013-09-02 12:23:19 +02:00
Marc Zinnschlag
649ef6f120
moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)
2013-09-02 11:58:05 +02:00
Marc Zinnschlag
e03de11fa8
Merge remote-tracking branch 'corristo/master'
2013-09-02 10:57:01 +02:00
Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
2013-09-02 10:55:12 +02:00
Marc Zinnschlag
5f380bc085
Merge remote-tracking branch 'lgro/unittests'
2013-09-02 10:54:51 +02:00
Nikolay Kasyanov
f9cfe654f2
Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154
...
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
2013-09-01 23:17:41 +04:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
Lukasz Gromanowski
2c49458b6c
Added unittests for FileFinder::FileFinderStrict class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-31 00:13:42 +02:00
Lukasz Gromanowski
0e83b50659
Changed test dir for SearchTest.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:24:33 +02:00
Lukasz Gromanowski
2baaef7d87
Added unittests for FileFinder::FileFinder class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:23:34 +02:00
Lukasz Gromanowski
303e02cab5
Added unittests for FileFinder::find function.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:45:30 +02:00
Lukasz Gromanowski
515a865daa
Changed ASSERT_EQ to ASSERT_TRUE/FALSE.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:44:03 +02:00
Lukasz Gromanowski
da0b90ee45
Converted tests from components/misc into google unittests.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 21:57:06 +02:00
Chris Robinson
82a09a988b
Minor pathfinding cleanup
2013-08-29 19:17:27 -07:00
Chris Robinson
8f23b330d3
Remove unnecessary initialization
2013-08-29 17:41:20 -07:00
Chris Robinson
9499ac4fd5
Increase the distance for reaching a path node
2013-08-29 17:41:20 -07:00
Chris Robinson
f9dbce685a
Avoid killing AIWander and AITravel when far away
...
This fixes the problem of certain NPCs not wandering because they
happened to spawn near a cell border away from the player, which
immediately "completed" the wander package.
AIWander can't cause NPCs to cross cell boundaries, so there's no risk
of them walking into an unloaded to. AITravel will now simply stop
moving, and resume later when the cell is loaded.
2013-08-29 17:41:20 -07:00
mckibbenta
f65172bdca
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a
fiddlings
2013-08-29 20:25:36 -04:00
scrawl
c8e31725dc
Fix weather sounds persisting on a new game
2013-08-29 15:16:08 +02:00
Marc Zinnschlag
9f0b34eae0
fixed reference loading code (editor)
2013-08-29 13:27:54 +02:00
Marc Zinnschlag
ce90c2f3be
Merge remote-tracking branch 'kcat/master'
2013-08-28 21:05:07 +02:00
Chris Robinson
e589d0ec91
Werewolves can't activate activators
2013-08-28 11:36:22 -07:00
Chris Robinson
84d259ab8e
Avoid reconstructing strings for updating the dynamic stats
...
Attributes still do this, but they change infrequently enough that it doesn't
matter.
2013-08-28 10:50:29 -07:00
scrawl
5918b84666
Don't crash on resize events during load
2013-08-28 17:05:28 +02:00
Marc Zinnschlag
94e255ea47
Merge branch 'filter'
2013-08-28 12:42:03 +02:00
Chris Robinson
92082dae66
Modify the current magicka and fatigue when the base changes
2013-08-27 22:44:52 -07:00
Chris Robinson
305b5fec0f
Avoid needlessly copying the MagicEffects
2013-08-27 21:40:31 -07:00
Chris Robinson
281fdbd81b
Cleanup some redundancy
2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a
Update the watched Ptr when changing it
2013-08-27 17:22:07 -07:00
Chris Robinson
39af9a13fa
Remove some unused functions
2013-08-27 17:13:49 -07:00
Chris Robinson
189541aa72
Apply drowning damage based on the update duration
...
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
2013-08-27 17:08:23 -07:00
Chris Robinson
f216b25be8
Slightly randomize time between environment sounds
...
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
2013-08-27 16:04:19 -07:00
Chris Robinson
02df8ab841
Store the underwater sound to easily stop it
2013-08-27 13:48:20 -07:00
Chris Robinson
16331bf1ed
Avoid a hack to play the underwater sound properly
2013-08-27 13:26:57 -07:00
Marc Zinnschlag
26b3d93293
streamlined filter syntax
2013-08-27 18:58:23 +02:00
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marc Zinnschlag
2e9948e86a
improved one-shot filter handling; allow empty pre-defined filters
2013-08-26 14:40:34 +02:00
Marc Zinnschlag
aa935ff03d
update tables on filter record changes
2013-08-26 12:49:13 +02:00
Marc Zinnschlag
20bd0707dc
avoid use of column number literals
2013-08-26 12:25:52 +02:00
Marc Zinnschlag
937f5b11a2
fixed broken record deletion
2013-08-26 12:25:19 +02:00
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
2013-08-26 08:51:19 +02:00
mckibbenta
60fa69139e
minor changes
2013-08-25 19:20:14 -04:00
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2
Fix actor stepping
2013-08-25 16:08:43 -07:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa
Use the non-accumulation root's parent as the accumulation root
...
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
2013-08-25 16:08:42 -07:00
scrawl
3f8a69b4ad
Don't crash when trying to delete a reference that doesn't exist anymore
2013-08-26 00:14:02 +02:00
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
2013-08-26 00:13:42 +02:00
scrawl
c6d2d1999a
Fix an item duplication glitch
2013-08-25 17:40:08 +02:00
mckibbenta
06701467ab
Merge branch 'master' into tgm
2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b
initial do-nothing implementation; registered opcode
2013-08-24 21:19:12 -04:00
Marc Zinnschlag
d007d4dc9a
allow colons in names (filter)
2013-08-24 19:12:47 +02:00
Marc Zinnschlag
7e02c9acf2
added filter text column to filter table
2013-08-24 18:53:11 +02:00
Marc Zinnschlag
25e6380884
implemented use of predefined filters
2013-08-24 17:40:00 +02:00
Marc Zinnschlag
d1516792ce
made document data available to filter parser
2013-08-24 17:17:22 +02:00
Marc Zinnschlag
7aee1da5c6
fixed some columns
2013-08-24 16:51:49 +02:00
Marc Zinnschlag
51fbb0f3f4
fixed a segfault when opening views for tables that do not allow the creation of new records
2013-08-24 15:33:46 +02:00
Marc Zinnschlag
948cb0ef34
Merge remote-tracking branch 'marcrbouvier/master'
2013-08-24 15:13:07 +02:00
Marc Zinnschlag
f605dcdd24
Merge branch 'filter'
2013-08-24 14:51:05 +02:00
Marc Zinnschlag
78c7de440d
simplified filter nodes even more
2013-08-24 14:49:05 +02:00
Marc Zinnschlag
cf58670c85
removed global filter scope (would have caused sync problems between projects)
2013-08-24 14:46:42 +02:00
Marc Zinnschlag
3cf60da5a7
added numeric value filter node
2013-08-24 14:43:38 +02:00
Chris Robinson
ca24a809fc
Use the position of the actor to determine if they're swimming
2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
2013-08-23 12:27:39 -07:00
Marc Zinnschlag
537ab38985
fixed type in error message
2013-08-23 14:49:41 +02:00
Marc Zinnschlag
c56007cceb
fixed a record counting bug (was using the wrong model)
2013-08-23 14:11:33 +02:00
Marc Zinnschlag
2823e5693d
Merge remote-tracking branch 'scrawl/hit'
2013-08-22 15:35:17 +02:00
Marc Zinnschlag
63b1df85e7
fixed string parsing
2013-08-22 15:22:39 +02:00
Marc Zinnschlag
f615a9397b
made text node filter case-insensitive
2013-08-22 15:16:22 +02:00
Marc Zinnschlag
de956737fe
added text filter node
2013-08-22 14:50:42 +02:00
Marc Zinnschlag
decd826208
fixed an include guard
2013-08-22 14:00:55 +02:00
Marc Zinnschlag
ba6edc55d4
added not filter node
2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888
added and and or filter nodes
2013-08-22 13:14:35 +02:00
scrawl
22d5598082
Fix bad_cast exception when hitting creatures
2013-08-22 12:17:12 +02:00
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
2013-08-22 10:47:48 +02:00
Marc Zinnschlag
50041fc211
simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)
2013-08-22 09:17:57 +02:00
Marc Bouvier
2e8b0cf502
Remove Directory Paths in Qt Classes Includes
...
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
2013-08-21 17:14:29 -05:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d
Remove an unused method
2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00
Chris Robinson
1a9672e31b
Don't update player physics more than 60 times a second
...
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
2013-08-20 11:31:49 -07:00
graffy76
e6fdc7e7fd
...
2013-08-20 12:34:39 -05:00
Marc Zinnschlag
a61215dab1
some general filter parser cleanup
2013-08-20 16:04:06 +02:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6
Increase the max number of physics iterations
...
Should help with highly tessellated collision meshes with high
framerates.
2013-08-20 04:41:52 -07:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973
Continually add bits of input velocity to inertia when falling
2013-08-20 02:10:18 -07:00
Marc Zinnschlag
0c8f85f17d
Merge remote-tracking branch 'wheybags/master'
2013-08-20 11:05:50 +02:00
graffy76
24e38846da
Fixed broken profile actions
2013-08-20 03:53:23 -05:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
Tom Mason
7f0f9037be
fix for older versions of unshield
2013-08-19 22:57:21 +01:00
scrawl
13afcc9324
Don't link to OgreTerrain
2013-08-19 22:22:14 +02:00
Tom Mason
06ff40eda7
only use unshield on not windows
2013-08-19 20:20:08 +01:00
Tom Mason
865a7c63df
cmake for system libunshield
2013-08-19 20:20:00 +01:00
Tom Mason
d3748cd5bb
Install uncompressed data files from cd
2013-08-19 20:19:53 +01:00
Tom Mason
9d1daf7dc2
enum was unnecessary
2013-08-19 20:19:47 +01:00
Tom Mason
641b7b0336
anonymous namespace
2013-08-19 20:19:41 +01:00
Tom Mason
454b64974d
filenames
2013-08-19 20:19:35 +01:00
Tom Mason
3264b5974e
fix invalid syntax
2013-08-19 20:19:25 +01:00
Tom Mason
90a892d304
unshield fixes
2013-08-19 20:19:11 +01:00
Tom Mason
ceb3317807
Integrate unshield with launcher
2013-08-19 20:19:01 +01:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580
Fix tracing down
2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697
Clean up the trace struct
2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649
Get rid of the old newtrace method
2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401
Use a better method to do actor physics traces
2013-08-19 20:39:37 +02:00
Chris Robinson
76b812f75f
Improve actor movement collision handling
2013-08-19 20:39:37 +02:00
Chris Robinson
584eec3743
Store the object class in the LiveCellRef
2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
Chris Robinson
cf6e3ab933
Fix a potential divide-by-zero
2013-08-19 09:36:51 -07:00
Chris Robinson
dca599b8c5
Add NPC landing sounds for soundgen keys
2013-08-19 08:58:50 -07:00
Chris Robinson
2ec39f3622
Don't start the jump animation until after the actor is airborn
...
A bit counter-intuitive, but otherwise certain jump animations will improperly
add an offset to the initial inertia.
2013-08-19 08:24:47 -07:00
Chris Robinson
ac3d3df9fc
Implement jumping animations
2013-08-19 08:10:18 -07:00
Chris Robinson
48e594b7c4
Improve stepping down when starting on the ground
2013-08-19 08:09:23 -07:00
Chris Robinson
3ca4d54bf9
Better handle animations with a 0-length loop
2013-08-19 07:26:42 -07:00
Chris Robinson
1aa92067c2
Fix tracing down
2013-08-19 04:56:02 -07:00
Chris Robinson
6e9f15793d
Implement a jumping state
2013-08-18 23:42:56 -07:00
graffy76
e614ec3353
Fixing profile code in progress...
2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
2013-08-18 15:11:29 -05:00
Marc Zinnschlag
c87a279444
added error reporting in the filter edit widget (change the text colour for now)
2013-08-18 17:54:18 +02:00
Marc Zinnschlag
c7e97a83e1
automatically build column map on filter change
2013-08-18 17:28:04 +02:00
Chris Robinson
7770203dff
Some physics cleanup
...
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
2013-08-18 08:24:39 -07:00
Marc Zinnschlag
ea8b9ce45b
apply filter to table after filter text change
2013-08-18 16:53:28 +02:00
Marc Zinnschlag
470f890a9a
fixed BooleanNode constructor
2013-08-18 16:52:51 +02:00
graffy76
a14e0b32d8
Restructured esxselector directory
...
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
2013-08-18 09:48:13 -05:00
graffy76
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
2013-08-18 09:34:33 -05:00
Chris Robinson
b0f8045c72
Improve mid-air control
2013-08-18 05:59:06 -07:00
Chris Robinson
8c3564326e
Improve movement inertia
...
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
2013-08-18 05:38:50 -07:00
Marc Zinnschlag
c38860fa72
added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)
2013-08-18 14:17:18 +02:00
Chris Robinson
9d56e2d86d
Apply movement by queueing it to do later
2013-08-17 22:34:38 -07:00
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
2013-08-17 19:40:28 -05:00
Chris Robinson
96bab88da6
Add physics methods to queue and apply movements
2013-08-17 07:48:45 -07:00
Chris Robinson
0481e64b02
Fix tracing down
2013-08-17 05:09:34 -07:00
Chris Robinson
8bcce0fb55
Clean up the trace struct
2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d
Get rid of the old newtrace method
2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5
Use a better method to do actor physics traces
2013-08-17 05:09:32 -07:00
Chris Robinson
d82f54c771
Improve actor movement collision handling
2013-08-17 05:09:30 -07:00
graffy76
b24dd5c6ac
Continued migration of code to ContentSelector
2013-08-17 05:55:43 -05:00
graffy76
61602789e1
Began migrating code to ContentSelector base
2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971
Moved init code to master / plugin proxy classes
2013-08-16 21:20:48 -05:00
graffy76
7389507eb5
Created masterproxylist class
2013-08-16 21:12:30 -05:00
graffy76
2bc56d0b5c
Fixed missing item list in launcher combobox
2013-08-16 20:59:58 -05:00
graffy76
b850fe0289
Removed vertical headers from plugin view
2013-08-16 18:59:01 -05:00
graffy76
49c4e1bf9e
Removed master table widget
2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a
Implemented combobox for game file selection
2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9
Changed filter mechanism for game / addons
...
Filters by number of master references, regardless of extension
2013-08-16 17:26:23 -05:00
Marc Zinnschlag
236dc9fc43
replaced binary filter node with a n-ary node
2013-08-16 14:18:31 +02:00
Marc Zinnschlag
528e047fd5
repalced std::auto_ptr with boost::shared_ptr in filter nodes
2013-08-16 13:57:54 +02:00
Chris Robinson
21121d5ba5
Store the object class in the LiveCellRef
2013-08-16 04:18:48 -07:00
Chris Robinson
08d1d486a4
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 17:42:16 -07:00
Marc Zinnschlag
d122699b2f
and another fix for the same issue :(
2013-08-15 18:29:09 +02:00
Chris Robinson
58481ec7c3
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 07:11:38 -07:00
Marc Zinnschlag
7b4d8afde7
fix to previous commit
2013-08-15 15:53:50 +02:00
Chris Robinson
fdbf09ed40
Merge remote-tracking branch 'zini/master' into ptr-improvements
...
Conflicts:
apps/openmw/mwworld/containerstore.cpp
2013-08-15 05:56:24 -07:00
Marc Zinnschlag
e94fcce622
accessing references via their ID now also works for references in containers in active cells
2013-08-15 14:45:13 +02:00
Chris Robinson
2853b56ed5
Throw an exception when trying to get an empty Ptr's type
2013-08-15 04:52:01 -07:00
Chris Robinson
0f2b2ff1ce
Small header cleanup
2013-08-15 01:21:43 -07:00
Chris Robinson
86f2cd5848
Use dynamic_cast to get the LiveCellRef
2013-08-14 20:26:50 -07:00
Chris Robinson
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Chris Robinson
74f855e948
Move common LiveCellRef fields to the base class
2013-08-14 01:55:51 -07:00
Chris Robinson
11166a1a17
Don't store the type name string in the Ptr
...
This should get rid of all heap allocations caused by constructing or copying
Ptr objects.
2013-08-14 00:45:28 -07:00
Chris Robinson
b6d2888c48
Avoid using boost::any in MWWorld::Ptr
...
Reduces dependency on Boost, and should improve performance a bit when
copying or constructing Ptr objects.
2013-08-14 00:45:27 -07:00
Marc Zinnschlag
aee0336780
Merge remote-tracking branch 'kcat/script-functions'
2013-08-14 09:05:40 +02:00
Chris Robinson
73437dfdca
GetEffect can accept an effect ID string as well
2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf
Combine ShowVarsImplicit and ShowVarsExplicit
...
Also removes an unnecessary else statement
2013-08-13 17:31:15 -07:00
Marc Zinnschlag
e2e76147c8
Merge remote-tracking branch 'potatoesmaster/magic'
2013-08-13 15:36:43 +02:00
Chris Robinson
30973352e8
Implement ShowVars (SV) console function
2013-08-13 04:54:41 -07:00
Chris Robinson
2353ac1739
Properly implement SetWerewolfAcrobatics
2013-08-13 04:54:41 -07:00
Emanuel Guevel
ad3646cb15
Fix spell icons displayed when effect ended
2013-08-13 04:57:45 +02:00
Emanuel Guevel
a47c76001c
Apply trap magic effects
2013-08-13 04:56:15 +02:00
Emanuel Guevel
37ea0f3fb9
Display refusal message when weapon/magic icons are clicked as werewolf
2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d
Display HUD icons for hidden windows
2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542
Fix pinned windows hiding
...
They were always displayed in console mode and in game (even if they
were force hidden).
2013-08-12 15:04:41 +02:00
Marc Zinnschlag
789a66eaa7
added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)
2013-08-11 20:39:21 +02:00
Chris Robinson
6fd4cdb5fb
Play randomized werewolf sounds
2013-08-11 00:53:17 -07:00
Chris Robinson
00d6690b4d
Ignore encumbrance in werewolf form
...
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
2013-08-10 20:25:18 -07:00
Chris Robinson
180f0d0fe9
Restart from the loop point if replaying the same animation
2013-08-09 21:25:28 -07:00
Chris Robinson
5968165de0
Merge remote-tracking branch 'zini/master' into werewolf
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2013-08-09 07:00:00 -07:00
Chris Robinson
a28c36de17
Don't count as running if not actually moving along (local) X/Y
2013-08-09 06:53:07 -07:00
Chris Robinson
c2d8eb377f
Play some appropriate sounds in werewolf form
2013-08-09 06:40:16 -07:00
Marc Zinnschlag
f5b06d5d52
basic filter tree structure
2013-08-09 14:49:05 +02:00
Chris Robinson
db1036e5e5
Handle SetWerewolfAcrobatics
2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4
Handle werewolf stats
2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d
added description field to filter record
2013-08-09 13:45:50 +02:00
Chris Robinson
72a399054f
Don't assume only players activate doors
2013-08-09 01:35:29 -07:00
Chris Robinson
46bc7bd9c8
Some cleanup since NpcStats is now also CreatureStats
...
This isn't a thorough cleaning, so keep an eye out for more
2013-08-09 01:14:08 -07:00
Marc Zinnschlag
fb0b57efaa
Merge remote-tracking branch 'vorenon/bug876'
2013-08-09 09:38:10 +02:00
Chris Robinson
75b6515915
Inherit NpcStats from CreatureStats
2013-08-08 23:28:02 -07:00
Chris Robinson
89c7f5bc70
Handle object activation as a werewolf
2013-08-08 22:34:53 -07:00
Chris Robinson
6110a0ee3b
Don't allow resting as a werewolf
2013-08-08 18:30:47 -07:00
Chris Robinson
75131e6a48
Rebuild the actor after switching between werewolf forms
2013-08-08 17:16:24 -07:00
Chris Robinson
5fbfce6d1e
Don't show WerewolfRobe objects in the inventory
...
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
2013-08-08 16:05:26 -07:00
Chris Robinson
d77d60cbc2
Remove an unneeded forceUpdate method
2013-08-08 15:37:08 -07:00
vorenon
a718a62ef5
Fix for bug 876
2013-08-09 00:06:34 +02:00
PLkolek
86020ad94d
Added underwater and drowning sounds.
2013-08-08 20:57:15 +02:00
Marc Zinnschlag
f6226e4859
added Creator class for filters
2013-08-08 15:55:23 +02:00
Chris Robinson
e3d5a1b38d
Dialog function 72 is not player-specific
...
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
2013-08-08 06:02:16 -07:00
Chris Robinson
960ea3d96c
Add/remove a WerewolfRobe when werewolf form is toggled
2013-08-08 04:40:31 -07:00
Chris Robinson
3cff7b1e42
Don't assume icons have a period in their filename
2013-08-08 04:40:31 -07:00
Chris Robinson
1f6055d54b
Don't try to apply body skins for werewolves
...
They instead use a hidden WerewolfRobe object for their body
2013-08-08 04:40:31 -07:00
Chris Robinson
946ca7f931
Return the appropriate name for werewolf NPCs
2013-08-08 04:40:31 -07:00
Chris Robinson
dfdd2dc308
Handle swimleft and swimright soundgen keys
2013-08-08 04:40:31 -07:00
Chris Robinson
109df46590
Fix werewolf claw damage multiplier
2013-08-08 04:40:31 -07:00
Chris Robinson
9694b18d1b
Update part skeletons immediately when added
2013-08-08 04:40:30 -07:00
Chris Robinson
f73578a832
Remove unnecessary mBodyPrefix field
2013-08-08 04:40:30 -07:00
Chris Robinson
5051544144
Remove some duplicate code
2013-08-08 04:40:30 -07:00
Chris Robinson
ceed2e30b8
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-08 04:40:30 -07:00
Chris Robinson
5ac82a50b7
Remove unused function
2013-08-08 04:40:30 -07:00
Marc Zinnschlag
e9521dc8f1
Merge remote-tracking branch 'potatoesmaster/pinning'
2013-08-08 13:06:58 +02:00
Marc Zinnschlag
bf839d19cf
Merge branch 'columns'
2013-08-08 12:50:57 +02:00
Marc Zinnschlag
0944338c27
avoid the use of hardcoded column numbers
2013-08-08 12:49:30 +02:00
Emanuel Guevel
1cbfcc3910
Fix HUD weapon icon when turning from werewolf to normal
...
The werewolf hand icon remained until the inventory menu was opened.
2013-08-08 10:56:44 +02:00
Chris Robinson
2bac4566c0
Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Chris Robinson
4985e17865
Fix werewolf claw damage multiplier
2013-08-07 19:15:36 -07:00
Chris Robinson
4641737fc4
Update part skeletons immediately when added
2013-08-07 19:15:36 -07:00
Chris Robinson
dc0360b1f6
Remove unnecessary mBodyPrefix field
2013-08-07 19:15:36 -07:00
Chris Robinson
0f52ed9a9b
Remove some duplicate code
2013-08-07 19:15:36 -07:00
Chris Robinson
deee14ccfd
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-07 19:15:36 -07:00
Chris Robinson
ab44cd63a1
Remove unused function
2013-08-07 19:15:35 -07:00
Emanuel Guevel
b2e5e8dd0d
Saner inventory window pinning/hiding
...
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
2013-08-07 23:30:08 +02:00
Alex
b9579e085f
cleanup
2013-08-07 15:40:57 -04:00
Alex
a0931b01fe
Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg
2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32
mild cleanup
2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Emanuel Guevel
e0d0cdd18a
Do not auto-equip items continuously
...
This was called every couple of frames.
2013-08-07 14:30:13 +02:00
Chris Robinson
076e7d8e16
Make insertBegin internal
2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d
Destroy the scene node we create
2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531
Remove unused/unneeded parameters
2013-08-07 03:56:06 -07:00
Emanuel Guevel
fd0a159a64
MWScript: update first unused opcode number
2013-08-07 12:05:53 +02:00
Emanuel Guevel
47b8a31317
Fixes suggested by KittyCat
2013-08-07 12:05:53 +02:00
Marc Zinnschlag
932fffd1a7
Merge remote-tracking branch 'kcat/light-objects'
2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72
Don't try to get the center of a null bounding box
2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1
Remove unused stuff
2013-08-07 01:31:01 -07:00
Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Chris Robinson
3555476dfd
Use Animation-derived objects for generic objects
2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05
Create the Animation SceneNode in the constructor
2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f
Use for_each and functors to avoid some for loops
2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f
Use controllers to animate lights in ObjectLists
2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee
Use a map to simplify NPC part referencing
2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5
Add a light for torches
2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
Chris Robinson
a9cc3a2844
Ensure a valid CellStore for Ptr::isInCell
2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886
Render torches
2013-08-06 19:49:01 -07:00
Chris Robinson
8f69c51b24
Avoid some unnecessary references
2013-08-06 19:49:00 -07:00
Chris Robinson
2c03fec4bb
Use the fatigue term for jumping
2013-08-06 19:49:00 -07:00
Chris Robinson
eab4e09566
Handle the pick/probe in the character controller
2013-08-06 19:48:59 -07:00
scrawl
3f7daa4884
Forgot to change initTerrainTextures
2013-08-07 02:58:03 +02:00
Alex
de1f423bd7
initial move of script opcodes and registerExtensions functions to components/compiler
2013-08-06 20:38:41 -04:00
scrawl
76e538c22a
Unused variable fix
2013-08-07 02:03:23 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
Marc Zinnschlag
03af7175dd
Merge remote-tracking branch 'potatoesmaster/bug-839'
2013-08-06 17:39:29 +02:00
Emanuel Guevel
c59ad62c57
Fix UndoWerewolf script instruction
2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd
Implement script instructions Become/UndoWerewolf
2013-08-06 12:34:35 +02:00
Emanuel Guevel
20d40c4368
Implement MWWorld::World::setWerewolf()
2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e
Implement MWWorld::InventoryStore::unequipAll()
2013-08-06 12:34:35 +02:00
Emanuel Guevel
ddc92d1fbd
Set appropriate weapon icon when player is a werewolf
2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460
Permit to force hiding GUI windows
2013-08-06 12:34:35 +02:00
scrawl
4caac0d859
Fix idle animations repeating
2013-08-05 02:06:23 +02:00
vorenon
76a1abe9fa
Don't allow the use of the "jump" key while sneaking - Update
2013-08-04 20:10:33 +02:00
vorenon
56cb36caf1
Don't allow the use of the "jump" key while sneaking
2013-08-04 19:45:41 +02:00
Emanuel Guevel
71da2f0a12
Do not allow magic/combat stance unless magic/inventory window are accessible
2013-08-04 00:21:27 +02:00
Marc Zinnschlag
41b2fa985b
silenced some warnings
2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863
Merge remote-tracking branch 'gus/MeleeCombat2'
2013-08-03 15:23:36 +02:00
Marc Zinnschlag
3170490a8e
silenced some warnings
2013-08-03 15:21:11 +02:00
Marc Zinnschlag
253e00e3a0
Merge remote-tracking branch 'gus/MeleeCombat2' into columns
2013-08-03 15:18:39 +02:00
Marc Zinnschlag
501753c01b
Merge remote-tracking branch 'scrawl/master' into columns
2013-08-03 15:06:30 +02:00
gus
a23e7fac93
clean up
2013-08-03 13:58:16 +02:00
scrawl
982f743ddd
Fix wrong idle animations played
2013-08-03 13:13:33 +02:00
gus
c8bb32c40d
small maths correction
2013-08-03 12:29:18 +02:00
gus
a25ee360dc
use angles and GMST. not sure this work as it should
2013-08-03 12:16:51 +02:00
Marc Zinnschlag
8f330e7e3c
Merge remote-tracking branch 'potatoesmaster/sneak'
2013-08-03 11:49:20 +02:00
gus
830762722d
first attempt: hit detection with a sphere (not finished)
2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1
Show sneak indicator when sneaking
...
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
2013-08-03 03:03:29 +02:00
Emanuel Guevel
8f8362d2c4
Expose sneak indicator widget through WindowManager
2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060
Update sneaking indicator position with other widgets
2013-08-03 02:43:56 +02:00
Emanuel Guevel
4685aea2a1
mwiniimport: ignore empty values
2013-08-03 00:21:05 +02:00
vorenon
aa45127895
Adjusted swish sounds
...
Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.
2013-08-02 16:33:39 +02:00
Marc Zinnschlag
d2f96deb98
renamed columns.hpp to columimp.hpp
2013-08-02 10:42:52 +02:00
Chris Robinson
f57c829cba
Play the appropriate swish sound and follow-up animation
2013-08-02 00:21:02 -07:00
Chris Robinson
b70975a74d
Move getEvasion to CreatureStats
2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745
Inline Class::get(const Ptr& ptr)
2013-08-02 00:20:59 -07:00
Marc Zinnschlag
ca94d1a2fb
Merge remote-tracking branch 'swick/inventorypos'
...
Conflicts:
apps/openmw/mwgui/inventorywindow.cpp
2013-07-31 22:16:56 +02:00
Marc Zinnschlag
24273f338b
Merge remote-tracking branch 'scrawl/master'
2013-07-31 22:12:07 +02:00
Sebastian Wick
7ed763262f
GUI mode dependent position
2013-07-31 21:40:29 +02:00
scrawl
fe51a00112
Fix the initial player inventory being added twice when starting a new game
2013-07-31 21:00:58 +02:00
scrawl
f1f6336a4a
Fixed screenshot keybinding, and make it bindable
2013-07-31 20:24:44 +02:00
Marc Zinnschlag
5cafe65cd7
Merge remote-tracking branch 'scrawl/cppcheck'
2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08
Fixed alchemy
2013-07-31 19:03:51 +02:00
Marc Zinnschlag
4dfd5282ab
Merge remote-tracking branch 'kolek/enchantingwindow'
2013-07-31 19:01:49 +02:00
Marc Zinnschlag
25917b00ec
Merge remote-tracking branch 'scrawl/master'
2013-07-31 19:00:24 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
43e0df479e
Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping
2013-07-31 16:30:22 +02:00
PLkolek
f297c21e4d
Old door sound fades out on door open/close. Door sound is synchronised to angle on action.
2013-07-31 15:46:23 +02:00
PLkolek
8bc8c38f2d
Spell cost is updatedon every change in enchanting and spellmaking.
2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458
Fixed area slider in self enchantments.
2013-07-31 12:26:34 +02:00
Marc Zinnschlag
6ce2b962e1
Merge remote-tracking branch 'scrawl/inventory'
2013-07-31 09:15:22 +02:00
Marc Zinnschlag
eedced729f
Merge remote-tracking branch 'scrawl/master'
2013-07-31 09:14:12 +02:00
Marc Zinnschlag
7639506e49
Merge remote-tracking branch 'scrawl/ai'
2013-07-31 09:07:46 +02:00
scrawl
16cacb338a
Initialize MWMechanics::AiSequence from ESM::AiPackageList
2013-07-31 00:55:08 +02:00
scrawl
45006ea193
Fix inventory/container content loading so that it's done for dynamically spawned objects as well
2013-07-31 00:02:24 +02:00
scrawl
90a5d8b6f5
Fix uninitialized AL listener position/orientation when the game is paused during the first frame
2013-07-30 23:24:18 +02:00
Marc Zinnschlag
958b0c4915
Merge remote-tracking branch 'scrawl/untilhealed'
2013-07-30 22:41:05 +02:00
scrawl
da01ec4f52
Only show the "Rest until healed" button when stats are not full
2013-07-30 22:07:27 +02:00
scrawl
04b90b7d14
Other actors no longer collide with an actor that has collision disabled
2013-07-30 22:00:48 +02:00
scrawl
472a381263
Fix health meter (again)
2013-07-30 16:09:12 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Marc Zinnschlag
2e667f1d94
Merge branch 'bottombar'
2013-07-30 12:55:12 +02:00
Marc Zinnschlag
434f97c95c
fixed two missing icons
2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498
added specialised Creator for references
2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce
added specialised Creator for referenceable records
2013-07-30 12:34:18 +02:00
Marc Zinnschlag
3642562959
Merge remote-tracking branch 'scrawl/master'
2013-07-30 08:11:40 +02:00
scrawl
426e3ec6c6
Fix enemy health meter for creatures
2013-07-30 06:17:21 +02:00
scrawl
3961c276b8
Added enemy health meter
2013-07-30 06:00:20 +02:00
Marc Zinnschlag
e27ba55541
Merge remote-tracking branch 'swick/countdialog'
2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671
use cancel methid
2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1
Allow the 'Activate' key to close the countdialog window; cleanups
2013-07-29 18:27:00 +02:00
Marc Zinnschlag
90ab7b2bf5
Merge remote-tracking branch 'swick/viewmodetransission'
2013-07-29 17:08:49 +02:00
Sebastian Wick
7c24c0a64e
fix uninitialized variables
2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2
First/Third person transitions with mouse wheel
2013-07-29 16:43:16 +02:00
Marc Zinnschlag
34c825ce52
added icons and type listing to UniversalId class
2013-07-29 16:21:42 +02:00
Marc Zinnschlag
661b290c49
automatically scroll table to the position of a newly created record
2013-07-29 15:00:41 +02:00
Sebastian Wick
1b310c5c5b
use SDL resolutions in the ingame settings
2013-07-29 13:34:56 +02:00
Marc Zinnschlag
3fa4a194a7
Merge remote-tracking branch 'scrawl/master'
2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
Chris Robinson
3744850545
Fix hand-to-hand health damage reduction
2013-07-28 16:07:09 -07:00
Chris Robinson
39507e3f0f
Decrease armor condition on successful hits
2013-07-28 15:51:17 -07:00
Chris Robinson
1af48ab6e0
Decrease weapon condition on successful hits
2013-07-28 15:17:01 -07:00
Chris Robinson
465f4d2063
Properly handle starting an animation at the end
2013-07-28 09:56:03 -07:00
Marc Zinnschlag
82958e6514
added custom creator for cell records
2013-07-28 18:08:57 +02:00
Chris Robinson
54f91d4b3a
Implement hand-to-hand attacks
2013-07-28 06:48:25 -07:00
Marc Zinnschlag
899e18b2cf
report ID errors also via input field tool tips
2013-07-28 15:28:35 +02:00
Marc Zinnschlag
5ec9d370cb
check if ID is already in use when creating new IDs
2013-07-28 15:27:15 +02:00
Marc Zinnschlag
124a70906f
added creator edit lock
2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6
validate IDs entered by the user
2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391
more compact layout for the bottom box
2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08
moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one)
2013-07-28 13:43:16 +02:00
Marc Zinnschlag
2d46a1db2f
changed CreateCommand to work directly on the model instead of the proxy
2013-07-28 13:39:33 +02:00
Chris Robinson
a34f0de3e1
Play the correct medium armor foot sounds
2013-07-28 04:17:36 -07:00
Chris Robinson
db4f34b332
Play hit sounds when hitting creatures and NPCs
2013-07-27 11:20:39 -07:00
Chris Robinson
1a40d01afa
Fix NPC armor rating calculation and reduce redundant lookups
2013-07-27 09:31:16 -07:00
Chris Robinson
f73008546f
Keep a sound updated with its object's position
2013-07-27 07:24:18 -07:00
Chris Robinson
c94653dc49
Implement the ModRegion script function
2013-07-27 07:10:18 -07:00
Marc Zinnschlag
f93af52486
handling down a reference to Data and the undo stack to the creators
2013-07-27 13:28:12 +02:00
Chris Robinson
1174b85ac8
Implement Disable/EnableTeleporting script functions
2013-07-27 00:14:55 -07:00
Marc Zinnschlag
fee748d4b5
added creator bar UI and cancel button
2013-07-26 21:09:23 +02:00
Chris Robinson
3298eb1b37
Implement HitOnMe script function
2013-07-26 10:50:23 -07:00
Chris Robinson
5379e607cb
Handle the OnPCHitMe script variable
2013-07-26 10:50:23 -07:00
Chris Robinson
f215d2cc30
Only raise weapon skills for the player
2013-07-26 10:50:23 -07:00
Chris Robinson
bec420c69b
Add Class::onHit for creatures
2013-07-26 10:50:23 -07:00
Chris Robinson
dd6edd21f8
Add a separate on-hit method to handle objects being hit
2013-07-26 10:50:23 -07:00
Marc Zinnschlag
b8ac45defe
added creator to bottom box layout and re-routed add record event to bottom box
2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449
removed some junk
2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a
added creator to bottom box; more cleanup
2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101
minor cleanup; less pointer usage
2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed
replaced createAndDelete flag with a new class hierarhy (Creator)
2013-07-26 12:35:17 +02:00
Emanuel Guevel
aa14656ff2
esmtool: fix swapped comparison operators
2013-07-26 10:24:15 +02:00
Marc Zinnschlag
3fbbbdc64b
Merge remote-tracking branch 'scrawl/master'
2013-07-26 08:06:53 +02:00
Chris Robinson
a569ae367e
Fix hit chance calculation
2013-07-25 13:09:26 -07:00
Chris Robinson
6195062d72
Try to figure out what gets hit
...
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679
Handle hit chance and damage calculation
...
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
2013-07-25 08:15:42 -07:00
Marc Zinnschlag
4327b81bc3
fixed column handling in table (had problems with filtered out columns before)
2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11
added optional per-subview status bar
2013-07-25 14:29:56 +02:00
Chris Robinson
1dcc893703
Merge remote-tracking branch 'zini/master' into combat
2013-07-25 01:16:49 -07:00
Chris Robinson
4ad28ed369
Don't play a weapon-down sound when unreadying a spell
2013-07-25 00:46:20 -07:00
Chris Robinson
92cc566fdc
Rename the Class::attack method to Class::hit
2013-07-25 00:30:01 -07:00
Chris Robinson
0db02af807
Set up the weapon state in the CharacterController constructor
2013-07-24 21:08:16 -07:00
Chris Robinson
d9a9c3d6bd
Handle the "land" soundgen type
2013-07-24 10:36:04 -07:00
Chris Robinson
705498ec24
Play a swish sound when attacking
2013-07-24 10:34:53 -07:00
Chris Robinson
d8ec813939
Say something from the "hit" dialog topic when losing health
2013-07-24 10:02:50 -07:00
Chris Robinson
59f1bc7542
Use time values for the aniamtion's start, stop, and loop points
...
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
2013-07-24 08:38:36 -07:00
Chris Robinson
bf1d907d07
Don't play casting animations for enchantments
2013-07-24 05:39:15 -07:00
Chris Robinson
cc8e8c1272
Use the attack strength as determined by how long the attack was held
2013-07-24 03:18:53 -07:00
Chris Robinson
0c8d4d9be2
Add beginnings of melee hits
2013-07-24 02:51:42 -07:00
Chris Robinson
45302f9e25
Handle controllers in the NPC's bound object parts
2013-07-23 22:05:03 -07:00
Marc Zinnschlag
a80e80dd94
added layout to table sub view
2013-07-23 21:59:02 +02:00
Chris Robinson
11b094559f
Play the appropriate casting animation sound
2013-07-23 11:12:19 -07:00
Emanuel Guevel
70a5a83419
Change the formula used to calculate initial NPC health
2013-07-23 16:48:54 +02:00
Chris Robinson
17282c69b1
Handle spell-casting animation sequences
2013-07-23 07:30:54 -07:00
Chris Robinson
4d157cb19a
Handle marksmen weapon attack sequences
2013-07-23 06:13:08 -07:00
Chris Robinson
fecb8c1cc4
Fix the completion amount for 0-length anims
2013-07-23 05:30:37 -07:00
Chris Robinson
d5d832846e
Rename the follow-up upper character state enum
2013-07-23 04:56:49 -07:00
Chris Robinson
537d5c4934
Avoid trying to play animations without any animation sources
2013-07-23 04:36:25 -07:00
Chris Robinson
ad6d663e09
Remove some unnecessary debug messages
2013-07-23 03:44:52 -07:00
Chris Robinson
24567294ff
Move NPC state update handling into a separate method
2013-07-23 03:26:24 -07:00
Chris Robinson
22e07968af
Store the current weapon group name
2013-07-23 02:50:52 -07:00
Chris Robinson
0240efa6cf
Improve weapon attack logic to better handle picks, probes, and h2h
2013-07-23 02:28:58 -07:00
Chris Robinson
ef17fdeb15
Remove some unused methods
2013-07-23 01:37:41 -07:00
Marc Zinnschlag
ec575200e3
Merge remote-tracking branch 'gus/MeleeCombat2'
...
Conflicts:
apps/openmw/mwrender/animation.cpp
2013-07-23 09:12:23 +02:00
Marc Zinnschlag
7600d6c04b
basic filter table
2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da
replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality
2013-07-21 17:53:39 +02:00
Emanuel Guevel
48f0e64ec3
Fix health calculation at character creation
2013-07-21 11:02:03 +02:00
Emanuel Guevel
1c330fc899
Use the correct formula for NPC health initialization
2013-07-21 10:13:46 +02:00
Emanuel Guevel
2356e6218e
Complete health increase on level up
2013-07-20 22:14:10 +02:00
Emanuel Guevel
2a0644a7c3
Move some levelup logic from mwgui to mwmechanics
2013-07-20 22:14:10 +02:00
Emanuel Guevel
7837dcdc19
Calculate NPC health on loading instead of updating it continually
...
Only NPC with auto-calculated stats are concerned.
2013-07-20 22:14:10 +02:00
Emanuel Guevel
074e241c32
MWMechanics::DynamicStat: fix members initialization
2013-07-20 22:14:09 +02:00
Marc Zinnschlag
a8168c58c2
Merge remote-tracking branch 'kolek/thirdpersonzoom'
2013-07-20 18:29:59 +02:00
Kolzi
d12bac2d9e
Third person zoom - fixed code review issues.
2013-07-20 16:55:35 +02:00
Marc Zinnschlag
0fad2e7f40
restructured main menu
2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702
replaced settings change notifications for columns with a more robust implementation
2013-07-20 13:19:27 +02:00
Kolzi
1b7966ca27
Can zoom in and out in third person view.
2013-07-19 16:12:01 +02:00
Chris Robinson
0cb7d186e7
Use Play_TypeFoot for 'left' and 'right' soundgen keys
2013-07-18 21:50:11 -07:00
Chris Robinson
14e0c182f3
Allow specifying the sound type to playSound and playSound3D
2013-07-18 21:50:11 -07:00
Chris Robinson
ac4dfd3b39
Play the appropriate foot sound based on footwear
2013-07-18 21:50:11 -07:00
scrawl
bf332b633e
Make VideoPlayer::playVideo block until the video finishes
2013-07-18 14:14:10 +02:00
Marc Zinnschlag
365ea11e86
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
2013-07-18 13:51:24 +02:00
Marc Zinnschlag
fdd47e5b73
silenced a warning
2013-07-18 13:50:12 +02:00
graffy76
0ae254f6a8
Fixed segfault opening tables
2013-07-18 06:31:47 -05:00
Chris Robinson
9c13568bb7
Remove idles from the state list and rename it
2013-07-18 01:49:53 -07:00
Chris Robinson
e803cdbe7f
Handle swimdeath and missing death animations
2013-07-18 01:13:53 -07:00
Chris Robinson
f01b0b48cc
Don't start with an idle state if dead
2013-07-18 00:35:03 -07:00
Chris Robinson
e78bdd2a5d
Clear 'swim' from the animation name as a backup instead of 'sneak'
2013-07-18 00:22:40 -07:00
Chris Robinson
9ea6b22a83
Handle soundgen animation keys
2013-07-17 23:58:21 -07:00
Chris Robinson
d6324d71bf
Ensure mechanics actors/objects are cleared before adding them
2013-07-17 21:39:21 -07:00
Chris Robinson
c7692acb79
Update the player's Ptr in mwrender when changing cells
2013-07-17 19:11:03 -07:00
graffy76
6486f342b5
Fixed setting synchronization issue
...
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
2013-07-17 20:19:01 -05:00
Marc Zinnschlag
1b4cd787a5
Merge remote-tracking branch 'kcat/animation-state'
2013-07-17 11:33:04 +02:00
Chris Robinson
0cd4df3edf
Stop playing idles on death
2013-07-17 02:19:22 -07:00
Chris Robinson
e2e278d06d
Fix some animations not playing properly
...
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
2013-07-17 02:06:31 -07:00
scrawl
dfe912dcab
Enum renaming
2013-07-16 23:38:55 +02:00
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
2013-07-16 23:32:41 +02:00
gugus
9043fe427f
Merge pull request #4 from scrawl/melee
...
Fixes weapon input to use A_Use instead of hardcoding to mouse button
2013-07-16 07:35:21 -07:00
scrawl
9536b5050b
Fixes weapon input to use A_Use instead of hardcoding to mouse button
2013-07-16 16:25:41 +02:00
gus
66e3eacace
fix bows
2013-07-16 15:14:34 +01:00
gus
701ff94887
bugfix for lockpick
2013-07-16 14:46:44 +01:00
gus
20341ae8b7
simplification + taking into account weapon speed. Seems too fast, but i'm not sure
2013-07-16 14:10:14 +01:00
gus
8fc6e73649
post-merge fix
2013-07-16 11:51:18 +01:00
gus
ee47e99dad
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2013-07-16 11:40:19 +01:00
Marc Zinnschlag
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
2013-07-16 12:08:35 +02:00
gus
f6e3445414
Jittering gone + bugfix: chop animation works!
...
TODO: fix this unequip stuff
2013-07-16 09:50:59 +01:00
Chris Robinson
e5e9c83ed5
Merge remote-tracking branch 'zini/master' into animation-state
2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20
Add a speed multiplier to the animation state
2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf
Store a pointer to the character controller for non-actor objects
2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213
Track death separately in the character controller
2013-07-15 23:43:33 -07:00
Chris Robinson
4ae65c20e6
Separate movement and idle states
...
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
2013-07-15 22:56:23 -07:00
scrawl
94d45e1518
Fix twohanded weapons not unequipping when equipping a torch
2013-07-15 23:21:01 +02:00
scrawl
daf9dca121
Fix exception when starting a new game
2013-07-15 20:37:36 +02:00
gus
f7f23ac5d8
improvement of the chop animation. Still some jittering.
2013-07-15 17:18:16 +01:00
gus
f7b711aabe
bugfix
2013-07-15 16:37:32 +01:00
gus
076f98cbba
change way animations keys are handled (thanks KittyCat!)
2013-07-15 16:37:25 +01:00
Marc Zinnschlag
fd9cc1c282
Merge remote-tracking branch 'vorenon/container'
2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b
Merge remote-tracking branch 'scrawl/raycast'
2013-07-15 09:20:16 +02:00
vorenon
66eb82b363
oops again
2013-07-15 02:26:22 +02:00
vorenon
33779ae23c
oops
2013-07-15 02:23:18 +02:00
vorenon
d4739a451a
added ability to close container windows with the activation key
2013-07-15 02:18:24 +02:00
scrawl
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
Marc Zinnschlag
1bc343f363
Merge remote-tracking branch 'kcat/first-person'
2013-07-14 21:28:09 +02:00
scrawl
fa5198d7b2
Fix an assertion
2013-07-14 14:59:24 +02:00
scrawl
61661c8653
Fix first person meshes casting shadows
2013-07-14 14:55:07 +02:00
scrawl
a049638e7f
Fixes character previews getting shadowed randomly
2013-07-14 14:54:40 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Chris Robinson
3771e5839e
Allow some more third person fallbacks in first person
2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6
Attach the camera to the Head node in first-person
2013-07-13 16:12:38 -07:00
gus
3947f44aa3
Porting old work
2013-07-13 22:24:52 +01:00
Chris Robinson
2d7620e774
Rotate the neck when looking up and down in first-person
2013-07-13 12:39:06 -07:00
Marc Zinnschlag
4cce466dc7
inverted region map y-axis
2013-07-13 16:34:10 +02:00
Chris Robinson
4df1f198a7
Avoid a map lookup for every skin body part when updating
2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa
Avoid casting shadows in first-person view
2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5
Use a multimap for the bodypart map
2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2
Show arms and body parts in first person
...
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74
Reset the NPC object root when switching POV
...
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586
Store a pointer to the character controller in the map
2013-07-12 22:31:50 -07:00
Marc Zinnschlag
c26a6f884f
added region map tooltips
2013-07-12 12:55:14 +02:00
greye
29b7734b52
add qualifiers for names in templates to make gcc 4.7+ happy
2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23
updating region map on changes to region and cell records
2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
11178cc470
Repo permissions commit fix #3
2013-07-10 21:44:25 -05:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9
Fixing repo permissions commit #1
2013-07-10 17:29:07 -05:00
scrawl
bbb5d2b98a
Change tooltip positioning to resemble vanilla
2013-07-10 03:40:13 +02:00
Marc Zinnschlag
d389b70ec4
added missing case folding
2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e
some cleanup; added handling of deleted cells (now displayed instead of ignored)
2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d
dealing with invalid regions and cells without regions
2013-07-08 17:13:58 +02:00
Marc Zinnschlag
6159724b04
build region map from records (only initial build; updates not implemented yet)
2013-07-08 16:53:08 +02:00
Marc Zinnschlag
4f05f2bddf
basic region map; non-interactive for now and working with dummy data instead of real cell/region records
2013-07-08 13:12:50 +02:00
Marc Zinnschlag
71a6955182
Merge remote-tracking branch 'scrawl/master'
2013-07-08 09:46:00 +02:00
scrawl
91f6d87126
Fix an uninitialized variable
2013-07-07 16:57:46 +02:00
Marc Zinnschlag
602e40e19d
Merge remote-tracking branch 'greye/coc'
2013-07-07 13:34:28 +02:00
greye
e553f285b8
update player position on engine start
2013-07-07 15:06:05 +04:00
greye
f3d54a7ba4
move finding default cell positions to World
2013-07-07 15:03:06 +04:00
greye
0c303aa285
fix fading on cell transition when cell is loaded
2013-07-07 14:30:11 +04:00
greye
6bb3942288
use Land height data for position in coc
2013-07-07 13:47:58 +04:00
greye
a3094b808e
update coc behaviour for interior cells
2013-07-07 13:47:58 +04:00
scrawl
744c5804ed
Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.
2013-07-07 03:52:17 +02:00
Marc Zinnschlag
de5898c953
post merge fixes
2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b
added missing reference table columns
2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32
store ID of cell in reference struct
2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
scrawl
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
2013-07-06 16:40:57 +02:00
scrawl
5c8950f91c
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-07-06 16:08:29 +02:00
Marc Zinnschlag
f9d7c7574e
Merge remote-tracking branch 'swick/scrollbar'
2013-07-06 13:13:27 +02:00
Marc Zinnschlag
3dc42fb948
Merge remote-tracking branch 'greye/master'
2013-07-06 12:28:01 +02:00
greye
76d95dffb6
special case for loading StartScript records
2013-07-05 23:52:46 +04:00
Sebastian Wick
26bd2a5301
use the new scrollbar; range dependent step size; fix
2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd
use a mygui controller for scrollbar repeat
2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
2013-07-02 17:29:47 +02:00
graffy76
9f6d250463
QDebug reference removal
2013-07-01 07:40:47 -05:00
Marc Zinnschlag
847ec9fa56
Merge remote-tracking branch 'swick/master'
2013-07-01 10:16:39 +02:00
Sebastian Wick
8bdc9ff3ae
set position of the window for multiple monitors
2013-07-01 03:56:33 +02:00
graffy76
55b115935a
Implemented RefRecordTypeDelegate
...
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
2013-06-30 07:43:58 -05:00
graffy76
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
2013-06-29 08:54:32 -05:00
Marc Zinnschlag
56637a39a3
Merge remote-tracking branch 'vheuken/master'
2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5
fixed weather code
2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e
remove actor's collisionbox on death
2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854
resize actor collision boxes on death
2013-06-27 14:11:20 -07:00
scrawl
123a60581f
Only link to SDL2main on windows
2013-06-27 21:45:32 +02:00
Marc Zinnschlag
e88040662e
Merge remote-tracking branch 'glorf/master'
2013-06-27 12:24:09 +02:00
Marc Zinnschlag
afb120d5ce
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-27 08:11:27 +02:00
graffy76
6deddf7229
Fixed code conventions in user settings, changed top-level page names
2013-06-26 21:18:21 -05:00
Glorf
88f8637145
Bugfix #795
2013-06-26 22:20:24 +02:00
Glorf
5b81d124bb
Catched another exception
2013-06-26 18:43:27 +02:00
Glorf
f4d302501e
Bugfix #826
2013-06-26 18:29:09 +02:00
Marc Zinnschlag
623200b50e
Merge remote-tracking branch 'pakanek/libav_headers'
2013-06-26 10:58:43 +02:00
Marc Zinnschlag
8ffea60b72
some cleanup
2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-26 09:48:51 +02:00
Miroslav Puda
743b3dec99
Correction of libavutil version
2013-06-26 07:17:29 +02:00
graffy76
f0f895ad10
Fixed settings file error message
...
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
2013-06-25 19:32:36 -05:00
Alexander "Ace" Olofsson
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
2013-06-25 15:05:10 +02:00
eroen
d75391de8e
libav-9 - fix missing includes
...
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
2013-06-24 21:08:28 +02:00
Marc Zinnschlag
05649a1654
Merge remote-tracking branch 'swick/master'
2013-06-24 14:35:32 +02:00
Vincent Heuken
09cca0bf80
more detailed error message when SDL fails to initialize
2013-06-23 16:45:23 -07:00
Marc Zinnschlag
99508a6eaa
minor cleanup
2013-06-23 22:52:02 +02:00
Sebastian Wick
20e591fe18
use index instead of string manipulation
2013-06-23 21:56:27 +02:00
Sebastian Wick
357974a429
more minor stuff
2013-06-23 21:34:41 +02:00
mckibbenta
1f4d1d3b57
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-06-23 15:29:35 -04:00
mckibbenta
5803726233
modified gmst addition during creation of new base file
2013-06-23 15:19:08 -04:00
Sebastian Wick
c97fac8116
use QMessageBox to show errors
2013-06-23 21:16:51 +02:00
Sebastian Wick
89dee80dcf
simpler remove of duplicates
2013-06-23 21:04:49 +02:00
Sebastian Wick
6abb5d5f75
small fixes
2013-06-23 20:53:50 +02:00
Sebastian Wick
dbfc39468b
better workaround
2013-06-23 20:45:24 +02:00
Marc Zinnschlag
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
2013-06-23 08:34:35 +02:00
Sebastian Wick
6f7a7b4714
remove old code
2013-06-23 05:02:19 +02:00
Sebastian Wick
bb39a85f16
remove double entries
2013-06-23 04:43:34 +02:00
Sebastian Wick
14d074e3e7
select first screen if none is in the setting
2013-06-23 04:21:32 +02:00
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
2013-06-23 03:49:30 +02:00
mckibbenta
16a27e28f7
inluded gmsts with default values to creation of new base files
2013-06-22 21:01:27 -04:00
Marc Zinnschlag
d61c12ccfc
minor cleanup
2013-06-22 20:32:11 +02:00
Sebastian Wick
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-06-22 19:17:39 +02:00
Sebastian Wick
0e29286856
fix custom resolution maximum
2013-06-22 19:15:13 +02:00
graffy76
62e164b2aa
Fixed load file error if no file is found
2013-06-22 07:43:28 -05:00
graffy76
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
2013-06-21 23:23:43 -05:00
Marc Zinnschlag
f5ba2b37e7
Merge remote-tracking branch 'vorenon/fixes'
2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c
Fading for Exterior->Interior cell transitions
2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838
killed a stray srand
2013-06-21 08:58:52 +02:00
graffy76
b3d185e421
Unsaved changes missed in previous commits
2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2
Removed CSVSettings::SamplePage class files
2013-06-20 18:07:34 -05:00
graffy76
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
2013-06-20 18:06:25 -05:00
Miroslav Puda
8da3494d74
Revert "Type of weather changed from string to enum."
...
This reverts commit 04d90b4c47
2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d
Correction of sigsegv.
2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd
Static for nextWeather()
2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c
Removal of duplicit exterior checking and unneded string copiing.
2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a
WeatherResult added as member variable.
2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e
Simpler statistical calculation of next weather; minus before parens.
2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47
Type of weather changed from string to enum.
2013-06-19 03:24:30 +02:00
vorenon
4e8e048968
Added missing click sounds to dialogue
2013-06-19 01:46:38 +02:00
Marc Zinnschlag
94ec05c2c6
Revert "simplifying CSMWorld::CellRef"
...
With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a
2013-06-18 11:27:05 +02:00
Marc Zinnschlag
9c6fa29938
Merge remote-tracking branch 'glorf/bugfix2'
2013-06-17 23:33:09 +02:00
Glorf
09cc57381a
Bugfix #809
2013-06-18 00:43:31 +02:00
Thoronador
d26e721d10
no const for int and bool
2013-06-17 18:47:12 +02:00
Thoronador
9313b2b3fe
better const correctness for MwIniImporter
2013-06-17 17:44:40 +02:00
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
2013-06-17 15:02:18 +02:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c
split IdCollection into Collection and IdCollection class
2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d
rewrote IdCollection::load (not using private members of IdCollection anymore)
2013-06-17 13:49:32 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882
added a bit more documentation
2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
2013-06-17 11:42:02 +02:00
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
2013-06-17 08:58:48 +00:00
Marc Zinnschlag
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 21:23:35 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c
Fix a message box issue
2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3
added missing line break in front of multiple choice questions
2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5
Better handle SDL_TEXTINPUT events
2013-06-16 19:43:59 +02:00
vorenon
ed6098388f
return false instead of std::exit
2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
2013-06-16 18:12:09 +02:00
scrawl
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
2013-06-16 18:06:55 +02:00
Marc Zinnschlag
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
2013-06-16 17:03:50 +02:00
vorenon
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c
Workaround for bug #820
2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
scrawl
5252ffa104
More cleanup
2013-06-15 17:06:27 +02:00
scrawl
289587b1a9
Cleanup
2013-06-15 16:29:25 +02:00
scrawl
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
2013-06-15 15:33:47 +02:00
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05:00
scrawl
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05
Moved window resize messages to sdlinputwrapper
2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58
Removed obsolete OIS workaround
2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676
Fix wrong indenting from my last commits.
2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
2013-06-13 18:04:38 +02:00
scrawl
0880805559
Minor cleanup
2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73
replace tabs with spaces.
2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b
Use mousewheel to turn book pages.
2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
2013-06-12 20:27:55 +02:00
scrawl
ab3634d692
Removed some remains of OIS
2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6
Fix mouse wheel triggering a click event in mygui
2013-06-12 15:10:04 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
Marc Zinnschlag
df1f1bd5c8
Merge remote-tracking branch 'glorf/cs-windows'
2013-06-12 10:58:08 +02:00
Glorf
548f4d683f
Globalization of user settings
2013-06-12 12:36:35 +02:00
Marc Zinnschlag
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02:00
Marc Zinnschlag
c891e529f3
Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'
2013-06-12 10:32:53 +02:00
Rohit Nirmal
2fd4d71774
trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.
2013-06-11 23:00:12 -05:00
darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
2013-06-11 20:28:38 -07:00
darkf
fd25616cab
launcher: Properly quit if settings write fails.
2013-06-11 20:28:36 -07:00
Rohit Nirmal
fdeac21f22
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound
2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
2013-06-10 19:42:38 -05:00
fstp
98e5cb6d7b
Added ifdef to keep backward compatibility with the FFmpeg library.
2013-06-10 15:10:39 +02:00
Rohit Nirmal
4eede86ce6
Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.
2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60
Added virtual destructors to classes LocalMapBase and EffectEditorBase.
2013-06-09 23:08:57 +02:00
Glorf
10165d3c6b
Feature #468
2013-06-09 00:34:27 +02:00
Marc Zinnschlag
97f421df8a
simplifying CSMWorld::CellRef
2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
2013-06-08 12:45:13 +02:00
Marc Zinnschlag
48496a644f
Merge remote-tracking branch 'scrawl/master'
2013-06-06 23:42:21 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
2013-06-02 21:43:22 +02:00
Marc Zinnschlag
f586eef604
Merge remote-tracking branch 'torben/pathfindingoverhaul'
2013-06-01 10:44:23 +02:00
Torben Carrington
09beafd044
Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes).
2013-05-31 17:49:52 -07:00
Torben Carrington
a4caec56cf
Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit).
2013-05-31 17:01:42 -07:00
scrawl
8bd712cc95
Fix being able to move slowly when over encumbered
2013-05-31 04:08:44 +02:00
Torben Carrington
73a9671742
Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.
2013-05-29 20:05:17 -07:00
graffy76
1d93cf09bc
Cell formatting and code optimization changes
2013-05-29 21:55:19 -05:00
Torben Carrington
c080785235
Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).
2013-05-29 19:26:45 -07:00
Torben Carrington
7b465ae4f1
Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.
2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410
Pathfinding Overhaul - More cleanup.
2013-05-29 16:10:15 -07:00
Torben Carrington
4838678944
Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.
2013-05-29 15:59:23 -07:00
graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
Miroslav Puda
dc17fa1636
Removal of duplicit enumeration and unnecessary conditions.
2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6
Merge remote-tracking branch 'pakanek/enchanting-mechanics'
2013-05-28 10:02:03 +02:00
Marc Zinnschlag
6e7416d8c5
Merge remote-tracking branch 'scrawl/master'
2013-05-28 09:59:41 +02:00
scrawl
9a43927078
Fix weapons not appearing in Enchantable filter
2013-05-28 03:15:13 +02:00
Miroslav Puda
7a4a386cbe
Removal of tab characters.
2013-05-27 20:47:53 +02:00
Torben Carrington
dbbc96f600
AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander.
2013-05-27 11:44:46 -07:00
Miroslav Puda
b40e24c50c
Refactorization
2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499
Fix for display of cast cost decimal value
2013-05-27 20:16:57 +02:00
Marc Zinnschlag
7927ac818c
Merge remote-tracking branch 'torben/aiwanderpatchpotential'
2013-05-27 18:29:15 +02:00
Miroslav Puda
9a9b075a02
Correct cast cost for enchantments.
2013-05-27 18:08:12 +02:00
Torben Carrington
ebc1fdd017
AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.
2013-05-27 09:05:42 -07:00
scrawl
0c7f48ec8a
Implement movement for creatures (formula is a stub)
2013-05-27 18:03:06 +02:00
Miroslav Puda
1c7b94e94f
Switching in nextCastStyle() is now based on enum CastingStyle.
2013-05-27 16:08:58 +02:00
Miroslav Puda
252a1d9223
Replacement of some magical constants
2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226
Better formula for enchantment cost and code refactorization.
2013-05-27 14:42:08 +02:00
Miroslav Puda
56edc1b213
Correction of getting spell range "Target".
2013-05-27 12:26:06 +02:00
Torben Carrington
bd6d54cc8f
AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.
2013-05-27 03:24:41 -07:00
Marc Zinnschlag
86dd6d0847
Merge remote-tracking branch 'eroen/libcxx'
2013-05-27 10:27:31 +02:00
Marc Zinnschlag
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
2013-05-27 10:19:02 +02:00
Marc Zinnschlag
bd8344b387
Merge remote-tracking branch 'torben/aiwander'
2013-05-27 10:16:37 +02:00
Torben Carrington
3b43ee751e
AI Execute Fix - May as well not create the object either to save extra time.
2013-05-26 19:54:59 -07:00
Torben Carrington
feb180724c
AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.
2013-05-26 19:33:45 -07:00
scrawl
3a6e54c4f5
Sell owned items in the cell
2013-05-27 02:18:36 +02:00
Torben Carrington
fd96d47fe4
AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.
2013-05-26 11:30:42 -07:00
Torben Carrington
96daad7a22
AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."
2013-05-26 09:31:56 -07:00
Torben Carrington
e37324b967
AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.
2013-05-26 08:49:44 -07:00
eroen
2850032d9e
libc++ fixes: avcodec/avformat workaround
...
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.
Moving the string inclusion after that eyesore shouldn't break anything.
2013-05-26 12:01:01 +02:00
Marc Zinnschlag
5fac75845c
Merge remote-tracking branch 'torben/aiescortclean'
2013-05-25 15:35:56 +02:00
Torben Carrington
ddf28ca201
AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.
2013-05-25 04:36:21 -07:00
Marc Zinnschlag
94474e8952
Merge remote-tracking branch 'torben/checkidlecomplete'
2013-05-25 12:35:34 +02:00
Marc Zinnschlag
81cd1c6e30
Merge remote-tracking branch 'torben/aitravelcleanup'
2013-05-25 12:35:00 +02:00
Torben Carrington
c8c1ddd927
Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.
2013-05-24 20:10:07 -07:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
Torben Carrington
56b1384c90
AITravel Cleanup - Removed unnecessary includes and other varius cleanups.
2013-05-24 18:16:35 -07:00
riothamus
d9350be8da
Console Object Selection Fix
2013-05-24 09:31:56 -04:00
Marc Zinnschlag
b1a8dc35e0
minor adjustments
2013-05-24 15:03:46 +02:00
Marc Zinnschlag
62479cd885
Merge remote-tracking branch 'torben/aiwanderrepeat'
2013-05-24 14:58:10 +02:00
Torben Carrington
1cfe037d6b
AIWander - Added support for the Repeat parameter to mimic vanilla.
2013-05-24 04:49:20 -07:00
scrawl
32e90bb733
Fix chargen statssheet
2013-05-23 17:28:45 +02:00
Marc Zinnschlag
2d894fde57
Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24
2013-05-23 16:08:58 +02:00
riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04:00
Miroslav Puda
00866ef246
Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script
2013-05-22 20:25:47 +02:00
Miroslav Puda
8a9ddcaa32
Plain output moved at the end of records output.
2013-05-22 20:24:23 +02:00
Miroslav Puda
d3d5cb4edf
New command line option --plain to print contents of scripts, books, dialogs.
2013-05-22 20:09:11 +02:00
Marc Zinnschlag
c40e753ea9
Merge remote-tracking branch 'pakanek/master'
2013-05-22 14:07:49 +02:00
Marc Zinnschlag
6d0b8f7bc8
added missing include
2013-05-22 10:14:12 +02:00
Miroslav Puda
3cebb41459
missing break
2013-05-21 21:04:15 +02:00
Edmondo Tommasina
f0482dd796
dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘"
...
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
2013-05-20 23:51:01 +02:00
Marc Zinnschlag
5d4c311de7
Merge remote-tracking branch 'scrawl/master'
2013-05-20 15:01:25 +02:00
scrawl
d3effdf34c
Fix exception when trying to equip a shield while a lockpick is equipped
2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610
Security fixes
2013-05-20 12:42:11 +02:00
Marc Zinnschlag
c1ceb32b28
Merge remote-tracking branch 'scrawl/master'
2013-05-20 12:10:51 +02:00
scrawl
2715520d6f
Cleanup Security class
2013-05-19 23:19:48 +02:00
scrawl
5173779f4b
Add sounds for security skill
2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5
added missing columns for NPC records
2013-05-19 13:53:47 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
Marc Zinnschlag
8d78bea4aa
added missing column for misc record
2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b
added missing columns for Light record
2013-05-18 18:46:41 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
2013-05-17 06:21:59 -07:00
Marc Zinnschlag
749fd418b5
added missing columns for door record
2013-05-17 15:10:41 +02:00
Marc Zinnschlag
e2b8f9ea6d
Merge remote-tracking branch 'scrawl/master'
2013-05-17 14:37:41 +02:00
scrawl
d096b19307
Fix not being able to equip arrows/bolts
2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac
Don't show weapons in first-person
2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74
Use the PickProbe animation group as appropriate
2013-05-17 01:46:51 -07:00
Marc Zinnschlag
f8c675a638
Merge remote-tracking branch 'graffy76/usersettings'
2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c
Commented out sample editor settings page
2013-05-16 20:43:05 -05:00
Marc Zinnschlag
cc42b1ef48
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 20:07:48 +02:00
riothamus
d89dbde940
Bug 752, spacing fix
2013-05-16 14:05:22 -04:00
Marc Zinnschlag
ef9abda754
Merge remote-tracking branch 'glorf/weather'
2013-05-16 19:53:28 +02:00
Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 19:52:14 +02:00
riothamus
36f1197b51
Bug 752, cleanup
2013-05-16 13:51:54 -04:00
Glorf
19ce233667
Workaround for MOC compiler problem
2013-05-16 19:46:04 +02:00
riothamus
db981a72fe
Bug 752
2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179
Merge remote-tracking branch 'scrawl/persistence'
2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
graffy76
13242c2bd5
Eliminated code centering the initial view in the middle of the screen
2013-05-16 10:14:13 -05:00
Marc Zinnschlag
889a87982e
added missing columns for creatures
2013-05-16 16:27:33 +02:00
Chris Robinson
6201cb0093
Add a method to clear the animation queue
2013-05-16 06:59:41 -07:00
Glorf
af28be915f
Use fallback video name
2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c
Bugfix #778
2013-05-16 13:35:28 +02:00
Chris Robinson
6c6200efef
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 16:34:51 -07:00
Marc Zinnschlag
9fee99d56c
Merge remote-tracking branch 'scrawl/master'
2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999
Some fixes
2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Marc Zinnschlag
d794a62d19
added missing columns for container record
2013-05-15 17:02:34 +02:00
Chris Robinson
71d39c2fa0
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 06:36:06 -07:00
Chris Robinson
e069215583
Don't clear the last queued animation when it stops
2013-05-15 06:32:20 -07:00
Marc Zinnschlag
28f2a7d2b4
added missing column for clothing records
2013-05-15 11:37:46 +02:00
Chris Robinson
66f55b3178
Play the item up/down sound when readying/unreadying weapons
2013-05-15 01:45:47 -07:00
Chris Robinson
b459a010b0
Fix vec.z being applied while not in the air
2013-05-14 23:03:28 -07:00
Chris Robinson
3c5c10144a
Remove a duplicate showWeapons call
2013-05-14 19:38:57 -07:00
Marc Zinnschlag
56b2b05f9a
Merge remote-tracking branch 'glorf/weather'
2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363
Corrected celestical object sizes
2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277
Playing with moons part 2
2013-05-14 19:58:08 +02:00
Chris Robinson
e8661794fe
Avoid trying to find a state for non-actors.
...
They're only ever play idles, unless PlayGroup is called.
2013-05-14 07:29:07 -07:00
Marc Zinnschlag
eba9d3e3ee
added missing columns for book record
2013-05-14 14:40:06 +02:00
Marc Zinnschlag
fce9939f83
added missing columns for armor record
2013-05-14 14:33:34 +02:00
Marc Zinnschlag
7c57f2c221
added AI-related actor columns
2013-05-14 13:20:59 +02:00
Chris Robinson
355f653614
Use AnimationAlloc instead of AnimationAllocatedObject
2013-05-14 01:30:01 -07:00
Chris Robinson
47a9a4cdff
Clean up a for loop
2013-05-14 01:29:15 -07:00
scrawl
96e3b3b7c2
Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject
2013-05-13 21:03:53 +02:00
Marc Zinnschlag
d684120f7a
Merge remote-tracking branch 'scrawl/master'
2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d
Fix the frame update not getting called on the first frame
2013-05-13 20:08:12 +02:00
Marc Zinnschlag
74d791e207
fixed auto calc column
2013-05-13 14:07:31 +02:00
Marc Zinnschlag
897e55391d
added columns for tool IDs
2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa
added columns for enchantments
2013-05-13 13:11:43 +02:00
Chris Robinson
822f130f79
Merge remote-tracking branch 'zini/master' into animations
2013-05-13 04:09:56 -07:00
Chris Robinson
8ec722ac92
Use std::find_if instead of ugly for loops
2013-05-13 04:08:36 -07:00
Marc Zinnschlag
90bae2bead
do not create editors for unused columns
2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a
added missing columns for apparati records
2013-05-13 12:51:27 +02:00
Chris Robinson
f83ee5d316
Play ready/unready animations on the upper body
2013-05-13 03:32:00 -07:00
Torben Carrington
4d10a1c407
Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)
2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382
fixed AiWander arguments
2013-05-13 11:27:36 +02:00
Chris Robinson
a9928bb842
Split up the UpperBody group
...
Also recognize the [un]equip start and stop text keys.
2013-05-13 02:09:22 -07:00
Chris Robinson
70dc2f77ad
Move the priority enum to MWMechanics
2013-05-13 00:54:44 -07:00
Chris Robinson
7ba2508556
add a priority for death animations, and store it in the state list
2013-05-12 19:19:21 -07:00
graffy76
c71d921f09
Moved signalUpdateEditorSettings from UserSettingsDialog to
...
UserSettings.
UserSettings is now derived from QObject.
2013-05-12 15:15:57 -05:00
graffy76
144be59735
Changed enum names to match OpenMW naming conventions
2013-05-12 14:28:36 -05:00
Marc Zinnschlag
7fd277b87a
added missing column for potions
2013-05-12 15:50:29 +02:00
Chris Robinson
4e389b5a8f
Store whether a given animation loops in the state table
2013-05-12 05:59:39 -07:00
Chris Robinson
bbb38c61cc
Fix queued animations
2013-05-12 05:08:01 -07:00
Chris Robinson
3988866ecd
Make sure active groups are updated after a state is auto-disabled
2013-05-12 04:34:37 -07:00
Chris Robinson
2c556e4036
Be smarter about handling non-moving animations
...
Don't rely on being told by the play method, so the animation can
automatically change without impacting the character controller.
2013-05-12 04:29:42 -07:00
Marc Zinnschlag
9835c6df11
Merge remote-tracking branch 'scrawl/tradefix'
2013-05-12 12:58:32 +02:00
Chris Robinson
4ea347ac52
Use shared pointers to store animation sources
...
This ensures references to the sources stay valid as long it the object
is, rather than becoming invalidated whenever one is added or removed.
2013-05-11 19:38:23 -07:00
graffy76
88df3b980f
Implemented UserSettings as a singleton.
2013-05-11 20:55:36 -05:00
scrawl
b56d50287e
Barter mechanic fix
2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f
Merge remote-tracking branch 'scrawl/containerui'
2013-05-11 19:23:02 +02:00
Marc Zinnschlag
da92921387
added columns related to items in inventories
2013-05-11 19:21:16 +02:00
Marc Zinnschlag
ee2bc94698
added script column
2013-05-11 18:57:23 +02:00
Marc Zinnschlag
e24ecfd5d2
added name column
2013-05-11 18:43:16 +02:00
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
Marc Zinnschlag
318ebe0cb6
added model column
2013-05-11 18:35:48 +02:00
Marc Zinnschlag
8ef2d04007
added type column
2013-05-11 17:49:38 +02:00
Marc Zinnschlag
c22f773f72
load all types of referenceable IDs
2013-05-11 17:45:28 +02:00
Marc Zinnschlag
d715cf5431
replaced static adapter with a template
2013-05-11 17:34:18 +02:00
Marc Zinnschlag
9426eda47a
small test with statics and two columns
2013-05-11 17:01:16 +02:00
Marc Zinnschlag
02ace69511
fixed RefID search
2013-05-11 16:55:10 +02:00
graffy76
d0b23a4786
Relocated "User Settings" to Edit->Preferences
...
Removed <QDebug> reference from view.hpp
2013-05-11 07:40:10 -05:00
graffy76
a8b45e0a13
Three primary changes:
...
1. Declared QStringPair::isEmpty() const
2. Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3. Declared several classes as _noqt in CMakeLists.txt for OpenCS
2013-05-11 05:55:46 -05:00
Chris Robinson
6b8a687a79
Add methods to disable an animation
...
And rename WeaponState to WeaponType
2013-05-10 22:22:39 -07:00
Chris Robinson
6605aa7dec
Create three bone groups
...
This still won't work as expected. Currently there is only one priority level,
and only one animation state per priority level can be active at a time.
It's close, though.
2013-05-10 20:45:09 -07:00
Chris Robinson
abc676eedd
Allow specifying which bone groups to play an animation on
2013-05-10 20:05:09 -07:00
Chris Robinson
56eede2610
Search more aggressively for an animation velocity
2013-05-10 19:31:33 -07:00
Chris Robinson
5a9c1e1245
Don't explicitly track the last position
2013-05-10 18:58:14 -07:00
Chris Robinson
7c3b014193
Figure out which animations to play based on priority
...
Bone group will also be taken into account later.
2013-05-10 18:37:44 -07:00
Chris Robinson
921f534980
Parameterize the number of bone groups
2013-05-10 16:35:43 -07:00
Chris Robinson
8a9b0eb5f7
Store the AnimSource in the animation state
2013-05-10 15:27:29 -07:00
Glorf
6aaa8d6dc0
Fixed fading problem
2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81
Playing with moons part 1
2013-05-10 18:55:56 +02:00
graffy76
8d0f350446
New file structure separating view classes from model classes. Deleted
...
.ui file.
2013-05-10 10:00:58 -05:00
Chris Robinson
58efce5008
Rename animation layers to animation states
2013-05-10 04:01:30 -07:00
Chris Robinson
ccff364b52
Use a map of active layers instead of an array
...
A bit of an upheaval. Each animation is now a "layer", instead of each layer
having an animation. Incidentally, this is much closer to how Ogre handles
animation states.
In the future, each layer will have a priority, which will be used to determine
which one affects a given bone group (which we currently only have one of).
2013-05-10 03:08:07 -07:00
kpp
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
Chris Robinson
d5490b0f8f
Fix an outdated comment
2013-05-09 23:07:50 -07:00
Chris Robinson
74ed1f73b4
Merge remote-tracking branch 'zini/master' into animations
2013-05-09 13:53:38 -07:00
Marc Zinnschlag
5c99f15ad3
Merge remote-tracking branch 'torben/aiescort'
2013-05-09 14:27:22 +02:00
Glorf
6417fa504e
Fixed constness
2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079
Removed sqrt function call (minor optimization thanks to Chris)
2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56
Removed unnecessary std::cout messages
2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4
AIEscort complete
2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5
AIEscort implemented and working - only touchups are needed.
2013-05-08 17:19:47 -07:00
Glorf
c605f15a15
Another weather cleanup
2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9
Framework - duration and pathing implemented, no waiting for follower yet.
2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8
minor cleanup
2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16
Merge remote-tracking branch 'gus/AIFix'
2013-05-08 20:31:57 +02:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02:00
graffy76
cb9c82324c
UserSettings system
2013-05-07 20:36:34 -05:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
Chris Robinson
8e38dc410f
Allow loading multiple animation sources
...
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
2013-05-07 16:59:32 -07:00
gus
603af21715
little interface improvement
2013-05-07 19:42:21 +01:00
gus
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
2013-05-07 19:35:10 +01:00
scrawl
301efb411e
Fix exit crash
2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
2013-05-07 17:38:24 +02:00
Marc Zinnschlag
0f29ab8cf9
fixed the interface of the adapter class
2013-05-07 14:19:02 +02:00
Marc Zinnschlag
f7f56a1a1f
added a RefIdCollection to Data
2013-05-07 11:23:18 +02:00
Glorf
68f249e8f4
Small weather cleanup
2013-05-07 10:27:37 +02:00
Chris Robinson
e85bc8b2cd
Only load one Nif for Animation objects
...
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170
Don't store camera nodes, we don't need them.
2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd
rename IInterface to Interface
2013-05-06 16:05:56 +02:00
scrawl
b5071ced23
Removed using namespace
2013-05-06 16:04:28 +02:00
scrawl
757a26794a
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a
Remove unused file
2013-05-06 15:30:23 +02:00
scrawl
1315432322
Handle @# links in journal
2013-05-06 15:14:39 +02:00
Marc Zinnschlag
e9f1aac7bd
added data structures for referenceable records
2013-05-06 14:11:55 +02:00
scrawl
d43adbaa7c
Topic link fixes for russian version, thanks to greye for testing
2013-05-06 13:13:14 +02:00
scrawl
166eac2e25
Cleanup
2013-05-06 11:31:34 +02:00
gus
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
2013-05-06 00:46:50 +01:00
scrawl
38c399a698
Fix duplicate sounds
2013-05-05 10:51:17 +02:00
scrawl
062ff189a2
Merge branch 'master' into memory
2013-05-04 23:04:33 +02:00
scrawl
0f2866dc15
Text replace fix
2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79
Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.
2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35
Fast forward to the last page in the journal when opening it
2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48
Added text colors, goodbye, message
2013-05-04 15:15:44 +02:00
scrawl
f07497bbde
Fix lockup
2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156
Fix a bug in getPCNextRank
2013-05-04 12:28:12 +02:00
scrawl
0bb51fd91d
Retrieve the correct case for topics in the journal
2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +02:00
gus
7fe7111c19
Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...
2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7
Merge remote-tracking branch 'glorf/bugfix-5'
2013-05-03 14:55:00 +02:00
scrawl
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75
Bugfix #732 part 2
2013-05-03 13:24:34 +02:00
Marc Zinnschlag
13e7abd7df
added assign function to Record class
2013-05-03 12:52:45 +02:00
Glorf
57f22c77c0
Bugfix #732 part 1
2013-05-03 12:44:27 +02:00
greye
a8b1706678
init pointer value to prevent segfault
2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22
Initialize values
2013-05-02 22:43:21 +04:00
Marc Zinnschlag
1b84aeb5b9
fixed a problem with editing records that do not exist in base
2013-05-02 14:30:39 +02:00
kpp
28ef4d97da
Fixes Bug #734 'Book empty line problem'
...
Hides buttons 'Next' and 'Prev' at the last and at the first page
2013-05-02 07:35:25 +04:00
Chris Robinson
03a6190c5a
Merge remote-tracking branch 'zini/master' into animations
2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38
Implement handling weapon states
2013-05-01 10:19:16 -07:00
Marc Zinnschlag
d5741c7141
Merge remote-tracking branch 'scrawl/master'
2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a067422c397c
2013-05-01 16:56:16 +02:00
Marc Zinnschlag
f8a331f173
fixed a bad cast
2013-05-01 16:49:34 +02:00
scrawl
1acfd849a2
Fix a case folding bug
2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38
Merge remote-tracking branch 'scrawl/insertrecords'
2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
2013-05-01 13:44:23 +02:00
scrawl
40a0969055
Insert records that may not exist in vanilla MW
2013-05-01 12:47:50 +02:00
Glorf
b8630239d7
Code cleanup
2013-05-01 12:25:02 +02:00
Glorf
236ec3409f
Finished acrobatics
2013-05-01 12:21:59 +02:00
scrawl
67422c397c
GetWindSpeed
2013-05-01 11:42:24 +02:00
scrawl
5063d90dda
GetStartingAngle was implemented, but not registered
2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
2013-05-01 11:15:43 +02:00
scrawl
3c68c87923
Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries
2013-05-01 10:28:59 +02:00
scrawl
8bc59f8fe6
Merge branch 'master' into journal
2013-05-01 08:27:42 +02:00
Chris Robinson
d01351431c
Merge remote-tracking branch 'zini/master' into animations
2013-04-30 19:27:55 -07:00
Chris Robinson
4b15da076b
Move getStateInfo into the character controller
2013-04-30 19:26:41 -07:00
Glorf
d30e43784a
Fatigue decrease when jumping, live decrease when falling
2013-04-30 23:39:56 +02:00
Glorf
5a8c1661be
Jump acrobatics working, started falling acrobatics implementation
2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33
Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.
2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
2013-04-30 20:26:59 +02:00
Glorf
add3cd6456
Advance acrobatics on jump
2013-04-30 18:22:59 +02:00
scrawl
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +02:00
Marc Zinnschlag
61e476118d
Merge remote-tracking branch 'kcat/animations'
2013-04-30 10:25:26 +02:00
Marc Zinnschlag
2cb7e1f3d5
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-30 10:24:02 +02:00
scrawl
c0dd383cd0
Fix door collision to work with all possible movement directions
2013-04-30 09:43:32 +02:00
Chris Robinson
05060e57ec
Add a weapon state to the character controller
2013-04-29 13:07:49 -07:00
Glorf
d283f8d85f
Bugfix #748
2013-04-29 21:19:13 +02:00
Chris Robinson
020e3e8a8e
Show the equipped weapon in the inventory screen
...
And use the proper pose based on what's equipped.
2013-04-29 12:08:43 -07:00
Chris Robinson
854de1c6c1
Make sure the weapon is in the proper group
2013-04-29 11:43:37 -07:00
Chris Robinson
15a2eeebb8
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-04-29 10:16:29 -07:00
Chris Robinson
063322b081
Declare some variables closer to where they're used
2013-04-29 10:12:50 -07:00
Chris Robinson
0cf531ba12
Make sure to update parts when the weapon changes
2013-04-29 09:53:36 -07:00
Marc Zinnschlag
93868c8bca
Merge remote-tracking branch 'scrawl/master'
2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6
Enabled collision when new game
2013-04-29 17:56:16 +02:00
Marc Zinnschlag
236751ec45
some IdCollection and IdTable cleanup
2013-04-29 17:52:01 +02:00
Chris Robinson
a15758ac85
Fix preview and vanity cameras
2013-04-29 08:48:45 -07:00
Glorf
6222b3f52a
Bugfix #744
2013-04-29 17:19:20 +02:00
Chris Robinson
d17e1e83d5
Rename MWRender's Player to Camera
2013-04-29 05:50:40 -07:00
Chris Robinson
dbba126344
Use a method to check if the view should be first person
2013-04-29 04:40:28 -07:00
Chris Robinson
bb8277920b
Manage the player's NpcAnimation object in the RenderingManager
...
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
2013-04-29 03:31:46 -07:00
scrawl
6c5ea1ea7a
Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes
2013-04-29 12:05:10 +02:00
scrawl
5ff098b8fb
Fix quick keys being triggered when in UI mode
2013-04-29 11:55:30 +02:00
scrawl
867c7db014
Fix wrong door sounds
2013-04-29 11:00:15 +02:00
scrawl
9648804af5
Fix terrain material leak, this should in theory allow the terrain to free its temporary resources
2013-04-29 10:20:38 +02:00
scrawl
78596cad83
Fix enchantment points value
2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b
Don't store the player base node in MWRender::Player
2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b
Merge remote-tracking branch 'zini/master' into animations
2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034
Merge remote-tracking branch 'scrawl/doors'
2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1
Fix some doors
2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-28 16:52:48 +02:00
Marc Zinnschlag
116ac05677
Merge remote-tracking branch 'scrawl/doors'
2013-04-28 16:44:11 +02:00
Glorf
98baf9fac1
Bugfix #718
2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14
More fixes
2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02
Put door physics in a separate method, some fixes
2013-04-28 15:36:37 +02:00
Marc Zinnschlag
cd61177eed
Merge remote-tracking branch 'gus/renderWeaponShield'
2013-04-28 15:00:47 +02:00
scrawl
9343b4459e
Opening doors
2013-04-28 14:59:15 +02:00
Marc Zinnschlag
a6b7f8e904
Merge remote-tracking branch 'scrawl/fall'
2013-04-28 14:14:10 +02:00
Marc Zinnschlag
93c98e1df4
Merge remote-tracking branch 'scrawl/athletics'
2013-04-28 14:11:12 +02:00
Marc Zinnschlag
738a54337d
removed redundant case smashing
2013-04-28 14:07:53 +02:00
gus
3d9ceede77
little fix (weapons disapeared when tab was pressed)
2013-04-28 12:33:41 +01:00
gus
5388c25e64
Fix or lockpicks.
2013-04-28 11:55:50 +01:00
gus
766d1efa84
Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out.
2013-04-28 11:41:01 +01:00
scrawl
7d61459ccd
Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway.
2013-04-28 11:13:21 +02:00
scrawl
fdf80c1c4f
Fix unused variable
2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4
Fix changeWeather
2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1
Avoid special-casing player rotation
2013-04-28 01:14:58 -07:00
scrawl
07891fa213
Athletics skill increase
2013-04-28 07:53:04 +02:00
Glorf
3669d0a998
Bugfix #742
2013-04-27 20:57:44 +02:00
Marc Zinnschlag
e7bf1d230c
fixed an indexing problem in IdCollection
2013-04-27 16:22:04 +02:00
Chris Robinson
ab52e68c05
Merge remote-tracking branch 'zini/master' into animations
2013-04-27 05:16:15 -07:00
Chris Robinson
137017b325
Don't allow forcing vanity mode
2013-04-27 01:24:36 -07:00
Glorf
ade871ce12
Corrected unused opcodes
2013-04-26 17:31:58 +02:00
Glorf
89f7ef2472
Move, moveworld script instructions
2013-04-26 17:28:19 +02:00
Marc Zinnschlag
32138dbb0f
silenced a warning
2013-04-26 13:33:47 +02:00
Chris Robinson
2822f431c4
Merge remote-tracking branch 'zini/master' into animations
2013-04-26 01:38:51 -07:00
Chris Robinson
b666f1d551
Work around a problem with MWRender::Player::renderPlayer
...
NpcAnimation::setViewMode makes a call to the character controller, in the
mechanics manager, to forcefully update the character's state. This in turn
makes a call to the player's old NpcAniamtion object that was just deleted.
The mechanics manager will eventually remove and reinsert the player, so the
old character controller will be removed and a new one will get the right
Animation object again, but not in time for the setViewMode call.
There's many factors that all contribute to this run-around, which needs
discussion on how to best fix.
2013-04-26 01:30:36 -07:00
Chris Robinson
55ee4e65a9
Clean up the slotlist struct
2013-04-25 23:42:20 -07:00
scrawl
7821610ec6
Make OnDeath work with explicit reference
2013-04-26 02:08:53 +02:00
scrawl
a373f53988
Added SetAtStart
2013-04-26 02:02:51 +02:00
Marc Zinnschlag
4e45222a63
Merge remote-tracking branch 'glorf/rotate-update1'
2013-04-25 20:57:24 +02:00
Glorf
240217ae42
Fixed rotations more than 360 degrees
2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c
Merge remote-tracking branch 'glorf/rotate-update1'
2013-04-25 20:22:40 +02:00
Marc Zinnschlag
2c1796cc74
Merge remote-tracking branch 'kcat/animations' into ref
2013-04-25 20:12:14 +02:00
Glorf
7cd4dd0c91
Improved local rotations
2013-04-25 19:14:10 +02:00
Chris Robinson
274f3c7b77
Force character state to update after switching view modes
2013-04-25 07:08:11 -07:00
Chris Robinson
e4eb4b7e30
Keep track of the character looping state
2013-04-25 06:29:17 -07:00
Chris Robinson
9da2c9153e
Don't store the animation group string in the character controller
2013-04-25 06:12:37 -07:00
Chris Robinson
849335d8cc
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-25 05:35:33 -07:00
Chris Robinson
2769adcee0
Implement switching to and from first-person animations
...
Note that the current animation gets interrupted, so switching to first person
may break movement until you stop and try to move again. This can be fixed by
alerting the character controller in the mechanics manager to force a state
update when switching POV.
2013-04-25 05:23:05 -07:00
Chris Robinson
9a2a32f2a5
Add a method to clear all Animation sources except the first
...
The first needs to remain, since that's where any mSkelBase entity comes from,
and where any retrieved nodes are from.
2013-04-25 05:02:11 -07:00
Chris Robinson
9be20b90f1
Fix potential infinite loop when layer 0 is empty
2013-04-25 03:35:40 -07:00
Marc Zinnschlag
08e2254628
Merge remote-tracking branch 'pvdk/spacefix'
2013-04-25 12:15:35 +02:00
pvdk
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
2013-04-25 11:04:12 +02:00
Chris Robinson
76c8e81908
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-25 01:35:21 -07:00
Marc Zinnschlag
247a76766d
fixed a typo in a doxygen comment
2013-04-25 10:27:43 +02:00
Marc Zinnschlag
71fc8f5830
Merge remote-tracking branch 'scrawl/item' into next
2013-04-25 10:21:14 +02:00
Chris Robinson
86fda1bff6
Only set mSkelBase from the first objectlist
2013-04-25 00:52:26 -07:00
Chris Robinson
7eac37be23
Make sure the old layer is cleared before starting the next
2013-04-25 00:18:02 -07:00
Chris Robinson
09fc50948b
Add methods to disable and get info for a layer
2013-04-25 00:08:16 -07:00
Chris Robinson
24f1eba902
Keep track of whether an animation supplies movement
...
Also handle it when it doesn't.
2013-04-24 22:45:43 -07:00
Nathan Jeffords
7db6447a00
dropped the I infront of the journal view model interfaces
2013-04-24 21:53:25 -07:00
Nathan Jeffords
36a6806faf
drop the leading 'I' from the book page control interfaces
2013-04-24 21:44:29 -07:00
Nathan Jeffords
4c22afc29b
made a pass at conforming to established naming convention
2013-04-24 20:22:57 -07:00
Nathan Jeffords
c7ede9b523
port code to C++03
2013-04-24 20:22:57 -07:00
Nathan Jeffords
718af692c9
reworked journal to match bethesda's implemenation
2013-04-24 20:20:01 -07:00
Nathan Jeffords
f02a53b121
Created a helper class to format books for display from the journal
...
view-model data.
2013-04-24 20:20:01 -07:00
Nathan Jeffords
50d688c2fc
Created a view-model to present journal data to the UI in the form it
...
intends to display it.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
55ca037411
Created a MyGUI widget to present a page of formatted text.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
8dad04eef1
hid JournalWindow behind IJournalWindow interface, and put its entire
...
implementation, class definition and all, into journalwindow.cpp
2013-04-24 20:20:00 -07:00
scrawl
9e3917881d
Don't fail on nonexistent items in a levelled list
2013-04-25 04:44:30 +02:00
Chris Robinson
0817d59f23
Allow specifying where to start in an animation
2013-04-24 19:09:36 -07:00
scrawl
933f894148
Added Blind and Night Eye effects
2013-04-25 02:31:51 +02:00
scrawl
baa7a9160c
Rank condition should always fail if NPC is not in a faction
2013-04-25 02:31:39 +02:00
scrawl
a7092ef2d7
Fix activation not working sometimes
...
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
2013-04-25 02:31:39 +02:00
Nathan Jeffords
2dc01fe56b
fixed the type of iterator uses in MWWorld::Store
...
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
2013-04-25 02:31:39 +02:00
scrawl
51580ead4f
Fix consecutive dialogue choices
2013-04-25 02:31:39 +02:00
Marc Zinnschlag
87ce2110dc
hotfix for CharacterPreview destructor
2013-04-25 02:31:38 +02:00
scrawl
cd57e3f896
Auto calculate attributes if there are not specified in the NPC record
2013-04-25 02:31:38 +02:00
Glorf
53fb17da10
Rotation system fixes
2013-04-24 21:42:04 +02:00
Chris Robinson
333354fe62
Remove the character controller from the Animation class
2013-04-24 07:10:41 -07:00
Chris Robinson
b80891099e
Don't use the character controller to handle text keys
...
The Animation class has the Ptr and can call to whatever subsystem is needed.
2013-04-24 06:48:34 -07:00
Chris Robinson
e8cabc9434
Pass the loop count from loopgroup to the play method
...
Instead of queueing each iteration separately.
2013-04-24 06:32:11 -07:00
Chris Robinson
b482d5be09
Add a method to check if a given layer is playing
2013-04-24 05:23:45 -07:00
Chris Robinson
c58dfbe921
Specify the loop count to Animation::play
2013-04-24 04:56:39 -07:00
Chris Robinson
7241267d5c
Make an AnimationValue for each animation layer
2013-04-24 04:41:52 -07:00
Chris Robinson
102b3bdef9
Update position by reference
2013-04-24 01:57:51 -07:00
Chris Robinson
9e05ee53da
Avoid looking for the controller if there is no NonAccum node
...
Also, make sure there is a controller before updating the position.
2013-04-24 01:18:08 -07:00
Chris Robinson
544011e096
Fix 'start' text key fallback lookup
2013-04-24 00:40:58 -07:00
Chris Robinson
7e2995bc2f
Fix setting up active controllers
2013-04-23 19:43:26 -07:00
Chris Robinson
6a67a5e650
Merge remote-tracking branch 'zini/next' into nifogre
2013-04-23 16:57:48 -07:00
Chris Robinson
8c9e2e0ee9
Improve handling of reaching the stop animation text key
2013-04-23 05:34:08 -07:00
Chris Robinson
c4806f01f8
Use a separate list of controllers to update
...
This should make it easier to figure out what controllers need to be updated
for various animation sources and layers.
2013-04-23 04:08:09 -07:00
greye
cfccf0981d
update IndexedStore::setUp() for multiple datafile support
2013-04-23 14:36:38 +04:00
Chris Robinson
e4c5aac966
Keep track of the animation layers a given object list is animating on
...
This only tracks layers they explicitly animate on. They may animate on other
layers as well, if nothing else is animating on them.
2013-04-23 02:48:11 -07:00
Marc Zinnschlag
a17d17c191
added additional type argument to IdCollection::load
2013-04-23 11:22:07 +02:00
Marc Zinnschlag
808718d967
added referenceable record types to UniversalId
2013-04-23 11:21:21 +02:00
Marc Zinnschlag
afe7b3c64c
added additional type argument to IdCollection::appendBlankRecord
2013-04-23 10:56:55 +02:00
Chris Robinson
e378176937
Don't update controllers that have already been updated
2013-04-23 00:15:31 -07:00
Chris Robinson
8782ae6976
Separate some Animation fields into a separate AnimLayer class
2013-04-22 23:52:28 -07:00
Chris Robinson
c3ce49798a
Fix animation velocity calculation
2013-04-22 21:34:39 -07:00
Chris Robinson
7279e015e9
Search the textkeys to check if an animation group exists
2013-04-22 20:59:55 -07:00
Chris Robinson
a2fc43c7df
Use reset to check that the animation exists and has the right markers
2013-04-22 20:41:54 -07:00
Chris Robinson
507d72ede5
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-22 18:44:28 -07:00
Chris Robinson
bb64efc18e
Improve looping behavior
2013-04-22 05:08:52 -07:00
Chris Robinson
cc70c6263b
Use the NodeTargetValue for the NonAccum root
2013-04-22 04:10:46 -07:00
Chris Robinson
9485a4aa6d
Look through the whole animation stack to find the "velocity"
2013-04-22 01:40:41 -07:00
Marc Zinnschlag
29cb076113
Merge remote-tracking branch 'scrawl/rank'
2013-04-22 09:52:28 +02:00
Marc Zinnschlag
3fa35af796
Merge remote-tracking branch 'scrawl/master'
2013-04-22 09:52:24 +02:00
Chris Robinson
a7776e124c
Only set mNonAccumRoot from mSkelBase
2013-04-22 00:22:31 -07:00
Chris Robinson
a3511c62cf
Don't store textkeys in user object bindings
...
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.
Plus, proper serialization can help for future optimizations.
2013-04-22 00:01:30 -07:00
scrawl
56b871e362
Rank condition should always fail if NPC is not in a faction
2013-04-22 07:57:53 +02:00
Chris Robinson
2345b5e8b3
Avoid storing text keys for each animation
2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6
Don't clip out the group name from the textkeys
2013-04-21 22:13:49 -07:00
Chris Robinson
6c85d6763a
Pass "loop stop" to the character controller
2013-04-21 18:38:25 -07:00
Chris Robinson
d7c9df16f8
Store the current animation group
2013-04-21 18:32:34 -07:00
scrawl
8bf1149cec
Fix activation not working sometimes
...
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
2013-04-21 21:24:48 +02:00
Nathan Jeffords
19325f9d40
fixed the type of iterator uses in MWWorld::Store
...
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
2013-04-21 11:41:09 -07:00
Chris Robinson
835ff8eb1e
Avoid creating an AnimationValue per ObjectList
2013-04-20 17:13:27 -07:00
Chris Robinson
4122b0b55f
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-20 00:25:00 -07:00
scrawl
a8e3acd6c4
Fix consecutive dialogue choices
2013-04-19 17:57:22 +02:00
Marc Zinnschlag
f13b0c884f
hotfix for CharacterPreview destructor
2013-04-19 14:41:26 +02:00
Chris Robinson
50bb92beb3
Use a method to set the visibility flags and render queue.
2013-04-19 02:01:50 -07:00
Marc Zinnschlag
9c1e280614
Merge remote-tracking branch 'scrawl/master'
2013-04-19 00:23:24 +02:00
Chris Robinson
434f3ac8c8
Merge remote-tracking branch 'zini/next' into nifogre
2013-04-18 15:14:28 -07:00
scrawl
ef9afeb53e
Auto calculate attributes if there are not specified in the NPC record
2013-04-18 23:51:43 +02:00
Marc Zinnschlag
1b764e5d3c
Merge remote-tracking branch 'gus/AI'
2013-04-18 22:17:49 +02:00
Glorf
f9deb593d1
Bugfix #578
2013-04-18 21:37:58 +02:00
gus
c753eb4c28
another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat
2013-04-18 18:35:01 +01:00
scrawl
3c5e4ceefd
Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)
2013-04-18 16:46:32 +02:00
Chris Robinson
6d59325bff
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-17 23:21:17 -07:00
Britt Mathis
1dff1fabdb
Fixed race.cpp
2013-04-17 19:38:13 -04:00
Britt Mathis
7eee86ab66
No more using namespace
2013-04-17 18:56:48 -04:00
scrawl
c519fc360d
Move away from fixed record names for body parts
2013-04-18 00:19:34 +02:00
scrawl
0341a9e778
Fix a gcc 4.8 warning
2013-04-17 20:57:22 +02:00
scrawl
547f77031d
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again
2013-04-17 17:06:30 +02:00
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
2013-04-17 12:04:05 +02:00
Marc Zinnschlag
5bbab1abd9
Merge remote-tracking branch 'galdor557/master'
2013-04-17 09:52:58 +02:00
Britt Mathis
60fadaeaf0
Cleaned up includes in implementation files
2013-04-16 20:16:22 -04:00
Glorf
e3a9f73eb6
Improved getangle script behaviour
2013-04-16 21:40:34 +02:00
Glorf
1fd59d0ce0
Removed useless include
2013-04-16 21:21:54 +02:00
Glorf
1e92ffc314
Added rotation layer
2013-04-16 21:17:19 +02:00
Chris Robinson
cac793758b
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-16 11:52:19 -07:00
Marc Zinnschlag
518cb0e3b7
added another abstraction layer to ID access in IdCollection
2013-04-16 12:12:04 +02:00
Chris Robinson
4ce98e9bd6
Store iterators for start and stop keys
2013-04-15 20:37:10 -07:00
Chris Robinson
1b1f9f7921
Allow multiple ObjectLists to be created for Animations.
...
addObjectList may not currently be called outside of the related constructor.
2013-04-15 18:55:28 -07:00
Glorf
e0357c7b7c
Merge rotate
2013-04-15 20:29:38 +02:00
Glorf
763308868d
Fixed rotation speed
2013-04-15 17:45:18 +02:00
Glorf
972481f63f
Working rotate, rotateworld
2013-04-15 16:45:53 +02:00
scrawl
7fcaffefb0
Fixed travel window to use the rotation part of ESM::Position
2013-04-15 03:13:25 +02:00
Chris Robinson
69084139aa
Use an array of objectlists, instead of one base objectlist and an array of 'animation sources'
2013-04-14 17:58:21 -07:00
scrawl
2693b78536
Add initial player inventory when new game is started
2013-04-15 02:56:23 +02:00
Chris Robinson
f9dee25fd1
Store the base skeleton entity in MWRender::Animation
2013-04-14 16:56:35 -07:00
Glorf
4e0233cf06
Base local rotations implementation
2013-04-14 21:42:37 +02:00
Marc Zinnschlag
9bc07e6221
Merge remote-tracking branch 'scrawl/diseasefix'
2013-04-14 19:45:55 +02:00
Marc Zinnschlag
615ce0b199
Merge remote-tracking branch 'scrawl/master'
2013-04-14 19:45:33 +02:00
Marc Zinnschlag
b2b953d2a8
added region column to cell table
2013-04-14 19:34:55 +02:00
scrawl
a57fbbb168
Fix wrong detection of diseases
2013-04-14 17:51:17 +02:00
scrawl
48f46e505c
Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)
2013-04-14 17:37:39 +02:00
Marc Zinnschlag
71148121a2
added flag columns to cell table
2013-04-14 17:10:37 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Marc Zinnschlag
62aa563466
Merge remote-tracking branch 'scrawl/scale'
2013-04-13 10:32:09 +02:00
Marc Zinnschlag
41744818bb
Merge remote-tracking branch 'scrawl/master'
2013-04-13 10:23:35 +02:00
scrawl
d50150ad71
Scale adjustment factor should not be written back to cellref scale
2013-04-13 00:13:56 +02:00
scrawl
2eb9395661
Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups.
2013-04-13 00:05:31 +02:00
scrawl
86bac7aa92
Fix wrong BSA group name typo
2013-04-12 23:40:30 +02:00
gus
905cff2a94
anonymous namespace
2013-04-11 18:02:12 +01:00
gus
0a187e56aa
bugfix
2013-04-11 17:58:11 +01:00
gus
6934b20abd
actors are now updates every frame. This should not be the case, but this is a quickfix for AI.
2013-04-11 17:57:58 +01:00
gus
b5b0e7a656
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
2013-04-11 16:15:32 +01:00
Marc Zinnschlag
5bfa691f14
Merge branch 'script'
2013-04-11 10:50:46 +02:00
Marc Zinnschlag
f17cebde0a
syntax colouring for comments
2013-04-11 10:50:35 +02:00
Marc Zinnschlag
31289237ce
Merge remote-tracking branch 'kcat/nifogre'
2013-04-11 10:16:48 +02:00
Marc Zinnschlag
3f846a50d9
Merge remote-tracking branch 'galdor557/master'
...
Conflicts:
apps/openmw/mwgui/travelwindow.cpp
2013-04-11 10:15:42 +02:00
Chris Robinson
82091e3d07
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-10 23:20:28 -07:00
Britt Mathis
6128b9276f
Removed non-essential includes from all MWGui header files.
2013-04-11 00:21:56 -04:00
Chris Robinson
caff28e20a
Move NIFSkeletonLoader to a separate file
2013-04-10 19:58:17 -07:00
Glorf
106ef4c936
Rotate script
2013-04-10 22:53:03 +02:00
Marc Zinnschlag
74145410f2
basic syntax highlighting in script subview
2013-04-10 22:49:22 +02:00
Marc Zinnschlag
3a87b12baf
delete script subview on script deletion
2013-04-10 21:31:14 +02:00
Britt Mathis
f7383905b7
Finally eliminated calls to MWBase::WindowManager in constructors
2013-04-10 14:46:21 -04:00
Marc Zinnschlag
d61ec1063e
added script editor
2013-04-10 20:14:10 +02:00
Britt Mathis
d768f6b57e
Deleted *_* files in MwGui, builds.
2013-04-10 13:05:15 -04:00
Marc Zinnschlag
beb1858a57
Merge remote-tracking branch 'glorf/bugfix'
2013-04-10 17:39:19 +02:00
Glorf
ad49d1ecab
Sixth minor fix
2013-04-10 15:24:20 +02:00
Britt Mathis
ce9bc6d9ba
MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions
2013-04-10 00:32:05 -04:00
Chris Robinson
50d8353a8d
Fix a hack so arms dont show in first-person
2013-04-09 16:51:04 -07:00
Chris Robinson
9d29921913
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-09 15:12:19 -07:00
Chris Robinson
a700c50e84
Add a first-person view mode to NpcAnimation
...
And use it instead of showing/hiding the player.
2013-04-09 15:10:14 -07:00
Marc Zinnschlag
a2ab43be7e
Merge remote-tracking branch 'scrawl/master'
2013-04-09 21:22:38 +02:00
scrawl
0e7d555cdf
Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
2013-04-09 20:31:00 +02:00
Tom Mason
6ca2b1af74
fix for turning animations playing when in vanity mode
2013-04-09 19:24:41 +01:00
Glorf
bd93e63150
Fifth minor fix
2013-04-09 19:46:27 +02:00
Glorf
248fff6eb7
Fourth minor fix
2013-04-09 19:41:03 +02:00
Glorf
44ef02eb99
Third minor fix
2013-04-09 19:04:59 +02:00
Chris Robinson
029d565727
Avoid calling setVisible for character previews
2013-04-09 09:23:07 -07:00
Chris Robinson
9f9d978b0f
Use an enum to specify the NPC's view mode (normal, head only)
2013-04-09 09:07:05 -07:00
Glorf
46925e93a6
Second minor fix
2013-04-09 16:14:08 +02:00
Marc Zinnschlag
cd33f40c8f
re-enabled opening of record subviews via double click in table
2013-04-09 14:28:31 +02:00
Marc Zinnschlag
be4a01bdb4
added missing recrod type columns
2013-04-09 14:27:32 +02:00
Marc Zinnschlag
40bb772e34
added verifier for spell record
2013-04-09 12:44:49 +02:00
Marc Zinnschlag
ae0a7d5bcd
added cost and type columns to spell table
2013-04-09 11:53:47 +02:00
Marc Zinnschlag
ec6dff38b1
added basic spell table
2013-04-09 11:40:36 +02:00
Glorf
623c2c8201
Minor fix
2013-04-09 07:45:07 +02:00
scrawl
01ae91f640
Fix several NPCs spawning in the ground
2013-04-09 01:24:17 +02:00
Glorf
7c22e123f4
Bugfix #691 changes
2013-04-08 22:10:55 +02:00
Chris Robinson
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
2013-04-08 11:46:57 -07:00
Marc Zinnschlag
ef09b1cac8
Merge remote-tracking branch 'glorf/bugfix-1'
2013-04-08 20:23:18 +02:00
Marc Zinnschlag
85e5bd212b
Merge remote-tracking branch 'scrawl/master'
2013-04-08 20:05:52 +02:00
Glorf
2f52df22ce
Bugfix #553
2013-04-08 19:00:38 +02:00
Glorf
194ca2584d
Small azura's star fix
2013-04-08 17:53:41 +02:00
Glorf
50932a7a6b
Finished bugfix #691
2013-04-08 17:50:03 +02:00
scrawl
d0bcf83091
Adjust player position to ground after using travel services
2013-04-08 16:30:18 +02:00
scrawl
a7de870a44
Fix mercenary not updating its profit when item was dragged onto the player avatar
2013-04-08 16:21:18 +02:00
Chris Robinson
08d43fe217
Make the getHeadNode method more general
2013-04-08 05:48:52 -07:00
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-07 17:24:47 -07:00
Chris Robinson
7baca30a1d
Only get the non-accum root's keyframe when updating positions
...
The actual animation pose is now handled by the controllers, based on the
current animation time.
2013-04-07 16:21:45 -07:00
Chris Robinson
261ea1fe5e
Implement a KeyframeController
2013-04-07 14:56:23 -07:00
Marc Zinnschlag
43a5013690
added verifier for birthsign record
2013-04-07 23:25:35 +02:00
Chris Robinson
f69a8259e1
Update animation source controller targets
2013-04-07 13:51:04 -07:00
scrawl
9e08497f02
Initial container content should inherit the owner of its container
2013-04-07 22:07:04 +02:00
Chris Robinson
7494f90301
Remove an unneeded function
2013-04-07 13:02:46 -07:00
scrawl
480467b6eb
Reset the 'owner' field for items that were legitimately bought from an NPC.
2013-04-07 21:53:11 +02:00
Chris Robinson
2362e920f3
Use an unconnected object list for animation sources
...
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065
Don't buy/sell keys which are set to open a lock
2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6
Implemented levelled items
2013-04-07 21:01:02 +02:00
Marc Zinnschlag
baf8eaecb8
added texture column to birthsign table
2013-04-07 20:46:04 +02:00
Marc Zinnschlag
60cc95305d
added basic birthsign table
2013-04-07 20:26:39 +02:00
Chris Robinson
80a1abd48a
Clear the old text keys when setting new animation sources
2013-04-07 11:09:55 -07:00
Marc Zinnschlag
a0d34c5e8d
Merge remote-tracking branch 'wheybags/autorun2'
2013-04-07 19:51:02 +02:00
Marc Zinnschlag
a91e3c0b01
Merge remote-tracking branch 'scrawl/fatigue_bug'
2013-04-07 19:50:16 +02:00
Marc Zinnschlag
5dc1a00544
Merge remote-tracking branch 'scrawl/master'
2013-04-07 19:43:39 +02:00
Marc Zinnschlag
593646436e
added verifier for region record
2013-04-07 19:39:13 +02:00
Marc Zinnschlag
c9424f577f
added sleeplist column to region table
2013-04-07 19:29:15 +02:00
Tom Mason
822866b5ae
fixed autorun
2013-04-07 18:04:30 +01:00
Marc Zinnschlag
f49a2a97c5
added map colour column to region table
2013-04-07 16:56:21 +02:00
Marc Zinnschlag
e25f5c6dfe
added basic region table
2013-04-07 16:32:06 +02:00
scrawl
8bbfba3f43
Fix fatigue not being set to its maximum value when player is rebuilt
2013-04-07 16:18:40 +02:00
scrawl
755a80a522
Fix camera shaking when near the pitch limit.
2013-04-07 15:52:43 +02:00
Marc Zinnschlag
ff1d908af4
added script table
2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891
Handle NiCamera nodes
2013-04-07 02:28:15 -07:00
Chris Robinson
878b4c15c5
Set visibility flags and the render queue group for particles
2013-04-07 02:08:33 -07:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Marc Zinnschlag
e2c6458adb
added verifier for sound records
2013-04-06 21:48:52 +02:00
Marc Zinnschlag
50b58b2ead
added sound file column to sound table
2013-04-06 21:43:05 +02:00
Marc Zinnschlag
dd5940b395
added sound parameter columns to sonud table
2013-04-06 21:40:03 +02:00
Marc Zinnschlag
8bf569d58a
added basic sound table
2013-04-06 21:21:10 +02:00
Chris Robinson
41e410347e
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 10:35:01 -07:00
Marc Zinnschlag
053f744566
Merge remote-tracking branch 'scrawl/master'
2013-04-06 19:31:46 +02:00
scrawl
1f3df4df0f
Perform a sanity check on count arguments
2013-04-06 19:25:29 +02:00
Marc Zinnschlag
0f34c79d0a
Merge branch 'race'
2013-04-06 19:21:38 +02:00
Marc Zinnschlag
98e7b3fd93
check for at least one playable race
2013-04-06 19:20:59 +02:00
Marc Zinnschlag
9bc3945f40
multiple fixes to UniversalId constructor
2013-04-06 19:20:46 +02:00
Chris Robinson
59f1d4b047
Add support for NiUVController on meshes
2013-04-06 09:44:10 -07:00
Marc Zinnschlag
0fb583e065
added verifier for race record
2013-04-06 17:35:36 +02:00
Chris Robinson
1d934e3112
Reduce some stdout spam
2013-04-06 04:46:28 -07:00
Chris Robinson
0631b28646
Prepare for supporting controller objects
2013-04-05 10:13:54 -07:00
Chris Robinson
af2a38db38
Fix looping anims that dont have "loop start"
2013-04-05 08:27:26 -07:00
Glorf
48d9885554
Started bugfix #691
2013-04-05 15:42:05 +02:00
Marc Zinnschlag
35fe828108
added race table weight/height columns
2013-04-05 13:46:48 +02:00
Marc Zinnschlag
076831c9cc
added flag columns to race table
2013-04-05 12:48:05 +02:00
Chris Robinson
4d14fe0d95
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-04 22:06:27 -07:00
Marc Zinnschlag
034ebf8ffd
Merge remote-tracking branch 'scrawl/master'
2013-04-04 19:57:55 +02:00
scrawl
2e7d5377f4
Fix crash when moving npcs to an inactive cell
2013-04-04 16:51:22 +02:00
scrawl
48a88f1917
Fix startRandomTitle
2013-04-04 15:10:27 +02:00
Marc Zinnschlag
73da794d77
added basic race table
2013-04-04 14:34:39 +02:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
Marc Zinnschlag
18e046e628
cleaned up race record struct
2013-04-04 13:50:36 +02:00
Marc Zinnschlag
62d70f17c8
removed another redundant include
2013-04-04 12:42:38 +02:00
Marc Zinnschlag
111ebf84bb
replaced an include with a forward declaration
2013-04-04 12:27:57 +02:00
Marc Zinnschlag
5244362fba
some cleanup
2013-04-04 12:23:06 +02:00
Marc Zinnschlag
8c7d578ddc
moved the CellRef struct to its own header
2013-04-04 12:13:15 +02:00
Marc Zinnschlag
e8c32d0c3d
MWWorld::Player cleanup
2013-04-04 12:05:03 +02:00
Marc Zinnschlag
7136ac0079
added missing attribute columns to faction table
2013-04-04 10:58:53 +02:00
Marc Zinnschlag
b5eaa464ad
added faction record verifier
2013-04-04 10:39:43 +02:00
Marc Zinnschlag
06533b8d71
additional check for using the same attribute twice in a class
2013-04-04 10:31:10 +02:00
Marc Zinnschlag
fea44c05d4
added class record verifier
2013-04-04 10:10:58 +02:00
scrawl
ebaf80d539
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
2013-04-03 23:55:57 +02:00
scrawl
43cdbd033d
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
2013-04-03 21:17:31 +02:00
scrawl
8ca88d1a70
Fix merchant repair menu allowing repair of repair items
2013-04-03 21:17:31 +02:00
Marc Zinnschlag
32d3fe0e35
Merge remote-tracking branch 'glorf/enchanting'
2013-04-03 19:39:18 +02:00
Glorf
08e9bb0236
Another small enchanting fix
2013-04-03 18:25:40 +02:00
Glorf
2179619721
Small enchanting fix
2013-04-03 18:06:11 +02:00
Glorf
ae3e4ecf8b
Finished enchanting
2013-04-03 18:02:30 +02:00
scrawl
f0d49fdbd0
Create separate groups for each data dir / BSA file.
2013-04-03 12:28:57 +02:00
scrawl
aac2ba1d5f
Fix loading screen looking for wallpapers in a fixed group.
2013-04-03 12:24:13 +02:00
scrawl
05a5cb3ae4
Improved responsiveness of the inventory window when resizing.
2013-04-03 00:27:29 +02:00
scrawl
df0ee82a3c
Loose files should have priority over BSA resources. This makes texture replacers work.
2013-04-02 23:45:32 +02:00
Glorf
7b7d3353a6
Exception for enchanting with Azura Star
2013-04-02 22:23:38 +02:00
Marc Zinnschlag
ffb133c862
Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'
2013-04-02 22:18:32 +02:00
Lukasz Gromanowski
98727d2fb6
Workaround for launcher compilation problems due to bug in Qt MOC compiler.
...
For details please see:
https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 21:32:23 +02:00
Glorf
369cf0b4ca
Enchanting price mechanics
2013-04-02 20:46:48 +02:00
Marc Zinnschlag
676a92e2e0
moved Verify function from World menu to File menu
2013-04-02 15:47:25 +02:00
Marc Zinnschlag
9d009af2a1
simplified code for sub view factory creation
2013-04-02 15:33:28 +02:00
Marc Zinnschlag
0856e3ebc2
Merge remote-tracking branch 'glorf/bugfix'
2013-04-02 14:35:14 +02:00
Marc Zinnschlag
df658d29f0
Merge branch 'faction'
2013-04-02 14:21:51 +02:00
Marc Zinnschlag
82498f6cff
added hidden flag column to faction table
2013-04-02 14:20:51 +02:00
Marc Zinnschlag
384c88182d
dealing with unset attribute fields
2013-04-02 14:15:22 +02:00
Glorf
900c2cfa81
Minor bugfix #646 change
2013-04-02 14:08:59 +02:00
Marc Zinnschlag
ec6bdbeb40
added skill columns to faction table
2013-04-02 14:04:13 +02:00
Marc Zinnschlag
f9f520df34
adjusted faction record to increase consistency with other records
2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d
added faction table
2013-04-02 12:00:45 +02:00
Glorf
d25c838e1d
Bugfix #646
2013-04-02 11:42:29 +02:00
gus
6a33170ca2
More bugfix, but I don't like this one.
2013-04-01 17:44:06 +00:00
gus
20af7d89a2
post master-merge fixes. Looks a little odd.
2013-04-01 17:30:40 +00:00
gus
2be9405c96
the sgn function is no longer in the global namespace
2013-04-01 15:44:08 +00:00
Marc Zinnschlag
751c679255
Merge remote-tracking branch 'glorf/enchanting'
2013-04-01 17:35:04 +02:00
Marc Zinnschlag
9dbd024076
another minor fix
2013-04-01 17:30:54 +02:00
Glorf
1bff6ed872
Enchaning values import, fixed constness
2013-04-01 17:12:47 +02:00
gus
1eb3d3e10e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-04-01 14:10:19 +00:00
gus
47cc945ef4
more refactoring
2013-04-01 12:38:13 +00:00
Marc Zinnschlag
26db983599
minor fix
2013-04-01 10:46:08 +02:00
Chris Robinson
f976eb5bd8
Improve mouselook scaling
2013-03-31 17:32:39 -07:00
Chris Robinson
d0703efd69
Another place to check the class' isActor method
2013-03-31 17:32:39 -07:00
Chris Robinson
04aeb3dd07
Rename Mechanics' Activators to Objects
2013-03-31 17:32:38 -07:00
Chris Robinson
10d04c928c
Use the object's class to check if it's an actor
2013-03-31 17:32:38 -07:00
Glorf
d29a42dcbe
Fixed enchanting mechanics
2013-03-31 23:18:23 +02:00
gus
63424ade56
refactoring
2013-03-31 17:30:03 +00:00
Lukasz Gromanowski
acae815cd2
Added workaround for OpenCS compilation problems due to bug in Qt MOC compiler.
...
For details please see:
https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-03-31 18:00:46 +02:00
scrawl
8fd961bbac
Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.
2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
2013-03-31 14:50:03 +02:00
scrawl
bc6e1fd981
Add missing files
2013-03-31 14:36:03 +02:00
scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
Chris Robinson
4836ba16f7
Implement turning states
2013-03-31 03:50:20 -07:00
Chris Robinson
7611caa6eb
Merge remote-tracking branch 'zini/master' into rotation
2013-03-31 03:00:11 -07:00
Chris Robinson
13c098266c
Pass player rotation through the movement settings
2013-03-31 02:57:22 -07:00
scrawl
69099c11a2
Merge branch 'enchanting' into companion
2013-03-31 11:52:55 +02:00
Chris Robinson
18e8ff7198
Actually rotate the object when updating physics
2013-03-31 02:24:44 -07:00
Chris Robinson
b6f2b39a2f
Clear the movement and rotation vector when getting them
2013-03-31 01:56:38 -07:00
Marc Zinnschlag
607435aaf2
Merge branch 'class'
2013-03-31 10:49:56 +02:00
lazydev
38d19d33d8
fix for #634
2013-03-31 10:45:42 +02:00
Chris Robinson
7b02ec411b
Apply the rotation when updating the character controller
2013-03-31 01:29:24 -07:00
Marc Zinnschlag
e71181810f
Merge remote-tracking branch 'scrawl/master'
2013-03-31 10:18:13 +02:00
scrawl
13be61812a
Made the "Unknown class key" exception slightly more helpful
2013-03-31 10:16:02 +02:00
Marc Zinnschlag
48d6fe8014
Merge remote-tracking branch 'kcat/rotation'
2013-03-31 10:14:57 +02:00
Chris Robinson
466c0086b8
Use a full Movement to hand off to the world physics update
2013-03-31 00:13:56 -07:00
Chris Robinson
0ce188b7cc
Store the position and rotation in MWMechanics::Movement
2013-03-30 19:00:46 -07:00
Chris Robinson
af65ecd841
Pass the movement vector in as a parameter to CharacterController::update
2013-03-30 18:37:40 -07:00
Chris Robinson
63af72c315
Avoid converting to and from quaternions
2013-03-30 17:31:16 -07:00
Chris Robinson
c8606d2f63
Implement IsWerewolf script function
2013-03-30 13:22:33 -07:00
scrawl
e27e53f607
Fix not playable body parts appearing in the race selection menu.
2013-03-30 20:04:05 +01:00
lazydev
ee5d0277e8
fix for #634
2013-03-30 22:18:34 +04:00
Glorf
7dbc779c3a
Self-enchanting mechanics
2013-03-30 19:08:42 +01:00
