Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
scrawl
f695deb29d
Remember window positions
11 years ago
scrawl
bda28e2ed0
Increase size of item selection dialog
11 years ago
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
11 years ago
scrawl
cab535dd69
Implement magic item recharging via soulgem use
11 years ago
Lars Söderberg
35434dc053
German fixes
...
Fixes for German language.
11 years ago
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
11 years ago
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
11 years ago
scrawl
3a827d9c12
Deleted Obliviontt.zip
11 years ago
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
11 years ago
scrawl
3a3f2a37c8
Add cut, copy & paste of text
11 years ago
Lars Söderberg
f4e9199f78
Various chargen tweaks
12 years ago
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
Lars Söderberg
45083fc89e
Chargen updates
12 years ago
Lars Söderberg
e33239eae5
Various fixes
12 years ago
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
12 years ago
Lars Söderberg
317d565133
Larger area for window corner diagonal arrows
12 years ago
Lars Söderberg
5b060ffe8d
Varios standardizations, fixes and optimizations
12 years ago
Lars Söderberg
73fb682718
Made the alchemy window resizable
12 years ago
Lars Söderberg
0fabf1fe2e
Updated Alchemy Window
12 years ago
Lars Söderberg
f7ed2ef55f
Standardize align values
...
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
12 years ago
PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
12 years ago
Emanuel Guevel
add3bb9904
Add sneaking indicator UI widget
12 years ago
Lars Söderberg
f6f5867256
Fixes the FPS bar
12 years ago
scrawl
3961c276b8
Added enemy health meter
12 years ago
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
12 years ago
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
12 years ago
scrawl
d6faad3dd2
Same fix for the book window
12 years ago
scrawl
4a562b585c
Fix journal window with background image != 512x256
12 years ago
scrawl
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
12 years ago
Sebastian Wick
26bd2a5301
use the new scrollbar; range dependent step size; fix
12 years ago
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
12 years ago
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
12 years ago
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
scrawl
daab4f55a3
Use Morrowind's fonts
12 years ago
riothamus
885d12e867
updated hud layout
12 years ago
riothamus
39bd8894a9
Bug 787
12 years ago
scrawl
0c4a963132
Container UI rewrite
12 years ago
scrawl
90b7df439f
Fix image buttons
12 years ago
scrawl
f1413ca56b
Synced font code ranges.
12 years ago
scrawl
ef9f0b2fc0
Fix size of quest index
12 years ago
scrawl
78e6dab9d2
Dialogue history rewrite WIP
12 years ago
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
12 years ago
Glorf
f1a659e2ac
Bugfix #730
12 years ago
scrawl
2a42556aa5
Merge branch 'master' into HEAD
12 years ago
Nathan Jeffords
718af692c9
reworked journal to match bethesda's implemenation
12 years ago
Nathan Jeffords
85595245ab
Updated journal layout to match Bethesda's version more closely
12 years ago
Emanuel Guevel
c0102954f1
Add non-breaking space to font code range
12 years ago
Glorf
ae3e4ecf8b
Finished enchanting
12 years ago
scrawl
857f2b33db
Fix companion layout align
12 years ago
scrawl
bc6e1fd981
Add missing files
12 years ago
scrawl
b0199c703c
Companion UI
12 years ago
scrawl
a031c77619
Improved enchanting layout
12 years ago
vorenon
a49e524541
Reduced width of textboxes in race menu
...
The width of the text box was too large and MyGui didn't align the texts properly. Fixed with the help of the MyGui layout editor.
12 years ago
vorenon
f93cefa201
Changed Y position of the textboxes
12 years ago
vorenon
35a6ca010a
Adjusted textbox height in race menu
12 years ago
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
12 years ago
scrawl
a2ca679beb
Added PC repair feature
12 years ago
scrawl
20774f8f81
Added merchant repair feature
12 years ago
scrawl
4cbb202306
Several tooltip fixes
12 years ago
scrawl
1666bc7740
Armor rating
12 years ago
scrawl
c0b0227e8a
enchanting
12 years ago
scrawl
fdcbdbf35d
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
12 years ago
scrawl
4c588cbab6
Levelup dialog is now dynamic; added level descriptions
12 years ago
scrawl
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
12 years ago
Emanuel Guevel
215d45aaf7
Make trade window's "max sale" button clickable
...
The HBox widget above it was stealing the input events.
12 years ago
scrawl
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
12 years ago
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
scrawl
cf87708c1f
Magic effect icons for spells
12 years ago
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
12 years ago
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
Marc Zinnschlag
0b629791a8
reverting loading bar layout
12 years ago
Lars Söderberg
f77ace0885
Removed the "hack" mygui.png and misc fixes for this.
12 years ago
vorenon
bd597f07ab
Centered the loading text
12 years ago
scrawl
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Lars Söderberg
e32646ee50
Prettier repeated borders.
12 years ago
Lars Söderberg
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
12 years ago
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Nathan Jeffords
5e1ec9e128
improved book window layout
12 years ago
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
12 years ago
Emanuel Guevel
2dea86bbc7
Make the "lock window" button appealing
12 years ago
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
12 years ago
scrawl
3772cd9257
Refraction can be disabled separately now
12 years ago
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
Emanuel Guevel
af9e126487
Add unicode number for ellipsis (…) to code range
12 years ago
lazydev
aa514a53d9
Console font change to provide possibility to show cyrillic symbols
12 years ago
scrawl
30136eb449
Update settings UI
12 years ago
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
scrawl
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
12 years ago
scrawl
5fdc7ad809
forgot to add file
12 years ago
scrawl
ace9ee9c83
persuasion dialog
12 years ago
scrawl
38828acac9
transparent overlay
12 years ago
scrawl
234716daa6
finished spell creation
12 years ago
scrawl
0a19b56031
fix gold label
12 years ago
scrawl
e80394c0b5
fix training limit
12 years ago
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
12 years ago
scrawl
1a2034b4dd
training window
12 years ago
scrawl
f154031e54
last bits of the gui
12 years ago
gugus
1f4de03613
oooups
12 years ago
gugus
85d9357e3a
Travel GUI
12 years ago
scrawl
025e820703
abstracted code and use it in enchanting window as well
12 years ago
scrawl
1c0dd3ccc5
some editing code
12 years ago
scrawl
636f297f10
enchant
12 years ago
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
12 years ago
scrawl
d393f551ed
edit effect dialog
12 years ago
scrawl
9d7c35ae48
and go
12 years ago
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
scrawl
e5e3d829d0
player arrow & markers
12 years ago
scrawl
86cfc91ef3
global map rendering
12 years ago
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
scrawl
b9a3f8e8d7
gamma slider
12 years ago
scrawl
bf5e30b24f
everything done except health/mana restore
12 years ago
scrawl
ab698bb401
date time label
12 years ago
scrawl
0ba996f290
dialog layout
12 years ago
scrawl
42d25c0af0
fix resources, I renamed those in the last commit, but only in one place
12 years ago
scrawl
76b494100e
finished?
12 years ago
scrawl
95f3a20e2c
Merge branch 'master' into levelup
12 years ago
scrawl
b76a28f69c
beginnings of the gui
12 years ago
scrawl
a308d2e38a
fixed exception, fixed armor label obscuring the items
12 years ago
scrawl
6ac2a12296
item selection working on the preview
12 years ago
scrawl
eef750e6b0
race selection preview
12 years ago
scrawl
5155339cb6
character preview working
12 years ago
scrawl
4f3eb3c34a
character preview WIP
12 years ago
scrawl
a8d9aa98b1
some fixes
12 years ago
scrawl
369db182de
actual progress bar, performance optimization
12 years ago
scrawl
2b339f6c0f
loading screen
12 years ago
scrawl
ad66ebf84f
fix button align on 2 windows
12 years ago
scrawl
996e6280d8
more spell buying window cleanup
12 years ago
scrawl
ba0acd4056
changed some text colors
12 years ago
scrawl
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
12 years ago
scrawl
bc6a1979b0
replaced everything with the new method
12 years ago
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
12 years ago
scrawl
b66c8099eb
new system for dynamic sizing of buttons & text boxes
12 years ago
scrawl
bb267dddf6
some stats window cleanup
12 years ago
Marc Zinnschlag
3fad1c0786
fixed a crash
12 years ago
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
12 years ago
Adam Hogan
ebf80943a9
Added spell buying window
12 years ago
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
13 years ago
scrawl
ba43f2997f
fix missing character in font for french morrowind version, thanks to jvoisin
13 years ago
scrawl
dbe3cca828
added a separate core.xml file that works with the mygui layout editor
13 years ago
Marc Zinnschlag
4f411ff1eb
Merge remote-tracking branch 'scrawl/master'
13 years ago
scrawl
6ad08dfd33
added settings for crosshair & subtitles
13 years ago
scrawl
5370fecb6f
fix a small input focus issue with the map
13 years ago
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
13 years ago
scrawl
5834b4baa5
door markers on the local map
13 years ago
scrawl
6161f81c24
last bits of the quick key menu.
13 years ago
scrawl
c5e55d3cac
fix screenshot function
13 years ago
scrawl
c0f27bd5ef
magic selection window
13 years ago
scrawl
fab4cfecb1
some unfinished work on quick keys window
13 years ago
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
Pieter van der Kloet
9501e133f5
Updated the EB Garamond font to a higher-resolution version
13 years ago
scrawl
67577c6192
UI cursor & camera sensitivity sliders
13 years ago
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
13 years ago
scrawl
bc6e4feedc
hotkey window first version
13 years ago
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
scrawl
3ebc6fd590
fixed a settings window bug
13 years ago
scrawl
17a5c22c8f
don't use globbing
13 years ago
scrawl
f5ffea4d4b
new button, water timescale
13 years ago
scrawl
e0a99f104b
settings tab "shadows"
13 years ago
scrawl
485adc8bdc
shader mode button in settingswindow
13 years ago
scrawl
4ea6530772
hello world.
13 years ago
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
13 years ago
scrawl
b886aea298
change console skin to MW_Window and set the selected object refID as window title
13 years ago
scrawl
298ae4f7f8
HUD icons for selected weapon / selected spell / selected enchanted item
13 years ago
scrawl
30461438f6
still left: spell success formula
13 years ago
scrawl
c7268233df
spell window layout & opening/closing/pinning logic
13 years ago
scrawl
69e6bc6588
add water settings to settings window
13 years ago
scrawl
5d03e86613
added field of view and texture filtering to settings window
13 years ago
scrawl
6945afe95b
alchemy window layout
13 years ago
scrawl
6014a90002
added tooltip delay option
13 years ago
scrawl
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
13 years ago
scrawl
63213b36bf
Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind
13 years ago
scrawl
313a8e55b7
- Issue #296 : Clicking on HUD elements shows/hides the respective window
...
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
13 years ago
scrawl
750259973e
potion creating works, most of the values are bogus
13 years ago
scrawl
1df1b521a4
show the list of potion effects
13 years ago
scrawl
09c870ad68
first alchemy window layout (not pretty)
13 years ago
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
13 years ago
scrawl
c2b818373e
adjust tooltip skin, now is never transparent
13 years ago
scrawl
6ea7bdb224
vsync & fps buttons, sound volume apply fix
13 years ago
scrawl
9b94edd561
audio tab with volume sliders
13 years ago
scrawl
cb35f4d208
some unrelated gui cleanup
13 years ago
scrawl
689cf7ce05
ConfirmationDialog
13 years ago
scrawl
656a8f1be9
working menu transparency slider
13 years ago
scrawl
972c035e97
TabControl skin, settings window categories
13 years ago
scrawl
313294c522
settings window (hotkey F2) which does nothing. Yay!
13 years ago
scrawl
b2d207130d
vastly improved look of the GUI, skin background textures now use tiling instead of stretching
13 years ago
scrawl
1079bb2677
finished tooltips for everything in the stats window, some gui refactoring
13 years ago
scrawl
8ce4727424
skill tooltips
13 years ago
scrawl
6518eb7794
some cleanup
13 years ago
scrawl
1c7110fbf5
birthsign tooltip
13 years ago
scrawl
8d52ee27dc
attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files
13 years ago
scrawl
4fb30544d4
more gui files cleanup
13 years ago
scrawl
7a4de0ed1d
changed more gui stuff to use the new tag system
13 years ago
scrawl
7ef0ad4e39
show faction & birthsign in the stats window
13 years ago
scrawl
24ce88de2a
working mygui tag replacement system for GMST strings
13 years ago
scrawl
41efea4c1d
in the trade window, don't show items that the merchant has equipped.
13 years ago
scrawl
6ae642aa06
complete trade window layout
13 years ago
scrawl
4213b4370f
trade window shows up and shows the vendor's inventory items.
13 years ago
scrawl
5da4da820e
beginnings of trade window layout.
13 years ago
scrawl
0c1d06d9f7
added some trade window stuff, which does nothing yet.
13 years ago
scrawl
8cc49ae2b9
xml files update (layout tweak, added double quotation marks to font)
13 years ago
scrawl
b18ee198b4
use a raycast to determine where to place object, if distance is too far
...
drop it on the ground
13 years ago
scrawl
24a0fecd37
implemented item count selection dialog
13 years ago
scrawl
f300a5621c
Merge branch 'master' into inventoryGUI
13 years ago
scrawl
3a93df8db4
dynamic inventory layout like morrowind
13 years ago
scrawl
78b06d0ebf
inventory window pinning
13 years ago
scrawl
822e5fbe1e
add indication which filter is selected
13 years ago
scrawl
0114bf948c
revised filters
13 years ago
scrawl
1abf70692c
added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug
13 years ago
scrawl
ed6ff0a94a
cleanup 3
13 years ago
scrawl
3a6fde5039
cleanup 2
13 years ago
scrawl
a1b86acc38
Merge branch 'master' into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
13 years ago
gugus
8e8f80807e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
13 years ago
scrawl
a99f74702e
workaround for a white square that appears in menubook_next texture
13 years ago
scrawl
1f1edea6af
make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar
13 years ago
scrawl
65ccfba191
resize both the left and the right pane of the stats window
13 years ago
scrawl
8a9e05a96b
display text on the book window
13 years ago
scrawl
d69501b061
change daedric font to .zip resource
13 years ago
scrawl
cd351ba3af
simple scroll text parsing (tags are ignored until now)
13 years ago
scrawl
9dd53b32b8
added daedric font for magic scrolls
13 years ago
scrawl
f20d4eeb41
Bug #281 , openmw.font.xml update
13 years ago
scrawl
499dd26398
dialogue window topic list word-wrapping
13 years ago
scrawl
a3d99767f7
next & prev button mouseover
13 years ago
scrawl
c125fba9d2
button mouse-over image change working
13 years ago
scrawl
a4d6d1baff
added a utility for creating texture atlas at runtime
13 years ago
scrawl
5028a83d11
fix stats window layout resizing
13 years ago
scrawl
0e6b82284f
book & scroll windows
13 years ago
scrawl
f733382f74
tooltip now contains info about item enchantment
13 years ago
scrawl
397a978145
DispositionEdit tweaks
13 years ago
scrawl
cca39978d4
changed messagebox text colors
13 years ago
gugus
5603cb312c
Objects can now be selected and follow mouse movements.
13 years ago
gugus
25432d97d2
trying to get selected item. Doesn't work.
13 years ago
scrawl
4889902b98
magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects
13 years ago
pchan3
215d4e1739
Made adjustments to keep container window within the viewscreen.
13 years ago
scrawl
f1b80c6ff7
fixed text input box
13 years ago
scrawl
cfa37b0e77
fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text
13 years ago
scrawl
b3dc1931a9
general GUI refactoring, part 1
13 years ago
scrawl
194ecf274c
attribute tooltips
13 years ago
scrawl
705d4c6d54
mostly complete
13 years ago
gugus
58d05fa503
more clean-up. Container window shows up! But there is no working close button.
13 years ago
gugus
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
gugus
b309d245c5
cleaning up hircine work
13 years ago
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
13 years ago
scrawl
cac662ca98
basic tooltips
13 years ago
scrawl
2b8c81e779
removed test.skin file
13 years ago
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
13 years ago
Roman Melnik
1bf79fd022
Windows pinning: support for MapWindow
...
Set correct skin for the Map Window.
13 years ago
Roman Melnik
ef0a185e11
Pinnable windows: hide hud elements
...
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.
Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
13 years ago
Roman Melnik
d09f0610ea
Add basic windows pinning
...
Create WindowPinnableBase class for windows which should be
allowed to be pinned.
Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).
Handle clicking on PinToggle button (pinning/unpinning a window).
13 years ago
scrawl
4bbedeb3e7
made all dialogs semi transparent (like in morrowind)
13 years ago
scrawl
d3f31c3498
dialogue window enhancements
13 years ago
Pieter van der Kloet
426c278505
Changed the OpenMW default font from Comic sans to EB Garamond
13 years ago
Pieter van der Kloet
155cd76f37
Changed Launcher font to EB Garamond and added license info
13 years ago
scrawl
7a3034701f
functional HUD map
13 years ago
scrawl
ce63d29d4a
rotate hud player arrow
13 years ago
scrawl
770b0f2106
gui changes
13 years ago
scrawl
9c3e1f48f0
player arrow
13 years ago
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
13 years ago
scrawl
cc9f20a04f
MW_MapView skin
13 years ago
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
13 years ago
scrawl
70ed5770da
black journal text
13 years ago
scrawl
250fcab7c2
moved the mygui resources to a more suitable location
13 years ago