84 commits

Author	SHA1	Message	Date
David Cernat	68837aaf4a	Add OpenMW commits up to 15 Oct 2020 ... # Conflicts: # .travis.yml # CI/before_script.linux.sh # CMakeLists.txt # apps/openmw/mwgui/containeritemmodel.cpp # apps/openmw/mwgui/tradewindow.cpp # apps/openmw/mwphysics/actor.cpp # apps/openmw/mwworld/actionteleport.cpp # apps/openmw/mwworld/containerstore.cpp	2020-10-15 19:51:39 +02:00
Charles Calhoun	14aacb81c5	Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation.	2020-10-03 20:05:17 +00:00
David Cernat	0eedf8fd9f	Add OpenMW commits up to 30 Sep 2020 ... # Conflicts: # apps/openmw/mwmechanics/aicombat.cpp # apps/openmw/mwmechanics/character.cpp # apps/openmw/mwmechanics/summoning.cpp # components/CMakeLists.txt	2020-09-30 13:32:15 +02:00
Andrei Kortunov	753ca91556	Set a minimum 1gp cost for services (regression #5600)	2020-09-08 17:04:31 +04:00
David Cernat	94b211dd4f	[Client] Synchronize changes to gold pools from other services	2020-05-20 08:09:25 +03:00
David Cernat	5181c601c0	Add OpenMW commits up to 2 May 2019 ... # Conflicts: # CMakeLists.txt # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp # apps/openmw/mwscript/statsextensions.cpp	2019-08-22 08:40:32 +03:00
David Cernat	f671c0bddc	Add OpenMW commits up to 1 Apr 2019 ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/engine.cpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwgui/trainingwindow.cpp # apps/openmw/mwgui/travelwindow.cpp # apps/openmw/mwgui/waitdialog.cpp	2019-08-21 23:54:39 +03:00
David Cernat	6205ff6b04	Add OpenMW commits up to 30 Jan 2019 ... # Conflicts: # apps/openmw/mwworld/worldimp.cpp	2019-08-21 15:48:07 +03:00
David Cernat	fba07194cf	Add OpenMW commits up to 29 Oct 2018 ... # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwinput/inputmanagerimp.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/aicombat.cpp # apps/openmw/mwmechanics/character.cpp # apps/openmw/mwworld/worldimp.cpp # apps/openmw/mwworld/worldimp.hpp	2019-08-20 13:15:00 +03:00
David Cernat	889bcec7f8	Add OpenMW commits up to 1 Sep 2018 ... # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwclass/creature.cpp # apps/openmw/mwclass/npc.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/difficultyscaling.cpp # apps/openmw/mwscript/transformationextensions.cpp # apps/openmw/mwworld/worldimp.hpp	2019-08-20 11:31:51 +03:00
David Cernat	84cab59057	Add OpenMW commits up to 19 Aug 2018 ... # Conflicts: # .travis.yml # CI/before_install.linux.sh # CI/before_script.linux.sh # apps/openmw/engine.cpp # apps/openmw/main.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp # apps/openmw/mwscript/aiextensions.cpp # apps/openmw/mwscript/containerextensions.cpp # apps/openmw/mwscript/dialogueextensions.cpp # apps/openmw/mwworld/cellstore.cpp # apps/openmw/mwworld/containerstore.cpp # apps/openmw/mwworld/scene.cpp # apps/openmw/mwworld/worldimp.cpp # components/misc/debugging.hpp	2019-08-20 10:06:15 +03:00
Capostrophic	c7ac06b960	Always account for every follower travelling	2019-04-24 16:21:12 +03:00
Andrei Kortunov	fcdb0c16bf	Update jail state once instead of for every single hour	2019-02-23 09:17:06 +04:00
Andrei Kortunov	0937f02598	Get rid of unnecessary string streams	2019-01-07 21:08:16 +04:00
Andrei Kortunov	adbaeb7cca	Improve GUI scaling (bug #3288)	2018-09-12 14:31:01 +04:00
Capostrophic	7ef6fa9f61	Remove deprecated GMST get* functions	2018-08-29 18:38:12 +03:00
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	2018-08-20 14:08:44 +03:00
Andrei Kortunov	9dfd775bf2	Implement GetPCTraveling console command	2018-08-13 08:30:50 +04:00
Capostrophic	e9e9c0dd6b	Fix guild guide fast travelling to exteriors time	2018-08-08 12:46:36 +03:00
Capostrophic	bcd9cc4baa	Check the actor cell instead of the destination cell in fast travel price logic	2018-08-08 02:07:48 +03:00
David Cernat	031a80ed5a	[Client] Don't advance time when waiting, traveling, training or jailed	2018-05-23 05:49:51 +03:00
Capostrophic	cddc0914c8	Option to charge for all companions travelling (fixes #4064)	2018-04-09 19:19:50 +03:00
scrawl	12510efab7	Fade screen out during loading screen (when travelling)	2017-10-04 16:00:38 +00:00
scrawl	8964fc93d6	Fix dialogue window not being exited properly	2017-09-27 12:56:02 +00:00
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	2017-09-25 23:38:28 +02:00
scrawl	4fff2e2e34	Refactor exitCurrentGuiMode	2017-09-24 19:08:13 +02:00
scrawl	84657271c7	Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window	2017-09-24 19:08:12 +02:00
Andrei Kortunov	54b4d93f79	Added a special function for GUI sounds playing	2017-07-10 15:48:00 +04:00
Andrei Kortunov	c2706ac3e7	Merchant repair and travel window scroll fix	2017-04-23 09:15:25 +04:00
Andrei Kortunov	aac78d29a4	Service menus layout fixes	2017-04-16 20:30:20 +04:00
NeveHanter	ff4aba2a6e	Moved duplicated code to common ActionTeleport static method and reordered travel price calculations	2016-12-23 21:27:29 +01:00
NeveHanter	15cd3c178b	Clamp price multiplication to 1, as it resulted in player alone traveling at no fee.	2016-12-20 21:23:55 +01:00
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	2016-12-20 12:38:51 +01:00
dteviot	77a1d947cc	extracted MWMechanics::getPlayer()	2015-08-21 21:12:39 +12:00
scrawl	4bb3cbf0fb	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
scrawl	7bacb9418d	Various math code ported to osg	2015-06-03 19:41:19 +02:00
scrawl	d1b6289cad	Don't teleport followers when using teleportation spells	2015-05-22 19:57:02 +02:00
scrawl	e30f240ba2	Add travel service support for creatures (Fixes #2432)	2015-03-09 03:15:11 +01:00
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	2015-03-08 13:07:29 +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	d6bc50c492	Remove an unused member variable	2014-09-07 18:55:59 +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	a18cec7c8e	Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719)	2014-08-01 16:25:41 +02:00
scrawl	315b022d2d	Add transfer gold from all services to NPC trade gold pool	2014-07-28 00:55:57 +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	185ff279a3	Add missing sound effect for mages guild transport	2014-06-19 03:29:36 +02:00
scrawl	1b610cdbd0	Allow following NPCs to fast-travel (Fixes #1501)	2014-06-16 03:17:31 +02:00
Digmaster	e3e51324a4	Esc button exits all non-modal GUI windows	2014-05-26 23:13:37 -04: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