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
33c36bf0df
Merge remote-tracking branch 'scrawl/master'
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
7a5f73de9e
added navigation mode icons to buttons
11 years ago
bb741eb8d7
Merge remote-tracking branch 'crysthala/master'
11 years ago
f25e0b13b2
render window controls icons
...
eyeball dude: first person
flying eye: free cam
orbit2: orbiting cam
11 years ago
7991dfb907
Merge remote-tracking branch 'scrawl/master'
11 years ago
c9cd7fb6b7
Merge branch 'scripts'
11 years ago
fdc6dd6985
Shader compatibility fixes for GLSL ES
11 years ago
5e543ac806
added script doortestwarp to blacklist
11 years ago
4421e7a5cc
added lighting mode toolbar icons
11 years ago
151ef14b67
some cleanup
11 years ago
358c76a049
Merge remote-tracking branch 'crysthala/master'
11 years ago
919632a505
render lighting icons
11 years ago
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
11 years ago
f55084463b
added MockChangeScript to script blacklist
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
d87630b41a
blacklisting for scripts in OpenMW
11 years ago
28a0899d2b
Implement difficulty scaling ( Fixes #1505 )
11 years ago
07d0f4458d
Rotate clouds/particles to come from red mountain ( Fixes #245 )
11 years ago
44fd526c98
Don't show disposition bar for creatures
11 years ago
85965bfd47
Merge remote-tracking branch 'scrawl/master'
11 years ago
8eab3abb15
Fix initial view offset for large world maps ( Fixes #1523 )
11 years ago
30f8e279ed
Merge remote-tracking branch 'scrawl/master'
11 years ago
5645c9185b
Fix location of local data path
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
2683aa9503
Merge remote-tracking branch 'filkry/bug640_luminescent_water'
11 years ago
cfea7736d9
WIP fix
...
Bug is fixed, but appears to have broken vision underwater. Notes:
+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
11 years ago
5f5c0c5bff
Remove an unused setting
11 years ago
468db7a9c4
Remove terrain limit warning text that no longer applies
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
a3752da79f
Store Always Run control state in settings
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
5df9ff8e2c
Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
...
Fixes installing to /usr/local (Bug #1378 )
11 years ago
a1bdf20958
Make trade balance label editable
11 years ago
d26f756c53
Fix several edit boxes not receiving mouse input
11 years ago
2a6a26c0d0
Minor fixes
11 years ago
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
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
f01c3e0eac
Fixes #1037 : Change default footstep volume to match vanilla
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
a17cb1f389
Fixed opencs.ini formatting
11 years ago
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
58d868d56a
Change default water setting (current fps is low enough as it is without this setting enabled)
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
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
11 years ago
a2c129f655
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
21c406316f
Working on the Settings tab: start the importer/wizard
11 years ago
cfe66abbc5
Started working on the settings tab
11 years ago
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
11 years ago
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
11 years ago
ef38fae09d
Merge remote-tracking branch 'upstream/master' into wizard
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
0e78ffe8c0
Add option to disable SDL's "minimize on focus loss" in fullscreen
11 years ago
0a17245633
Refactored settings window
11 years ago
5c34823bb0
added some placeholder icons
11 years ago
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
11 years ago
9e5e19f9cb
Improved existing installation handling
11 years ago
ae5f783a16
Added some eye-candy to the wizard: a watermark and a placeholder icon
11 years ago
09ba547630
use tool buttons with icons
11 years ago
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
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
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
11 years ago
e8170adde5
Some minor changes, implemented suggestions
11 years ago
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
11 years ago
2afe3f3e57
Introduced multitype icon.
11 years ago
975f0e05b4
Fixes #1157 (attribute layout issue)
11 years ago
f608ceeffc
Fixes #1158 (Armor rating label issues)
11 years ago
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
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
1262eab03a
Added some nice error messages to the installation process
11 years ago
802448b217
Added a settings page to the launcher
11 years ago
cdbf5c68b0
Implemented selection of installation media and added forgotten file
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
fa186f5ec1
Added version information to the launcher
11 years ago
0f7f3391f7
WIP: Working on the installation of addons
11 years ago
671d0e46e2
Merge remote-tracking branch 'nobrakal/patch-1'
11 years ago
e638b8b8cb
Update openmw.desktop
...
Fix bad output of desktop-file-validate for openmw.dektop
11 years ago
278876d6fb
Update opencs.desktop
...
Fix bad output of desktop-file-validate for opencs.dektop
11 years ago
c64dc2c831
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
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
d97615d5d8
Support separate specular maps
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
94cdc1efd2
Enable mipmap generator for 1.9+
11 years ago
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
11 years ago
27b45dd3cd
Remove unused input
11 years ago
e68e2f82a2
Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.
11 years ago
0050e6e67b
Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.
11 years ago
74e902330f
Fix a terrain shader issue
11 years ago
40486370d9
Working on the Unshield functionality
11 years ago
3a37761d76
Some minor cleanups
11 years ago
445f96434e
Added Morrowind.ini detection logic
11 years ago
6a3eb3b355
Better way of reversing layer UV.
11 years ago
30710bad70
Modified components widget so the checked items can be stored for all pages to access
11 years ago
c82f0ec35f
Implemented the language selection page
11 years ago
d7f9604140
WIP: Working on the installation selection and added the ui for the language page
11 years ago
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
11 years ago
8162f8370b
Added all the pages to the wizard
11 years ago
f458f0c6c1
Added the Wizard .ui/resource files and some basic source to get started
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
062ea627b3
Add parallax mapping for objects
11 years ago
69c0bb1723
Add normal, specular & parallax mapping for terrain
11 years ago
f695deb29d
Remember window positions
11 years ago
5f1878eb54
Add specular mapping (uses alpha channel of diffuse texture)
11 years ago
147bc447a5
Add specular lighting for directional light to objects shader
11 years ago
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
11 years ago
eea433f141
restore last played character selection across sessions
11 years ago
bda28e2ed0
Increase size of item selection dialog
11 years ago
2e87cbc231
Add basic functionality to SaveGameDialog
11 years ago
862f2f0883
added keywords for debian and switch to dyn libs in travis
11 years ago
3452bd2e0b
Add glow effect for enchanted items
11 years ago
cab535dd69
Implement magic item recharging via soulgem use
11 years ago
35434dc053
German fixes
...
Fixes for German language.
11 years ago
df5b52b45b
OpenCS.app icon & bundle properties
11 years ago
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
11 years ago
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
11 years ago
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
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
dec1483fa4
Merge branch 'saving' into openmw-27
11 years ago
23eaf90846
Breath meter flashes when drowning
11 years ago
9b483c3ae3
Fix for file path issues
11 years ago
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
11 years ago
16d87ea1d1
Merge branch 'master' into esxSelector
11 years ago
f9591ddda6
Reimplemented constentselector view class
11 years ago
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
11 years ago
ce2c558257
Missed a file.
11 years ago
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
11 years ago
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
11 years ago
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
11 years ago
cafea438bd
Added missing light filter.
11 years ago
762cbf6278
Changed gauntlets filter. It showes now both gauntlets and bracers.
11 years ago
3a3f2a37c8
Add cut, copy & paste of text
11 years ago
17950210fa
Merge branch 'master' into esxSelector
11 years ago
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
ae5e8b95ff
Solving Issue912
11 years ago
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
11 years ago
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
7b7dfa122d
Merge branch 'master' into esxSelector
11 years ago
244e581952
Finished implementing drag / drop
...
refactored datafilesmodel (now contentmodel)
refactored esmfil
11 years ago
2dc3c0ae4f
integrated startup icons
11 years ago
7ecf020fcb
Merge pull request #1 from zinnschlag/master
...
Icons for startup window.
11 years ago
294bf6c194
Icons for startup window (check raster/startup).
11 years ago
a6e7cf9a8c
Implementing drag and drop
11 years ago
5a792b10b9
fixed local openmw.cfg file
11 years ago
f4e9199f78
Various chargen tweaks
12 years ago
e5ce94c336
Fix the water being affected by fog on the map
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
3e174df856
Adding nomadic1 icons. Wooho!
12 years ago
fb7273e14a
Merge remote-tracking branch 'sirherrbatka/icons-svg'
...
Conflicts:
.gitignore
12 years ago
8cd2d89e4e
Merge branch 'icons-svg' of https://github.com/sirherrbatka/openmw into icons-svg
12 years ago
44b4c642b7
Added alternative book icon in scalable folder. No raster just yet. I'm not sure if it will replace old icon.
12 years ago
45083fc89e
Chargen updates
12 years ago
e33239eae5
Various fixes
12 years ago
c57fb4fc4f
Delete .directory
12 years ago
717e04cac5
More icons. At last!
12 years ago
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
12 years ago
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
12 years ago
ecf7786d11
terrain_num_lights was removed
12 years ago
b52645bf2a
Fixes to accommodate master/plugin loading
12 years ago
8c8653160d
Crash fix, material fix
12 years ago
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
12 years ago
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
e614ec3353
Fixing profile code in progress...
12 years ago
f6217f9c6a
Moved esx selector classes out of global namespace
12 years ago
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
12 years ago
66e50343ad
Fixed row-selection/check feature
12 years ago
a9db983233
Fixing row-click selection
12 years ago
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
12 years ago
49c4e1bf9e
Removed master table widget
12 years ago
84e5c2610a
Implemented combobox for game file selection
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
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
12 years ago
add3bb9904
Add sneaking indicator UI widget
12 years ago
f6f5867256
Fixes the FPS bar
12 years ago
0923306404
fixed data-local path
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
b57042cac3
Merge remote-tracking branch 'scrawl/master'
12 years ago
d6faad3dd2
Same fix for the book window
12 years ago
4a562b585c
Fix journal window with background image != 512x256
12 years ago
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
12 years ago
bb049806df
Repo permissions commit fix #2
12 years ago
f31e5ef851
new files (repo commit fix #2 )
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
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
8f4fd8202e
Deleted ".directory" text files.
...
Files were hidden files added by dolphin.
12 years ago
acaba78a11
wrong number
12 years ago
357974a429
more minor stuff
12 years ago
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
75d7d3b7fc
Added base.png
12 years ago
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
12 years ago
965d93ea40
Pull to get latest icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
12 years ago
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
12 years ago
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
c174f57a2f
Git changes show that it should upload all the files this time. Let's
...
hope…
12 years ago
a5d9d3fd7a
Updated status icons from sirherrbatka
12 years ago
97cfbc31b5
Merge color icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
12 years ago
fcf35d3871
Removed the UI cursor sensitivity slider
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
bd08677a7f
Merge branch 'openmw24'
12 years ago
daab4f55a3
Use Morrowind's fonts
12 years ago
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
09ab541102
Colored status icons. Hopefully everybody loves watercolors!
12 years ago
e403773e95
Simply removed background from status icons.
12 years ago
94db7cdcfe
Added png's of icons
12 years ago
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
12 years ago
5a40594b0d
Merge
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
12 years ago
MiroslavR
scrawl
Marc Zinnschlag
crysthala
Fil Krynicki
pvdk
graffy76
Lars Söderberg
Thomas
Marek Kochanowicz
Gašper Sedej
nobrakal
Bret Curtis
Nikolay Kasyanov
Alex "rainChu" Haddad
sirherrbatka
PLkolek
Emanuel Guevel
Sebastian Wick
Marek Kochanowicz