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
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02: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
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
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02: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
scrawl
9a43927078
Fix weapons not appearing in Enchantable filter
2013-05-28 03:15:13 +02: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
Miroslav Puda
9a9b075a02
Correct cast cost for enchantments.
2013-05-27 18:08:12 +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
Marc Zinnschlag
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
2013-05-27 10:19:02 +02:00
scrawl
3a6e54c4f5
Sell owned items in the cell
2013-05-27 02:18:36 +02:00
riothamus
d9350be8da
Console Object Selection Fix
2013-05-24 09:31:56 -04:00
scrawl
32e90bb733
Fix chargen statssheet
2013-05-23 17:28:45 +02:00
riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04: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
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
2013-05-17 14:11:02 +02: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
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
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
Glorf
0539ca6a9c
Bugfix #778
2013-05-16 13:35:28 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Marc Zinnschlag
9835c6df11
Merge remote-tracking branch 'scrawl/tradefix'
2013-05-12 12:58:32 +02: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
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
kpp
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
scrawl
90b7df439f
Fix image buttons
2013-05-08 13:55:15 +02: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
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
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
scrawl
38c399a698
Fix duplicate sounds
2013-05-05 10:51:17 +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
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
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
Glorf
369cf0b4ca
Enchanting price mechanics
2013-04-02 20:46:48 +02:00
Marc Zinnschlag
df658d29f0
Merge branch 'faction'
2013-04-02 14:21:51 +02:00
Marc Zinnschlag
f9f520df34
adjusted faction record to increase consistency with other records
2013-04-02 13:59:45 +02:00
Marc Zinnschlag
751c679255
Merge remote-tracking branch 'glorf/enchanting'
2013-04-01 17:35:04 +02:00
Glorf
d29a42dcbe
Fixed enchanting mechanics
2013-03-31 23:18:23 +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
scrawl
e27e53f607
Fix not playable body parts appearing in the race selection menu.
2013-03-30 20:04:05 +01:00
Glorf
7dbc779c3a
Self-enchanting mechanics
2013-03-30 19:08:42 +01:00
scrawl
0f0cc0e3e3
Fix a few gold conditions that I missed, trade window was affected
2013-03-30 18:29:21 +01:00
scrawl
51204f098e
Added soulgem dialog; made interactive message boxes not close the previous UI
2013-03-30 15:51:07 +01:00
scrawl
e7af718b55
Remove unnecessary WindowManager::messageBox arguments
2013-03-30 12:56:37 +01:00
scrawl
04673b2f14
Don't enchant if the enchantment value is too high for the item
2013-03-30 12:54:20 +01:00
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4
Some enchanting fixes
2013-03-29 12:00:09 +01:00
Glorf
6643fe789c
Enchanting system
2013-03-28 17:41:00 +01:00
scrawl
564256c4e1
Fix the spell icon panel being visible when it shouldn't.
2013-03-27 18:04:15 +01:00
scrawl
6a2b87e14a
Fix dialogue response coloring for creatures
2013-03-25 17:37:59 +01:00
scrawl
4be0c6b708
Fix topics not being selectable for creatures
2013-03-25 17:32:01 +01:00
Marc Zinnschlag
6c76e97bbc
fixed day count in rest dialogue
2013-03-25 11:53:02 +01:00
scrawl
a2ca679beb
Added PC repair feature
2013-03-23 08:16:46 +01:00
scrawl
20774f8f81
Added merchant repair feature
2013-03-22 14:13:10 +01:00
scrawl
918cdcffc2
Split up components/esm/loadlocks
2013-03-22 05:50:54 +01:00
scrawl
4cbb202306
Several tooltip fixes
2013-03-20 03:31:01 +01:00
scrawl
b9c3a4816d
Fix dialogue topics still being accessible in the history pane when they shouldn't be
2013-03-20 03:30:15 +01:00
scrawl
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
2013-03-20 02:29:03 +01:00
Glorf
3bd545ed8e
In-console nonexistent class fix
2013-03-19 21:55:37 +01:00
Glorf
dd11ae04ee
Console code cleaned
2013-03-19 17:25:41 +01:00
Glorf
f5bf7254a8
Minor console selection improvements
2013-03-18 23:46:17 +01:00
Glorf
a07c910d0b
Feature #535 : Console object selection improvements
2013-03-18 21:33:12 +01:00
Marc Zinnschlag
08f6d04960
constness fixes
2013-03-18 08:29:40 +01:00
Marc Zinnschlag
19c3b5516d
Merge remote-tracking branch 'glorf/fallbacks-next' into next
2013-03-18 08:14:25 +01:00
scrawl
95e1cdc07d
Move getArmorRating to MWWorld::Class.
2013-03-17 22:29:12 +01:00
scrawl
c66675b599
Fix the 'Take all' button taking equipped items when stealing
2013-03-17 22:28:28 +01:00
Glorf
ea7f386e7d
Access to Fallback via getFallback
2013-03-17 13:50:15 +01:00
scrawl
dd57eabc3e
Better use an enum for magic effect IDs
2013-03-16 23:28:26 +01:00
scrawl
1666bc7740
Armor rating
2013-03-16 22:53:33 +01:00
scrawl
cebcbe11f8
Implemented service refusal
2013-03-16 20:32:21 +01:00
scrawl
c0b0227e8a
enchanting
2013-03-16 19:00:14 +01:00
scrawl
3e9cd0e2e3
Fix the back button on generate class result dialog advancing creation stage
2013-03-14 22:33:51 +01:00
scrawl
c4a42f2e1f
Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener
2013-03-13 23:17:25 +01:00
scrawl
0223df4dfc
Fix invalid cast exception in the spell creation dialog
2013-03-13 19:45:22 +01:00
scrawl
fdcbdbf35d
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
2013-03-13 19:44:34 +01:00
scrawl
4c588cbab6
Levelup dialog is now dynamic; added level descriptions
2013-03-12 17:18:47 +01:00
Glorf
93de570f9a
Moved specializations out of step
2013-03-10 15:58:29 +01:00
Glorf
04e99ee9d6
Character creation struct consts
2013-03-10 15:15:33 +01:00
Glorf
1ef682896a
Character creation questions import
2013-03-10 15:03:48 +01:00
scrawl
a51b73b609
Fix topics that have the same name as a service opening that service when clicked
2013-03-09 21:50:01 +01:00
Sebastian Wick
0ae48c1f83
fix for Bug #509
2013-03-09 20:40:59 +01:00
scrawl
b19571df89
If character creation dialogs are enabled in the wrong order, force creation stage to advance
2013-03-09 14:59:50 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
scrawl
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
2013-03-07 14:00:13 +01:00
scrawl
e34685b8a3
Fix manually changed mouse cursor
2013-03-07 12:46:26 +01:00
scrawl
39411eda7b
Fix the spell buying window listing already owned spells
2013-03-06 15:11:40 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
Marc Zinnschlag
8a887a0aef
Merge remote-tracking branch 'potatoesmaster/tradewindow'
2013-03-04 19:42:51 +01:00
scrawl
d5c6c221c1
Books/scrolls: Fix the take button incorrectly showing
2013-03-04 17:28:01 +01:00
Emanuel Guevel
8e07638699
Update the trading offer on "max sale" button click
2013-03-04 12:24:41 +01:00
scrawl
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
2013-03-03 19:28:11 +01:00
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06
Merge remote-tracking branch 'scrawl/includes'
2013-03-03 15:37:13 +01:00
scrawl
9a84f6744f
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
2013-03-03 13:11:02 +01:00
scrawl
6037c44ea6
Fix ingredient effect display
2013-03-03 12:41:57 +01:00
scrawl
8e05c4159d
Magic effect icons for permanent enchantments
2013-03-03 12:17:37 +01:00
scrawl
cf87708c1f
Magic effect icons for spells
2013-03-03 12:01:19 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
scrawl
ef1678e47e
Oops, rotation center should be dynamic
2013-03-01 22:32:02 +01:00
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
2013-03-01 18:45:52 +01:00
scrawl
b7ab12e7cf
Workaround to prevent the map drawing on top of the world button
2013-02-28 21:12:13 +01:00
vorenon
c9a701cfa1
Removed the 3 dots after the load text.
2013-02-28 19:25:18 +01:00
Marc Zinnschlag
ce1310614c
Merge remote-tracking branch 'potatoesmaster/pinned'
2013-02-27 17:37:04 +01:00
Emanuel Guevel
be9d49c510
Do not hide pinned windows during loadings
2013-02-27 16:17:41 +01:00
scrawl
369f881170
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-27 09:25:44 +01:00
vorenon
89cba3cf45
Replaced ifs/elseifs with switch
2013-02-26 19:52:51 +01:00
vorenon
13c33c1613
added missing click sound to main menu
2013-02-26 19:37:47 +01:00
vorenon
b1ca719d61
Added click sound to OK button for message boxes
2013-02-26 16:37:59 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
Marc Zinnschlag
dc445844d2
Merge remote-tracking branch 'scrawl/z-up'
2013-02-26 14:37:50 +01:00
scrawl
b9912a19e0
Z-up conversion: fix player arrow direction on global map
2013-02-26 14:31:30 +01:00
scrawl
284ba58e1e
Z-up conversion: global map, shader fix
2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
Chris Robinson
da575b181e
Use the correct GMST for the race menu
2013-02-25 13:04:17 -08:00
scrawl
b1fc68d44d
Merge branch 'master' into graphics
2013-02-25 17:36:33 +01:00
scrawl
73d48a95f6
Add message box when the player tries to move when being overencumbered.
2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
scrawl
dfe29db9cb
Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)
2013-02-25 06:57:32 +01:00
scrawl
0d6a3367d3
Water shader no longer depends on object shaders being enabled
2013-02-24 10:28:50 +01:00
scrawl
4b51184ec4
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 14:37:28 +01:00
Sergey Shambir
a3adcf752d
TradeWindow: fixed coding style
...
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
2013-02-23 13:51:21 +01:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
Emanuel Guevel
43d6392921
Change the way pinnable window are made visible
...
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
2013-02-20 01:00:13 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
