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
792f3aaa86
Rastered status icons. ingredients, light, and book icon without emblem.
12 years ago
b31f0dfe1f
Raster status icons.
12 years ago
de5a08a07d
Version should be 100 for GLSLES
12 years ago
c2c88acc7b
GLSLES: only the fragment shader needs precision explicitely set.
12 years ago
cc747d8ae4
GLSL ES: precision qualifiers are required
12 years ago
1e7cf4ae1c
GLES2 experiment
12 years ago
885d12e867
updated hud layout
12 years ago
39bd8894a9
Bug 787
12 years ago
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
12 years ago
60893f4b00
New icons from nomadic1 finally. Including dialogue-greetings AKA Ave
...
Caesar icon.
12 years ago
0c4a963132
Container UI rewrite
12 years ago
90b7df439f
Fix image buttons
12 years ago
f6203cac2a
update for master
12 years ago
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
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
03f4e91ceb
Unrelated shadows fix
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
03af0a8ac9
Adding more icons from nomadic1, replacing older with recently redoned.
12 years ago
23b477a938
Fix normal maps with spaces in filename not getting loaded
12 years ago
2c70074dd7
Fix combinedAlpha
12 years ago
9d29921913
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
0e7d555cdf
Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
12 years ago
01a1a0b846
Merge remote-tracking branch 'zini/master' into nifogre
...
Conflicts:
components/nifogre/ogrenifloader.cpp
12 years ago
343e2027af
Support NIF detail maps
12 years ago
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
88c81bfb24
Apply polygon_mode to objects
12 years ago
4daaa4030d
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
12 years ago
e50b6b1cfe
Apply texture matrix 0 in the object shader
12 years ago
75b462b974
If alpha rejection was forced, we also need to force depth_write and depth_check
12 years ago
01314b7c08
addin more nomadic icons
12 years ago
8dd7f0c53a
Merge remote-tracking branch 'scrawl/normalmap'
12 years ago
a9b56eedc3
Support NIF "glow maps", which are basically an emissive channel.
12 years ago
ae3e4ecf8b
Finished enchanting
12 years ago
5625d73d84
Bump texture support
12 years ago
857f2b33db
Fix companion layout align
12 years ago
bc6e1fd981
Add missing files
12 years ago
b0199c703c
Companion UI
12 years ago
49b5b90cd5
png icons from nomadic and my rastered icons in raster folder.
12 years ago
faf293bd6d
Removing old directory.
12 years ago
a031c77619
Improved enchanting layout
12 years ago
a359ba6a2f
Merge remote-tracking branch 'scrawl/graphics'
12 years ago
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
f93cefa201
Changed Y position of the textboxes
12 years ago
35a6ca010a
Adjusted textbox height in race menu
12 years ago
a39c129954
Clamp individual light attenuation at 1
12 years ago
7ad1e962e0
Merge branch 'master' into graphics
12 years ago
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
12 years ago
623f9c2a58
A new icon for misc iteams. I really hope that scales will do.
12 years ago
cf0c55b37f
New random-item. Looks a lot better.
12 years ago
37a1fb6b7c
Adding ingredient.svg icon. I need to work on random-item and scrap container icon.
12 years ago
b7f95cd271
Random item (dice). Container.svg needs to be scraped, I'm afraid.
12 years ago
3b5e202b13
Update the status icons. X as removed.svg and backgrounds for status icons stolen from oxygen emblems :P It gives clear look for it.
12 years ago
e97319c0bb
Drawer as container icon looks actually quite good IMHO.
12 years ago
cb58ee126e
Drawer as container icon. Look a little better the old crappy chest but changes are needed.
12 years ago
59233e54b2
changing potion.svg according to pvdk sugestions
12 years ago
43e863b020
Forgot to place the icons in the middle of the page.
12 years ago
001b56714a
Adding new status icons svg files. Qt svg does not allow blur to be used so I think that we should make png files of it but first information on the actual resolution needed is required...
12 years ago
7beda509fe
Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects
12 years ago
a2ca679beb
Added PC repair feature
12 years ago
df8600e636
New anvil icon (repair.svg), edited weapon.svg (added new gradient on dagger blade) and light source.svg (clear to see what happend). container icon is still work in progress.
12 years ago
20774f8f81
Added merchant repair feature
12 years ago
e46097cd2e
Icons. Currently activator, apparatus, book, container (work in progress), light source, potion, static, weapon.
12 years ago
11aed7474e
Shadow cast on water
12 years ago
4cbb202306
Several tooltip fixes
12 years ago
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
12 years ago
1666bc7740
Armor rating
12 years ago
c0b0227e8a
enchanting
12 years ago
83932ebfe8
HLSL shader fix
12 years ago
fdcbdbf35d
Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay
12 years ago
30f3fbac3c
Fixed paths to OpenMW icons
12 years ago
4c588cbab6
Levelup dialog is now dynamic; added level descriptions
12 years ago
31ba332647
Moved Windows icon to files/launcher
12 years ago
75f86f3a85
Some changes to the stylesheet and other small GUI improvements
12 years ago
64c5af314d
Removed grayish pixel from the clear button, looks weird with dark colors
12 years ago
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
12 years ago
5e13614e08
Improved appearance of combobox and when using dark color themes
12 years ago
391bad2ccb
put .desktop file in the right directory
12 years ago
2a9d15cd9f
Merge remote-tracking branch 'scrawl/master'
12 years ago
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
12 years ago
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
12 years ago
7504ae675b
Implemented a file dialog for the editor using launcher .ui
12 years ago
7f8d659f3c
Fix transparency sorting
12 years ago
ff30bef3b2
Mipmap fix
12 years ago
2486ec6cb9
Material fixes (vertex colors, alpha)
12 years ago
8a887a0aef
Merge remote-tracking branch 'potatoesmaster/tradewindow'
12 years ago
ac810faa7e
Merge remote-tracking branch 'scrawl/master'
12 years ago
9f0bd95ef1
Added BM trees to transparency overrides
12 years ago
cab5315a8e
Disable mipmaps generation
12 years ago
215d45aaf7
Make trade window's "max sale" button clickable
...
The HBox widget above it was stealing the input events.
12 years ago
f1d35b73b8
Cleanup
12 years ago
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
12 years ago
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
ac0a23a68d
Fix initialization problem
12 years ago
cf87708c1f
Magic effect icons for spells
12 years ago
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
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
0b629791a8
reverting loading bar layout
12 years ago
f77ace0885
Removed the "hack" mygui.png and misc fixes for this.
12 years ago
bd597f07ab
Centered the loading text
12 years ago
8966e88050
Fix shadows
12 years ago
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
12 years ago
284ba58e1e
Z-up conversion: global map, shader fix
12 years ago
2e7bc1a368
Z-up conversion: local map, fix tcg
12 years ago
3ef952172d
Z-up conversion: water, sky
12 years ago
8aff033a0c
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
12 years ago
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
e32646ee50
Prettier repeated borders.
12 years ago
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
12 years ago
0d6a3367d3
Water shader no longer depends on object shaders being enabled
12 years ago
7046e7ae3d
Water fog fix
12 years ago
01102f9c73
Don't emit if there wasn't enough movement
12 years ago
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
5e1ec9e128
improved book window layout
12 years ago
3dc28baa28
Remove "PinToggle" event from layout file
12 years ago
2dea86bbc7
Make the "lock window" button appealing
12 years ago
3ba3c71556
Make the "lock window" button to change state visually
12 years ago
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
12 years ago
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
42883ec64b
cleanup
12 years ago
ceefae81e8
fix for the opencs icon
12 years ago
492e0f2ccf
Switched objects shaders to vertex lighting, to accomodate badly placed lights in morrowind.
...
Fixed a very obvious land <-> water seam.
12 years ago
499f3ac0d1
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
12 years ago
3772cd9257
Refraction can be disabled separately now
12 years ago
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
e949765922
cloud blending now as before (0 -> 0.25 -> 1)
12 years ago
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
12 years ago
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
12 years ago
a461b282c1
water ripples (experimental)
12 years ago
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
af9e126487
Add unicode number for ellipsis (…) to code range
12 years ago
aa514a53d9
Console font change to provide possibility to show cyrillic symbols
12 years ago
30136eb449
Update settings UI
12 years ago
55769aaf91
Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled
12 years ago
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
bd8d793fec
Removing gamma correction due to caused inconsistencies.
12 years ago
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
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
a6c3e06e54
fixed fog in some cells
12 years ago
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
44010974fc
workaround for HLSL error X4579
12 years ago
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
12 years ago
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
12 years ago
7c22690116
Merge branch 'next' into globalmap
12 years ago
5fdc7ad809
forgot to add file
12 years ago
ace9ee9c83
persuasion dialog
12 years ago
38828acac9
transparent overlay
12 years ago
648b53ef93
removed unused launcher.cfg file
12 years ago
234716daa6
finished spell creation
12 years ago
9f821e5df2
fix shaders
12 years ago
0a19b56031
fix gold label
12 years ago
e80394c0b5
fix training limit
12 years ago
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
1a2034b4dd
training window
12 years ago
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
f154031e54
last bits of the gui
12 years ago
1f4de03613
oooups
12 years ago
85d9357e3a
Travel GUI
12 years ago
025e820703
abstracted code and use it in enchanting window as well
12 years ago
1c0dd3ccc5
some editing code
12 years ago
7ee038fdd7
fog now distance based instead of depth
12 years ago
636f297f10
enchant
12 years ago
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
12 years ago
73c69e8eda
video playback
12 years ago
graffy76
Marc Zinnschlag
sirherrbatka
Marek Kochanowicz
Lars Söderberg
scrawl
PLkolek
Emanuel Guevel
Sebastian Wick
Marek Kochanowicz
pvdk
riothamus
Glorf
Nathan Jeffords
Chris Robinson
vorenon
Sandy Carter
lazydev
scrawl
Lukasz Gromanowski
gugus