Commit Graph

566 Commits (cb8d111d36866b7ff98db3d80162f62908e95d45)

Author SHA1 Message Date
scrawl bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 12 years ago
scrawl 15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 12 years ago
scrawl a461b282c1 water ripples (experimental) 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 55769aaf91 Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled 12 years ago
scrawl 35015ef110 Change default settings to use no object shaders and per vertex lighting, as some lights in MW look clearly broken with per pixel lighting enabled (e.g. fireplace in census office, ghostfence) 12 years ago
scrawl bd8d793fec Removing gamma correction due to caused inconsistencies. 12 years ago
scrawl 111e38ef25 Revert "fog now distance based instead of depth"
This reverts commit 7ee038fdd7.
12 years ago
scrawl f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
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 a6c3e06e54 fixed fog in some cells 12 years ago
scrawl 5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
12 years ago
scrawl 44010974fc workaround for HLSL error X4579 12 years ago
scrawl c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
12 years ago
scrawl 11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl 7c22690116 Merge branch 'next' 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
Marc Zinnschlag 648b53ef93 removed unused launcher.cfg file 12 years ago
scrawl 234716daa6 finished spell creation 12 years ago
scrawl 9f821e5df2 fix shaders 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
Lukasz Gromanowski 5e9153e2b8 Issue #423: Wrong usage of "Version"
Remove "Version" line from openmw.desktop file (according to
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
it's not required).

Fixes #423

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
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 7ee038fdd7 fog now distance based instead of depth 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 73c69e8eda video playback 12 years ago
scrawl d393f551ed edit effect dialog 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl f45a6b71a9 Merge branch 'master' into next 12 years ago
Marc Zinnschlag 63772e2301 Merge remote-tracking branch 'scrawl/gamma' into next 12 years ago
scrawl dbf59d14dc water gamma correction 12 years ago
Nikolay Kasyanov 8a81a4a334 Fixed typo on openmw.cfg that caused launcher crash on OS X 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 d9f6072f02 gamma correct rendering & adjustment setting 12 years ago
scrawl 32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 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 ef6f033dd1 Merge branch 'multidata' 13 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
Marc Zinnschlag b0506e2220 re-enabling support for multiple data directories 13 years ago
Marc Zinnschlag f9693ab33a Merge remote-tracking branch 'scrawl/shadersystem' 13 years ago
scrawl 4ae0a5c02e fix silhouettes around objects above the water 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 976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
scrawl 8ac2d11f56 changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins 13 years ago
scrawl f58a4ada7a Merge branch 'master' into shadersystem 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 993c7150dc tweaked depth bias 13 years ago
scrawl 15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 13 years ago
scrawl 37c7becb07 some potential compability fixes 13 years ago
scrawl 3feb4ce61b terrain lod morph fix 13 years ago
scrawl 8c8228a15c fix terrain num lights setting 13 years ago
scrawl 3ebc6fd590 fixed a settings window bug 13 years ago
scrawl a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 13 years ago
scrawl 9f9183ff73 depth bias 13 years ago
scrawl bc7876e980 use alpha map for moons 13 years ago
scrawl f0b3142966 switch to glsl 1.2 13 years ago
scrawl 6bfcf2bc1b - exchanged the preprocessor again, no warnings now
- disable line directives for now, causing some trouble
13 years ago
scrawl 17a5c22c8f don't use globbing 13 years ago
scrawl acc5c3bbbf some fixes 13 years ago
scrawl 41791ccaa2 add file 13 years ago
scrawl 014396e80c remove the plugins.cfg files, do not enforce CG plugin 13 years ago
scrawl 21728020f6 fixed the water on local map 13 years ago
scrawl f5ffea4d4b new button, water timescale 13 years ago
scrawl e077814a8c water 13 years ago
scrawl 9d7470e14c temp commit 13 years ago
scrawl 739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 13 years ago
scrawl 778e59ee37 terrain as it was before, with about 4x less code 13 years ago
scrawl 29f91753f7 correction 13 years ago
scrawl 93c641efa7 terrain albedo 13 years ago
scrawl 7d5b94709d Merge branch 'master' into shadersystem
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
13 years ago
scrawl 16c2ea3a75 terrain colourmap 13 years ago
scrawl 1429c8d5cb copy&paste mistake 13 years ago
scrawl fb109ec7e2 use debug versions of ogre plugins in debug mode 13 years ago
scrawl 7731e9a6fa finished cleaning up sky 13 years ago
scrawl b8384162b6 merge 13 years ago
scrawl cd6e9986b6 forgot to add files 13 years ago
scrawl ad7383be43 sky 13 years ago
scrawl e0a99f104b settings tab "shadows" 13 years ago
scrawl 485adc8bdc shader mode button in settingswindow 13 years ago
scrawl 865bfc6f47 sync mrt_output setting 13 years ago
scrawl 1a9f59d5d4 shadows 13 years ago
scrawl 07fd9986ef accidently removed the map. 13 years ago
scrawl b803d0e949 converted shadow caster shader 13 years ago
scrawl 81d30ff63a temp commit 13 years ago
scrawl e517e75d09 update 13 years ago
scrawl a095572205 fixed some textures, started with sky 13 years ago
scrawl 71c865e2e9 let there be light 13 years ago
scrawl 33c48b9481 update 13 years ago
scrawl 8e683c2e05 vertex colors 13 years ago
scrawl 9bd888d9a1 transparency 13 years ago
scrawl f8e3213996 fog, mrt depth 13 years ago
scrawl de9b7a51de change glsl #version, remove CG from required libraries 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 246c6493df Merge branch 'master' into graphics 13 years ago
scrawl b886aea298 change console skin to MW_Window and set the selected object refID as window title 13 years ago
scrawl fbaedd2c3a new underwater colors 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 1b561ce91f Merge branch 'master' into next 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 8f667580bb ogre 1.8 final release compability fixes 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 343bbaf0fd integrated video settings in the settings file, the launcher is now useless 13 years ago
Marc Zinnschlag 7938566004 Merge remote branch 'scrawl/graphics'
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
scrawl 8f2c8bbea4 Merge branch 'master' into graphics 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 a54e52586b fix for a potential directx problem 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
scrawl 50d79a8815 Merge branch 'next' into tooltips 13 years ago
gugus 5603cb312c Objects can now be selected and follow mouse movements. 13 years ago
scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
13 years ago
scrawl e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 13 years ago
gugus 25432d97d2 trying to get selected item. Doesn't work. 13 years ago
Alexander "Ace" Olofsson f7a03b39c4 Some improvments for windows builds and installer 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 51a76eda92 Merge branch 'master' into graphics 13 years ago
scrawl 1de1b3e40e Merge branch 'master' into tooltips 13 years ago
scrawl 13b67faf2f adding more safety checks 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
Nikolay Kasyanov 582d7ab213 building & packaging improvements for OS X 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 ab4e03f05f Merge branch 'master' into tooltips 13 years ago
scrawl d37bc9cba8 basic mouse-over info for in-game objects 13 years ago