mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 16:19:56 +00:00
Code Issues Releases Wiki Activity
9788 commits 38 branches 54 tags 122 MiB
Commit graph

658 commits

Author SHA1 Message Date
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
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
graffy76
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
 2013-08-18 09:34:33 -05:00
graffy76
66e50343ad Fixed row-selection/check feature 2013-08-18 08:54:51 -05:00
graffy76
a9db983233 Fixing row-click selection 2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
49c4e1bf9e Removed master table widget 2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
Lars Söderberg
317d565133 Larger area for window corner diagonal arrows 2013-08-10 08:15:58 +02:00
Lars Söderberg
5b060ffe8d Varios standardizations, fixes and optimizations 2013-08-09 23:21:25 +02:00
Lars Söderberg
73fb682718 Made the alchemy window resizable 2013-08-09 23:20:51 +02:00
Lars Söderberg
0fabf1fe2e Updated Alchemy Window 2013-08-08 01:47:19 +02:00
Lars Söderberg
f7ed2ef55f Standardize align values 
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
 2013-08-07 21:43:19 +02:00
PLkolek
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.
 2013-08-07 16:46:46 +02:00
scrawl
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 2013-08-07 01:34:17 +02:00
Emanuel Guevel
add3bb9904 Add sneaking indicator UI widget 2013-08-03 02:40:01 +02:00
Lars Söderberg
f6f5867256 Fixes the FPS bar 2013-07-31 19:28:11 +02:00
Marc Zinnschlag
0923306404 fixed data-local path 2013-07-31 13:55:56 +02:00
scrawl
3961c276b8 Added enemy health meter 2013-07-30 06:00:20 +02:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
scrawl
8407e2b3aa Fixes the console sometimes receiving text after it was closed 2013-07-14 23:54:28 +02:00
Marc Zinnschlag
b57042cac3 Merge remote-tracking branch 'scrawl/master' 2013-07-13 20:52:30 +02:00
scrawl
d6faad3dd2 Same fix for the book window 2013-07-13 20:26:35 +02:00
scrawl
4a562b585c Fix journal window with background image != 512x256 2013-07-13 20:24:19 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
graffy76
f31e5ef851 new files (repo commit fix #2) 2013-07-10 17:30:21 -05:00
scrawl
58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 2013-07-06 16:40:57 +02:00
Sebastian Wick
26bd2a5301 use the new scrollbar; range dependent step size; fix 2013-07-05 20:28:46 +02:00
Sebastian Wick
e3d8bdbafe autorepeat scrollbar 2013-07-02 17:29:47 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
8f4fd8202e Deleted ".directory" text files. 
Files were hidden files added by dolphin.
 2013-06-23 21:28:58 -05:00
Sebastian Wick
acaba78a11 wrong number 2013-06-23 23:13:54 +02:00
Sebastian Wick
357974a429 more minor stuff 2013-06-23 21:34:41 +02:00
Sebastian Wick
a1fea97c3b use SDL for resolution -> multimonitor support 2013-06-23 03:49:30 +02:00
graffy76
75d7d3b7fc Added base.png 2013-06-21 12:28:07 -05:00
graffy76
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
 2013-06-20 18:06:25 -05:00
graffy76
965d93ea40 Pull to get latest icons 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-06-20 16:13:01 -05:00
graffy76
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
 2013-06-17 06:45:44 -05:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
Marek Kochanowicz
c174f57a2f Git changes show that it should upload all the files this time. Let's 
hope…
 2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a Updated status icons from sirherrbatka 2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5 Merge color icons 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-06-15 06:46:27 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00