Commit Graph

67 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Capostrophic e9e9c0dd6b Fix guild guide fast travelling to exteriors time 6 years ago
Capostrophic bcd9cc4baa Check the actor cell instead of the destination cell in fast travel price logic 6 years ago
David Cernat 031a80ed5a [Client] Don't advance time when waiting, traveling, training or jailed 6 years ago
Capostrophic cddc0914c8 Option to charge for all companions travelling (fixes #4064) 6 years ago
scrawl 12510efab7 Fade screen out during loading screen (when travelling) 7 years ago
scrawl 8964fc93d6 Fix dialogue window not being exited properly 7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 7 years ago
Andrei Kortunov c2706ac3e7 Merchant repair and travel window scroll fix 7 years ago
Andrei Kortunov aac78d29a4 Service menus layout fixes 7 years ago
NeveHanter ff4aba2a6e Moved duplicated code to common ActionTeleport static method and reordered travel price calculations 8 years ago
NeveHanter 15cd3c178b Clamp price multiplication to 1, as it resulted in player alone traveling at no fee. 8 years ago
NeveHanter 8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 8 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 9 years ago
scrawl 7bacb9418d Various math code ported to osg 9 years ago
scrawl d1b6289cad Don't teleport followers when using teleportation spells 9 years ago
scrawl e30f240ba2 Add travel service support for creatures (Fixes #2432) 9 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
9 years ago
scrawl 728b842e72 Use MyGUI::utility in favor of boost lexical_cast 9 years ago
scrawl eecea4131f Reduce MyGUI includes 9 years ago
scrawl d6bc50c492 Remove an unused member variable 10 years ago
scrawl 0b1e997bdd Make sure dialogue is ended properly when closing it by using a service (Fixes #1755) 10 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 10 years ago
scrawl 315b022d2d Add transfer gold from all services to NPC trade gold pool 10 years ago
scrawl 31d058b98c Add workaround for ScrollView messing up canvas size (Fixes #1700)
TODO: Create fixed ScrollView widget?
10 years ago
scrawl 185ff279a3 Add missing sound effect for mages guild transport 10 years ago
scrawl 1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 10 years ago
Digmaster e3e51324a4 Esc button exits all non-modal GUI windows 10 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. :)
10 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 10 years ago
Marc Zinnschlag 7693f712bc started making CellStore into a proper class; encapsulated mCell member 10 years ago
scrawl 0d0005c433 Fix fatigue not restoring when waiting 10 years ago
scrawl d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 11 years ago
scrawl 0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
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. 11 years ago
vorenon 3bf3bd4b8c Silenced some warnings 11 years ago
scrawl 0c4a963132 Container UI rewrite 11 years ago
Marc Zinnschlag 5bbab1abd9 Merge remote-tracking branch 'galdor557/master' 11 years ago
Britt Mathis 60fadaeaf0 Cleaned up includes in implementation files 11 years ago
scrawl 7fcaffefb0 Fixed travel window to use the rotation part of ESM::Position 11 years ago
Marc Zinnschlag 3f846a50d9 Merge remote-tracking branch 'galdor557/master'
Conflicts:
	apps/openmw/mwgui/travelwindow.cpp
11 years ago
Britt Mathis f7383905b7 Finally eliminated calls to MWBase::WindowManager in constructors 11 years ago
Britt Mathis ce9bc6d9ba MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions 11 years ago
scrawl d0bcf83091 Adjust player position to ground after using travel services 11 years ago
scrawl 170a9762ac Fix travel services not actually costing gold. 11 years ago