teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
10610 commits 34 branches 0 tags 66 MiB
Commit graph

701 commits

Author SHA1 Message Date
Marek Kochanowicz
5c34823bb0 added some placeholder icons 2014-03-20 13:59:00 +01:00
Marek Kochanowicz
f3475f7ef5 Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog 2014-03-18 19:24:10 +01:00
Marek Kochanowicz
09ba547630 use tool buttons with icons 2014-03-17 15:35:36 +01:00
scrawl
cd0c283795 Add text shadow to version text for better readability 2014-03-15 15:14:59 +01:00
Gašper Sedej
06e02ed77f Added version and revision number to mainmenu 2014-03-12 10:53:56 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
scrawl
975f0e05b4 Fixes #1157 (attribute layout issue) 2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc Fixes #1158 (Armor rating label issues) 2014-02-05 05:18:10 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Marc Zinnschlag
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
 2014-02-01 18:16:32 +01:00
scrawl
292d692b40 Loosen window size restrictions 2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d Use GMSTs for levelup 2014-01-29 15:37:26 +01:00
scrawl
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
 2014-01-24 18:28:35 +01:00
pvdk
fa186f5ec1 Added version information to the launcher 2014-01-22 17:51:10 +01:00
Marc Zinnschlag
671d0e46e2 Merge remote-tracking branch 'nobrakal/patch-1' 2014-01-16 12:18:54 +01:00
nobrakal
e638b8b8cb Update openmw.desktop 
Fix bad output of desktop-file-validate for openmw.dektop
 2014-01-16 08:44:56 +01:00
nobrakal
278876d6fb Update opencs.desktop 
Fix bad output of desktop-file-validate for opencs.dektop
 2014-01-16 08:41:29 +01:00
scrawl
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. 2014-01-11 00:51:03 +01:00
scrawl
2744cde40f Use a few additional GMSTs 2014-01-10 22:27:31 +01:00
scrawl
d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 2014-01-09 00:06:24 +01:00
scrawl
d97615d5d8 Support separate specular maps 2014-01-07 18:05:44 +01:00
scrawl
780bf5a2cd Implement pickpocket detection. Play a voiced dialogue entry when detected. 2014-01-07 03:01:33 +01:00
scrawl
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
 2014-01-06 00:23:17 +01:00
scrawl
af3569665c Remove unused font 2014-01-04 05:19:08 +01:00
scrawl
1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 2014-01-04 05:13:53 +01:00
scrawl
94cdc1efd2 Enable mipmap generator for 1.9+ 2013-12-31 00:54:40 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
27b45dd3cd Remove unused input 2013-12-28 16:34:32 +01:00
scrawl
e68e2f82a2 Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty. 2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture. 2013-12-26 20:53:51 +01:00
scrawl
74e902330f Fix a terrain shader issue 2013-12-26 20:53:51 +01:00
scrawl
6a3eb3b355 Better way of reversing layer UV. 2013-12-19 01:31:12 +01:00
scrawl
37a7ee8fcd Set alpha value of character animations according to Invisibility / Chameleon effects. 2013-12-08 23:05:21 +01:00
scrawl
742e0e014d Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline. 2013-12-07 14:15:51 +01:00
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
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