1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

1031 commits

Author SHA1 Message Date
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
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
Marc Zinnschlag
2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 2013-05-03 14:55:00 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
kpp
dcccfd9f22 Initialize values 2013-05-02 22:43:21 +04: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
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
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Glorf
d283f8d85f Bugfix #748 2013-04-29 21:19:13 +02:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Glorf
6222b3f52a Bugfix #744 2013-04-29 17:19:20 +02: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
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02: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
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
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
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
scrawl
7fcaffefb0 Fixed travel window to use the rotation part of ESM::Position 2013-04-15 03:13:25 +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
Britt Mathis
6128b9276f Removed non-essential includes from all MWGui header files. 2013-04-11 00:21:56 -04:00
Britt Mathis
f7383905b7 Finally eliminated calls to MWBase::WindowManager in constructors 2013-04-10 14:46:21 -04:00
Britt Mathis
d768f6b57e Deleted *_* files in MwGui, builds. 2013-04-10 13:05:15 -04: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
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
Marc Zinnschlag
ef09b1cac8 Merge remote-tracking branch 'glorf/bugfix-1' 2013-04-08 20:23:18 +02:00
Glorf
2f52df22ce Bugfix #553 2013-04-08 19:00:38 +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
scrawl
480467b6eb Reset the 'owner' field for items that were legitimately bought from an NPC. 2013-04-07 21:53:11 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
Marc Zinnschlag
034ebf8ffd Merge remote-tracking branch 'scrawl/master' 2013-04-04 19:57:55 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +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
2179619721 Small enchanting fix 2013-04-03 18:06:11 +02:00
Glorf
ae3e4ecf8b Finished enchanting 2013-04-03 18:02:30 +02:00