Commit Graph

7765 Commits (8419002393d89bd20222773a1872efb858f7ea32)

Author SHA1 Message Date
scrawl 865486604f Make trade disposition changes temporary again, as in vanilla 11 years ago
scrawl a1bdf20958 Make trade balance label editable 11 years ago
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
11 years ago
scrawl 16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object
Fixes #1360
11 years ago
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.
11 years ago
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!
11 years ago
scrawl 8761aa5795 Loop main menu video when it's finished playing 11 years ago
scrawl ac77b07e29 Small fix for menu background 11 years ago
Marc Zinnschlag f5e587f566 Merge remote-tracking branch 'puppykevin/master' 11 years ago
Marc Zinnschlag be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
11 years ago
Marc Zinnschlag 4778c27548 silenced two warnings 11 years ago
Marc Zinnschlag be88168e91 Merge remote-tracking branch 'scrawl/master' 11 years ago
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.
11 years ago
Marc Zinnschlag 2f56b11530 Merge remote-tracking branch 'digmaster/master' 11 years ago
scrawl 6a882e1e8d Don't show hidden factions in StatsWindow (e.g. Nerevarine) 11 years ago
Marc Zinnschlag ae50632774 implemented cell and reference saving int OpenCS 11 years ago
scrawl 3b3b53d665 Support animated main menus (menu_background.bik)
Closes #1362
11 years ago
scrawl a6788cfb0e Support lights that do not have a model (Fixes #1361) 11 years ago
scrawl 95b3026c7e Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game 11 years ago
Digmaster 03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 11 years ago
Digmaster a5cfa8a049 Removes add behavior when pressing escape while waiting. 11 years ago
scrawl c6a4506ac2 Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2) 11 years ago
Kevin Poitra 8516b837ff Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."
This reverts commit b897080156.
11 years ago
scrawl 41a04b9c65 Slightly adjust menu button position 11 years ago
scrawl e9ab7c85c6 Fix exception when there are spaces in INI-imported color settings 11 years ago
Kevin Poitra 3f00f00426 Remove some debug code. 11 years ago
scrawl 18e24a2007 Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found)
Fixes #1357
11 years ago
Kevin Poitra 16a6edbd0e Fix a possible crash due to a null pointer. 11 years ago
Marc Zinnschlag f112c78858 Merge remote-tracking branch 'scrawl/master' 11 years ago
Kevin Poitra 251df73407 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
Kevin Poitra b897080156 Started implementing sound time tracking so we can have NPCs' mouths move as they talk. 11 years ago
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.
11 years ago
scrawl 42ea43c3d1 Fix container scripts not getting removed properly on cell change
Broken by f99eda1a54
11 years ago
Marc Zinnschlag bb011f278e Merge remote-tracking branch 'cc9cii/master' 11 years ago
scrawl 56ff399f30 Say attack voiced dialogue *after* the target is set up
Required for the CreatureTargetted filter to function properly
11 years ago
cc9cii bbe77d656a Minor fixes from static analysis. 11 years ago
Arthur Moore 9be219beba Fixes Bug #1348 "Evidence Chest unlocking when arrested." 11 years ago
Marc Zinnschlag be39395ce7 Merge remote-tracking branch 'scrawl/master' 11 years ago
Digmaster 033f1850f9 Fixed crass on character creation, allowed some character creation windows to be Esc-able 11 years ago
Digmaster 060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 11 years ago
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.
11 years ago
scrawl 0b45a9e6b2 Fix case folding for faction reaction from ESX records 11 years ago
scrawl 2b15b85af1 Fix position adjustment not working properly for rotated objects 11 years ago
scrawl 2fe86f2b85 Consider hit normal for item drop test (Fixes #995) 11 years ago
scrawl f476aa4ade Remove MyGUI color codes when copying to system clipboard 11 years ago
scrawl 49a6579d3a Fixed esmtool 11 years ago
scrawl 3e2eed9269 Implement getFactionReaction function
Strange bug when using value != 0 for the garbage argument?
11 years ago
scrawl e266c39c5d Implement modFactionReaction instruction (Closes #1347) 11 years ago
Marc Zinnschlag 27c795483b Merge remote-tracking branch 'ace/win-build-fix' 11 years ago
scrawl 578adb4ef6 PcJoinFaction and friends: make sure the given faction exists 11 years ago
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)
11 years ago
Marc Zinnschlag 1665822224 Merge remote-tracking branch 'puppykevin/master' 11 years ago
Marc Zinnschlag e0ba9a4bf2 added reference collection stage to saving operation (preparation for cell saving) 11 years ago
Digmaster 2b3b11d848 Give access to the main menu when at a choice in dialogue 11 years ago
Digmaster ee7b5fa5c2 Fixed crash when Esc-ing out of Save "are you sure" dialog. 11 years ago
Digmaster e0356cf89d Added support to close modal windows with Esc 11 years ago
Kevin Poitra beba58268c Fix a typo within the launcher. Fixes bug #1058. 11 years ago
Marc Zinnschlag 9e21da9636 Merge remote-tracking branch 'scrawl/master' 11 years ago
Digmaster e0d55116a4 Dims and disabled Goodbye button in dialogs when unavailable. 11 years ago
Digmaster 79d0ed64d9 Undo some changes I made in the past that shouldn't exist 11 years ago
Digmaster 1ca921d6e2 Merge remote-tracking branch 'upstream/master' 11 years ago
Digmaster e3e51324a4 Esc button exits all non-modal GUI windows 11 years ago
scrawl cf68f6da96 Fix ESX dependencies not being checked except for the first one 11 years ago
scrawl 4caa8c5cca Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations) 11 years ago
scrawl 5660f283dd Fix actor models incorrectly being rotated on X/Y axes 11 years ago
scrawl 0966755a0c Store death animation index in CreatureStats 11 years ago
Marc Zinnschlag 3937cfcd8b Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 11 years ago
scrawl f629307f60 Fix frame delay for sound listener position (Fixes #1180) 11 years ago
scrawl bfd91c0681 Fix potential NpcStats overwriting issue 11 years ago
Marc Zinnschlag 4aab4bae65 minor cleanup and silenced a warning 11 years ago
Marc Zinnschlag f0d0a31a19 Merge remote-tracking branch 'mrcheko/master' 11 years ago
Thomas 7697b9e868 Ensures nothing bad will happen if we try to lock a door that never had a lock level 11 years ago
Thomas b3ffd5b868 Fix for bug Bug #1098 11 years ago
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
11 years ago
scrawl 10d835a55c Some more missing isInCell checks 11 years ago
scrawl f3ba31de2d Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwscript/cellextensions.cpp
11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
Marc Zinnschlag 130af28fa5 Merge remote-tracking branch 'cc9cii/master'
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
11 years ago
Marc Zinnschlag ff15601a4c Merge branch 'openmw-30' 11 years ago
mrcheko c62187bd55 fix bug at http://bugs.openmw.org/issues/1155
Though it still can happen sometimes but not in such stupid manner.
11 years ago
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" 11 years ago
mrcheko 559c772906 Merge remote-tracking branch 'upstream/master' 11 years ago
cc9cii 4f94a31b54 Fix crash starting a new game. 11 years ago
mrcheko 56881cb7c9 fix bugs in aisequence::execute 11 years ago
scrawl a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 11 years ago
scrawl 1d8da95756 Warning fix 11 years ago
scrawl 08cf58204f Merge branch 'master' of github.com:scrawl/openmw 11 years ago
scrawl f09c8ddc9e Remove a pointless assert 11 years ago
scrawl a7d525245c Fix missing include 11 years ago
Scott Howard c9011f707f missing #include <iostream> in mwiniimporter
missing #include <iostream> in mwiniimporter/main.cpp
11 years ago
cc9cii 367acd9676 Enable video but without sound. 11 years ago
cc9cii 3718847ffc Disable video for Windows until the crash issues are fixed. 11 years ago
Marc Zinnschlag f4334da42e added changed reference tracking for cells 11 years ago
scrawl b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
11 years ago
Marc Zinnschlag 6ac700a501 Merge remote-tracking branch 'potatoesmaster/getClass' 11 years ago
Marc Zinnschlag 244eb11651 Merge remote-tracking branch 'greye/widechar' 11 years ago
scrawl a2f156be8e Prevent magic bolts from colliding with their caster 11 years ago
scrawl df8e095c83 Small cleanup 11 years ago
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. :)
11 years ago