Marc Zinnschlag
|
030c733e2d
|
Merge branch 'master' into savedgame
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
|
2013-12-07 12:27:06 +01:00 |
|
scrawl
|
062ea627b3
|
Add parallax mapping for objects
|
2013-12-05 15:51:07 +01:00 |
|
scrawl
|
69c0bb1723
|
Add normal, specular & parallax mapping for terrain
|
2013-12-05 15:51:01 +01:00 |
|
scrawl
|
f695deb29d
|
Remember window positions
|
2013-12-05 15:46:23 +01:00 |
|
scrawl
|
5f1878eb54
|
Add specular mapping (uses alpha channel of diffuse texture)
|
2013-12-03 18:41:45 +01:00 |
|
scrawl
|
147bc447a5
|
Add specular lighting for directional light to objects shader
|
2013-12-03 16:07:07 +01:00 |
|
Marc Zinnschlag
|
04b1657d98
|
Merge branch 'openmw-27'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
|
2013-11-30 09:45:41 +01:00 |
|
Marc Zinnschlag
|
eea433f141
|
restore last played character selection across sessions
|
2013-11-26 10:37:58 +01:00 |
|
scrawl
|
bda28e2ed0
|
Increase size of item selection dialog
|
2013-11-26 06:42:37 +01:00 |
|
scrawl
|
2e87cbc231
|
Add basic functionality to SaveGameDialog
|
2013-11-21 20:34:34 +01:00 |
|
Bret Curtis
|
862f2f0883
|
added keywords for debian and switch to dyn libs in travis
|
2013-11-20 10:16:51 +01:00 |
|
scrawl
|
3452bd2e0b
|
Add glow effect for enchanted items
|
2013-11-20 00:13:12 +01:00 |
|
scrawl
|
cab535dd69
|
Implement magic item recharging via soulgem use
|
2013-11-19 06:48:47 +01:00 |
|
Lars Söderberg
|
35434dc053
|
German fixes
Fixes for German language.
|
2013-11-16 23:15:51 +01:00 |
|
Nikolay Kasyanov
|
df5b52b45b
|
OpenCS.app icon & bundle properties
|
2013-11-10 20:11:53 +04:00 |
|
Marc Zinnschlag
|
fb417f9880
|
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
|
2013-11-07 09:19:55 +01:00 |
|
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 |
|