Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
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
2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
ce2c558257
Missed a file.
2013-10-21 18:40:20 +02:00
Marc Zinnschlag
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
2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
cafea438bd
Added missing light filter.
2013-10-20 09:44:10 +02:00
Marek Kochanowicz
762cbf6278
Changed gauntlets filter. It showes now both gauntlets and bracers.
2013-10-19 18:51:36 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
graffy76
17950210fa
Merge branch 'master' into esxSelector
2013-10-07 06:52:20 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
graffy76
244e581952
Finished implementing drag / drop
...
refactored datafilesmodel (now contentmodel)
refactored esmfil
2013-09-19 06:53:09 -05:00
Marc Zinnschlag
2dc3c0ae4f
integrated startup icons
2013-09-09 09:41:43 +02:00
sirherrbatka
7ecf020fcb
Merge pull request #1 from zinnschlag/master
...
Icons for startup window.
2013-09-08 11:14:41 -07:00
Marek Kochanowicz
294bf6c194
Icons for startup window (check raster/startup).
2013-09-08 12:09:36 +02:00
graffy76
a6e7cf9a8c
Implementing drag and drop
2013-09-07 15:57:40 -05:00
Marc Zinnschlag
5a792b10b9
fixed local openmw.cfg file
2013-09-07 09:30:40 +02:00
Lars Söderberg
f4e9199f78
Various chargen tweaks
2013-08-29 16:21:11 +02:00
scrawl
e5ce94c336
Fix the water being affected by fog on the map
2013-08-27 16:45:51 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marek Kochanowicz
3e174df856
Adding nomadic1 icons. Wooho!
2013-08-27 14:49:29 +02:00
Marc Zinnschlag
fb7273e14a
Merge remote-tracking branch 'sirherrbatka/icons-svg'
...
Conflicts:
.gitignore
2013-08-26 14:52:26 +02:00
Marek Kochanowicz
8cd2d89e4e
Merge branch 'icons-svg' of https://github.com/sirherrbatka/openmw into icons-svg
2013-08-26 10:14:35 +02:00
Marek Kochanowicz
44b4c642b7
Added alternative book icon in scalable folder. No raster just yet. I'm not sure if it will replace old icon.
2013-08-26 10:12:43 +02:00
Lars Söderberg
45083fc89e
Chargen updates
2013-08-25 23:15:29 +02:00
Lars Söderberg
e33239eae5
Various fixes
2013-08-25 23:15:20 +02:00
sirherrbatka
c57fb4fc4f
Delete .directory
2013-08-24 19:20:12 +02:00
Marek Kochanowicz
717e04cac5
More icons. At last!
2013-08-23 12:48:34 +02:00
scrawl
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
2013-08-21 17:26:11 +02:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
scrawl
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
2013-08-19 20:34:20 +02:00
graffy76
e614ec3353
Fixing profile code in progress...
2013-08-18 17:11:23 -05:00
