22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
10 years ago
24bb2e152c
Apply texture filter setting changes
10 years ago
5442bf23a6
Apply video mode & gamma setting changes
10 years ago
4dd96f3318
Fix missing tiling in skin
10 years ago
fd3d49c171
Fix typo in settings layout
10 years ago
4825744a03
Fix inconsistent health bar skin
10 years ago
033719ccd7
Correct the icon used for custom map markers
10 years ago
c1edc30ad7
Dead code removal
10 years ago
157d8bfedd
Remove unused mygui files
10 years ago
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
f708944657
Remove toggle sneak menu option
...
Users can change the option in settings.cfg.
10 years ago
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
10 years ago
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
10 years ago
fb0fdf0312
New look for fps counter
10 years ago
960e99c4f3
Loading screen align fix
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
68f89318e7
Fix canvas align in skill view
10 years ago
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
10 years ago
a139e4efb0
Grey out completed quests in journal quests list
10 years ago
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
10 years ago
9ce3e4b4e1
UI consistency fix in levelup dialog
10 years ago
42363191a4
Layout tweaks
10 years ago
7685de1d50
MyGUI tweaks
...
Feedback / testing is needed on this.
Some small button location tweaks and more importantly, some changes to
bring consistency between the Potion maker screen (already in openmw),
Trading screen (already in openmw), Spellmaker screen, Travel screen and
Training screen. It's mainly the top bar I'm talking about and
resizability.
It is not 1:1 towards vanilla, but looks better (IMO) and again, creates
some consistency. This can probably be expanded to the remaining screens
such as Enchanting and Spell and perhaps even the save/load screen to
have OpenMW wide consistency.
10 years ago
efbbe73c2a
Fix pinned window caption
10 years ago
cfdbe35b0f
Dialogue window text area tweak
10 years ago
3d80bb3207
Fix overlap for long window captions
10 years ago
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
10 years ago
e2fe9693f3
Add missing tooltips in edit effect dialog
10 years ago
f9227beedd
Add warning when loading a savegame that depends on non-existing content files ( Fixes #2261 )
10 years ago
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
10 years ago
a8621e6230
defaults are set to 1.0; remove contrast setting
...
(can be changed in config though); disable gamma control for not Windows
OSs
10 years ago
60a74d5eb8
increase robustness for gamma to persist in the system;
...
use GMST strings for gamma interface
10 years ago
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
04d95810d1
gamma/contrast system reworked
10 years ago
5d7dcafa53
Make local map widget size configurable
10 years ago
703b9c59e9
Add missing tooltips to spell creation dialog
10 years ago
37e11b7272
Adjust loading box size for large captions
10 years ago
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
10 years ago
ebd384455f
disable borderless window by default
...
fix positioning of the in-game graphics settings
10 years ago
639fbfad0b
make borderless setting available to the UI
10 years ago
79237d16a7
Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
...
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
10 years ago
61d73d186d
Fixed part of settings window being in the incorrect place
10 years ago
073a2f0674
Fixed issue with walking
10 years ago
07ea352e46
Fix button graphics preventing mouse clicks ( Fixes #2104 )
10 years ago
450e951b2d
Adjusted book layout to better match vanilla
10 years ago
c8a273f552
Stats window layout fix
10 years ago
18b63d2e16
Merge remote-tracking branch 'lgro/issue_1982_long_class_names_are_cut_off'
10 years ago
d7716e7314
Fixes #1982 : Long class names are cut off in the UI
...
Corrected HBox, AutoSizedTextBox and TextBox positions and alignment.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
10 years ago
02f0b7caa3
Fixes #1982 : Long class names are cut off in the UI
...
Added HBox widget with AutoSizedTextBox, spacer,
and TextBox for level, race, class caption and text pairs.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
c4e81adb83
Fix settings window being too small for all tabs on some localizations
10 years ago
c3853b376d
Fix outdated core_layouteditor.xml
10 years ago
f29c4086cd
Fixes #1982 : Long class names are cut off in the UI
...
Increased length of text filed for race, class name
in stats window, and class name cation in chargen create
class window.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
10 years ago
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
10 years ago
358257ca6b
Rename some skin files to .skin.xml for consistency
10 years ago
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
10 years ago
fedfd7129d
Add spacing between buttons to TabControl skin
10 years ago
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
10 years ago
764c6287e1
Remove some garbage
10 years ago
9fbc7ebc02
Tweak CountDialog layout
...
First time using the LayoutEditor. Success!
10 years ago
b75b464495
Move Cancel buttons to right side of dialog ( Fixes #1715 )
10 years ago
0bc840aadd
Add NumericEditBox widget
10 years ago
f721b7adfb
Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them
10 years ago
6b65502557
Add properties for new widget classes to MyGUI plugin
10 years ago
ad318c1f9d
Add XML definition file for the MyGUI plugin
10 years ago
088d01d727
Minor cleanup
10 years ago
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
10 years ago
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
10 years ago
ef43196ef2
Add spacing to savegame dialog
10 years ago
f5868f7ae1
Fix layout problems in generate class result dialog
10 years ago
4cc95cf952
Tweak spacing on some tooltips
10 years ago
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
10 years ago
4f89c3e77a
Rework book formatter ( Fixes #1148 )
10 years ago
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
10 years ago
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
10 years ago
e94268b4e6
Remove some garbage
10 years ago
cbc242d857
Move item count text to ItemWidget
10 years ago
c5fa0768f1
Fix broken minimum track size for scrollbars
10 years ago
413bad2dc6
Fix a MyGUI warning
10 years ago
386bb98fd2
Do not attach coin widgets to a box
10 years ago
5977860e09
Fix broken coin placement in levelup dialog + possible memleak
10 years ago
98e7ab1b79
Add missing tooltips to enchant dialog
10 years ago
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
10 years ago
fc21d898f2
Add hand-to-hand tooltip
11 years ago
e8a245bea3
Enchanting dialog: follow vanilla behavior more closely
11 years ago
e2f15181f9
Make the "Choose an Attribute" text centered
11 years ago
e9e7e96c5f
SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation)
11 years ago
0a9a0a3b14
Slightly improve count dialog layout
11 years ago
063b40a0ee
Correct tooltip for maxed out skills
11 years ago
44b517f66d
Implement hiding inventory windows by double click on caption ( Fixes #1690 )
11 years ago
6cb9382bf0
Adjust screen-sized widgets automatically using Stretch align
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
11 years ago
038a811f16
Rename travel window Ok button to Cancel ( Fixes #1676 )
11 years ago
3b67e9b329
Rework level up dialog to behave more like vanilla
11 years ago
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
11 years ago
44fd526c98
Don't show disposition bar for creatures
11 years ago
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
11 years ago
224163e5a2
Fix console text becoming unreadable when selected ( Fixes #1530 )
11 years ago
d4678a8d55
Fix level up dialogue layout ( Fixes #1393 )
11 years ago
cb6f1d3a52
Fix wait dialog arrow button step ( Fixes #1524 )
11 years ago
311acfa8ff
Add delete button to save load menu ( Fixes #1453 )
11 years ago
cdd53862cb
Increase width of dialogue topic list ( Fixes #1440 )
11 years ago
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
11 years ago
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
11 years ago
bbc5b125ab
Rewrite journal GUI quest index
...
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
- Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
- Fixes a bug where the quest index would not be updated when opened.
11 years ago
a1bdf20958
Make trade balance label editable
11 years ago
d26f756c53
Fix several edit boxes not receiving mouse input
11 years ago
3cd835e61a
Fix bsa file loading not being case insensitive ( Fixes #1178 )
11 years ago
0fe0dc33a6
Fixes #1338 : Bring back a label that got lost
11 years ago
15368188dc
Fix sliders in effect editor not being precisely movable
11 years ago
3ad28ec5aa
Set a proper Page size for all scrollbars. Fixes scrollbars only moving very slowly when interacting with them (as opposed to using mousewheel on the content)
11 years ago
6e9458c076
Small fix for dropping items from inventory
...
Some widgets prevented clicking through
11 years ago
6f7fbc867f
Fix several leaks
11 years ago
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
11 years ago
d530bbe5cd
Implemented Scrawls alternative workaround.
11 years ago
a35f7c73ae
Fixes #1286 (Dialogue topic list clips with window frame)
...
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
11 years ago
0513d0837c
Alignment tweaks and autosized buttons workaround
11 years ago
04e5b9c72c
Right aligned version/revision
...
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.
Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.
Comments?
11 years ago
b0bdd233ee
Center, switch and change text for confirmation buttons
...
The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.
Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.
To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.
Comments?
11 years ago
138fb4e29a
Bug #1265 : Fixed confirmation buttons align
11 years ago
4555f6ddf6
Add text shadow to progress bar labels
11 years ago
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
11 years ago
14757a856b
Tweak settings window size and encumbrance bar text align
11 years ago
dd14dec8dc
Tweak loading screen progress bar positioning to match vanilla
11 years ago
a598060071
Added autosave on rest, as well as an option in the settings menu
11 years ago
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
11 years ago
f2cd37edd0
Play company logo movie
11 years ago
5906d795c0
Refactored video player (now a MyGUI widget)
11 years ago
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
11 years ago
0a17245633
Refactored settings window
11 years ago
cd0c283795
Add text shadow to version text for better readability
11 years ago
06e02ed77f
Added version and revision number to mainmenu
11 years ago
975f0e05b4
Fixes #1157 (attribute layout issue)
11 years ago
f608ceeffc
Fixes #1158 (Armor rating label issues)
11 years ago
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
292d692b40
Loosen window size restrictions
11 years ago
82146e7f8d
Use GMSTs for levelup
11 years ago
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
2744cde40f
Use a few additional GMSTs
11 years ago
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
11 years ago
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
11 years ago
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
af3569665c
Remove unused font
11 years ago
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
11 years ago
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
11 years ago
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
11 years ago
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
f695deb29d
Remember window positions
11 years ago
bda28e2ed0
Increase size of item selection dialog
11 years ago
2e87cbc231
Add basic functionality to SaveGameDialog
11 years ago
cab535dd69
Implement magic item recharging via soulgem use
11 years ago
35434dc053
German fixes
...
Fixes for German language.
11 years ago
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
11 years ago
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
11 years ago
3a827d9c12
Deleted Obliviontt.zip
11 years ago
23eaf90846
Breath meter flashes when drowning
11 years ago
3a3f2a37c8
Add cut, copy & paste of text
11 years ago
f4e9199f78
Various chargen tweaks
12 years ago
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
45083fc89e
Chargen updates
12 years ago
e33239eae5
Various fixes
12 years ago
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
12 years ago
317d565133
Larger area for window corner diagonal arrows
12 years ago
5b060ffe8d
Varios standardizations, fixes and optimizations
12 years ago
73fb682718
Made the alchemy window resizable
12 years ago
0fabf1fe2e
Updated Alchemy Window
12 years ago
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
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
add3bb9904
Add sneaking indicator UI widget
12 years ago
f6f5867256
Fixes the FPS bar
12 years ago
3961c276b8
Added enemy health meter
12 years ago
91e95e1404
Use the correct slash, chop or thrust animation
12 years ago
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
12 years ago
d6faad3dd2
Same fix for the book window
12 years ago
4a562b585c
Fix journal window with background image != 512x256
12 years ago
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
12 years ago
26bd2a5301
use the new scrollbar; range dependent step size; fix
12 years ago
e3d8bdbafe
autorepeat scrollbar
12 years ago
fcf35d3871
Removed the UI cursor sensitivity slider
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
daab4f55a3
Use Morrowind's fonts
12 years ago
885d12e867
updated hud layout
12 years ago
39bd8894a9
Bug 787
12 years ago
0c4a963132
Container UI rewrite
12 years ago
90b7df439f
Fix image buttons
12 years ago
f1413ca56b
Synced font code ranges.
12 years ago
ef9f0b2fc0
Fix size of quest index
12 years ago
78e6dab9d2
Dialogue history rewrite WIP
12 years ago
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
12 years ago
f1a659e2ac
Bugfix #730
12 years ago
2a42556aa5
Merge branch 'master' into HEAD
12 years ago
718af692c9
reworked journal to match bethesda's implemenation
12 years ago
85595245ab
Updated journal layout to match Bethesda's version more closely
12 years ago
c0102954f1
Add non-breaking space to font code range
12 years ago
ae3e4ecf8b
Finished enchanting
12 years ago
857f2b33db
Fix companion layout align
12 years ago
scrawl
Ivy Foster
Marc Zinnschlag
MiroslavR
Lazaroth
mrcheko
Sebastian Wick
Digmaster
Lukasz Gromanowski
Thomas
Gašper Sedej
Alex "rainChu" Haddad
PLkolek
Emanuel Guevel
Sebastian Wick
riothamus
Glorf
Nathan Jeffords