973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
8 years ago
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
49a78d8462
Merge pull request #105 from OpenMW/master
...
Add OpenMW changes up to 19 Nov
8 years ago
7e5ba4d435
Fix default values of some GMSTs
8 years ago
48ca4d29bc
Merge pull request #99 from OpenMW/master
...
Add OpenMW commits up to 7 Nov
8 years ago
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
8 years ago
adb49b7c7d
Add New GUI dialog: ListBox
...
Example:
local GUI_LISTBOX = 42
function OnPlayerSendMessage(pid, message)
if message == "/lb" then
local items = "consectetur adipiscing elit\nsed do eiusmod tempor incididunt ut labore\net dolore magna aliqua." -- items can be separated through newline
local label = "Lorem ipsum dolor sit amet"
tes3mp.ListBox(pid, GUI_LISTBOX, label, items)
end
end
function OnGUIAction(pid, idGui, data)
if idGui == GUI_LISTBOX then
print("ID: " .. idGui .. " data: " .. tostring(data)) -- if value higher than last item id
end
end
8 years ago
47ebd24b4a
Merge pull request #79 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
76ddd9bebb
Add a setting for merchant auto-equipping prevention
8 years ago
77bc807305
Attenuate the light ambient in lighting.glsl ( Fixes #3597 )
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
e7154c3f7c
Add the ItemShadow to various other skins
8 years ago
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
8 years ago
08a5cdc4f3
Make tes3mp config files less confusing
8 years ago
fbfa9bccd0
added master address to client config
8 years ago
f93e382b8b
Use tes3mp icon for executable, part 2
8 years ago
d6083552f1
Add tes3mp icon
8 years ago
a2dbeb6c95
Share skills and attributes correctly upon logging in, and fix grammar
8 years ago
35991fcd15
Add logger to client
8 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
a92ef8b6bd
Some fixes
8 years ago
c695923825
Added master server stuff
8 years ago
f291aabc4b
Fix shader compile error for objects without diffuse map
9 years ago
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
9 years ago
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
9 years ago
723a109fcd
Move new logo to correct location
9 years ago
166bc255a3
Add logo to repo
9 years ago
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
131887c981
Delete script.pwn
...
Not for this repo.
9 years ago
ff3b7de0e7
Update gamecontrollerdb.txt from upstream.
9 years ago
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
bc04989448
Remove unused uniforms
9 years ago
8e23c37668
Flip the parallax offset Y component based on tangent parity (Bug #3440 )
9 years ago
6f5b68859f
Comment out UV test that is not working
9 years ago
6a1fd05074
Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440 )
9 years ago
aa5a643e3b
Fix incorrect multiplication order of TBN matrix (Bug #3440 )
9 years ago
091e1bf25d
improved scene element visibility buttons
9 years ago
5c8756cb2c
Add composite icon for exterior cell controls in scene view, along with source SVG and a bash script that I used to assemble all possible status combinations
9 years ago
c2c81c6b1a
Reversed the location of original state and current state in scene view icon. This way it's much more obvious, assuming the icon stays on the left of the actual landscape view. See https://forum.openmw.org/viewtopic.php?p=38971#p38971 for more info
9 years ago
f3e9fd49f3
Don't add the autodetected mw path in global config file
...
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
9 years ago
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
9 years ago
6f31b3d79f
Add parallax mapping for objects
9 years ago
b59b2c6d6d
Move to parallax.glsl
9 years ago
b4dda045a6
Pass the tangent in object space
9 years ago
157c11398d
Add terrain parallax mapping
9 years ago
563f44b823
Merge remote-tracking branch 'origin/master'
9 years ago
9d985d883b
added grid icon
9 years ago
6e7c6fdd7e
Implement NiTexturingProperty::DecalTexture
9 years ago
414c19f717
Fix detailMapUV bug
9 years ago
5e105da3ba
Generate texture coordinates per-pixel when normal map + environment map are used
9 years ago
900b522d13
Rename viewPos to viewDirection
9 years ago
09684adeff
Update settings documentation
9 years ago
0db7163363
Add specular mapping for terrain
9 years ago
f01e8a6950
Add specular mapping for objects
9 years ago
5cf2441b10
ShaderVisitor: support automatic recognition of normal maps based on file pattern
...
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
9 years ago
e2dc46c92e
Update settings
9 years ago
6000e48bba
Add terrain shaders and normal map support
...
Textures with _n filename suffix are automatically recognized as terrain normal maps.
9 years ago
5e12a1b4ef
Add enchanted item glow to the shader
9 years ago
1232607385
Remove pointless widget names in settings layout file
9 years ago
a73512afb7
Add shader settings to settings.cfg
9 years ago
3969675afa
Remove unused settings
9 years ago
e5a37a7023
Add normal map code
9 years ago
18e80d5627
Add per-pixel lighting code
9 years ago
1223bca3d4
Move doLighting to separate file
9 years ago
456816f707
Use diffuse.a / vertex.a, use material emission
9 years ago
5fd84074c5
Reimplement detailMap, darkMap and emissiveMap
9 years ago
e845c576d4
Use the texture matrix
9 years ago
3859c58a8a
Assign gl_ClipVertex in the vertex shader to make clip planes work
9 years ago
9376811213
Vertex lighting shader
9 years ago
044e0a829a
Add fog
9 years ago
a9ad1b09e2
Introduce ShaderManager & ShaderVisitor
...
Actual shaders still to be written.
9 years ago
7f89bb273a
Add 'reflect actors' setting for the water shader, default off
9 years ago
6fb0022b35
Update preloading settings
...
Disable 'preload fast travel' by default.
Add 'min cache size' and 'max cache size' settings.
Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
9 years ago
6806741d9b
Add settings for disabling the individual preloading types
9 years ago
a81b10b415
Make the cache expiryDelay configurable
9 years ago
5efaa9817c
Add preloading settings
9 years ago
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
9 years ago
7d647088ab
Make the local map cell distance configurable
9 years ago
ffcb6ec381
Change the default near clip distance to 1 ( Fixes #3155 )
9 years ago
ef20962fc5
Disable fog of war rendering on the HUD map by default
9 years ago
0da6d249fe
Fix the window pinning button's borders not accepting mouse clicks
9 years ago
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
9 years ago
9c7bbd667b
Merge branch 'usersettings'
9 years ago
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
f1faeeae3a
Use separate config options for min and mag texture filters
9 years ago
b830a413d3
Rename the texture filter options
...
To avoid compatibility issues with upgrading from or downgrading to older
builds.
9 years ago
fb6abb53ae
Simplify the in-game texture options
...
This makes it behave like it originally did, although the config options remain
expanded.
9 years ago
76bde5ee13
Separate and expand texture filtering options
9 years ago
0f3660e268
Update comment in settings-default.cfg
...
There are antialiasing techniques that address texture/shading aliasing, but the one we use (MSAA) does not.
9 years ago
3890afd6f5
Merge pull request #843 from kcat/master
...
Add HRTF options and fix an incorrect SoundID
9 years ago
e520d37c87
Override the field of view for first person meshes ( Fixes #858 , Fixes #3051 )
9 years ago
9621b66b78
Move field of view setting to Camera section
9 years ago
9d4af59860
Don't attempt to create quest log buttons if textures are unavailable ( Fixes #3063 )
9 years ago
c75303b652
Add an option to select and enable HRTF
9 years ago
d4238a6d91
Add config options for the sound buffer cache size
...
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
9 years ago
fa610c447c
Fix typos. Add "e.g." in places where ranges are only
...
recommmendations. Add more factual limits where that's easy.
9 years ago
ac2eedcb7d
Change wording in warning to be clearer. Correct ranges on contrast
...
and gamma.
9 years ago
e0752ccdd0
Prioritize warning about user settings. Make recommendations for
...
screen number more generic. Remove resolution recommendation.
9 years ago
89100088f3
The latest version of the settings.cfg without any code changes.
9 years ago
d7e27fa9f4
New brief comments version of settings.cfg.
9 years ago
89329dfbaf
Merge remote-tracking branch 'upstream/master'
9 years ago
3fe38e3556
Remove unused setting
9 years ago
7b64b35eb3
Added comments (and commentary) to the settings-default.cfg file.
9 years ago
34350ddeb1
Fix bug #3028
9 years ago
75f11f781c
Use the ScalingLayer for Scroll window
9 years ago
516f2765a1
Use the ScalingLayer for journal, books and scrolls
9 years ago
08a55febc8
Adjust Scroll window layout to better match MW
9 years ago
d85d74e615
Use AdditiveLayer for the hit fader
9 years ago
a90ef8afd0
layer renaming
9 years ago
13c7235b6b
Remove old FPS setting code
9 years ago
47664e1370
Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding
9 years ago
a41ebd6695
Comment out object shaders in the settings menu
9 years ago
4cc200680c
Comment out shadows tab in settings menu
9 years ago
c9d7078b4b
Water: add texture quality setting to the settings window
9 years ago
60bc7dbabc
Improve MW_ComboBox skin
9 years ago
8cb2c7a9fb
Water: remove defunct "reflect <object type>" settings
...
Not really useful
9 years ago
8433e0679f
Water: connect to settings window
9 years ago
9f8d36b573
Water code cleanup
9 years ago
09631385c3
Use boost ifstream for water resources
9 years ago
51e40cf1b8
Water: minor shader cleanup
9 years ago
d485dd0782
Water: fix world UV coords
9 years ago
9f2f503d37
Water: pass the near and far planes
9 years ago
37c9c12962
Water: clipping plane offset
9 years ago
e13eb625d3
New water WIP
...
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader
Still to do: see comments...
9 years ago
169d76b49b
Fix scrollbar step in count dialog
9 years ago
29a84452ab
durations in tooltips : use "show effect duration" setting
9 years ago
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
9 years ago
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
9 years ago
d91f197119
Time played display setting
9 years ago
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
10 years ago
8c8c5328dc
Rewrite of the description
10 years ago
581ea26605
Add appdata file for openmw and install it
10 years ago
47922f6c35
Changed a settings variable responsible for number of loaded exterior cells.
10 years ago
a5b4e087c5
define owned colours in settings.cfg
10 years ago
cbc44b33ba
define crosshair owned colour in openmw_hud_box.skin.xml
10 years ago
75f5972898
show owned - better settings
10 years ago
df077f8649
color tooltip red when taking item would result in crime
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
edde1fb727
Merge remote-tracking branch 'scrawl/master'
10 years ago
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
15107ca5cf
crosshair owned - settings option
10 years ago
9a115fedbc
Add ability to copy&paste the version label in the main menu
10 years ago
76328677ef
Add some values to launcher's antialiasing combobox
10 years ago
89fc473fae
Remove Render System combo box from the launcher UI
10 years ago
a2e211675d
Update openmw_layers.xml to newer version
10 years ago
c2131e7c31
Make near clip distance configurable
10 years ago
c748ea7363
Fix view distance slider
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
0fb59178b6
Settings file cleanup
10 years ago
bec9abd319
Remove name extension for internal MyGUI textures
...
Since they're no longer loaded from disk, the extension makes no sense.
10 years ago
49df07ea7f
Implement UI scaling factor
10 years ago
a73362f036
Settings file cleanup
10 years ago
24bb2e152c
Apply texture filter setting changes
10 years ago
5442bf23a6
Apply video mode & gamma setting changes
10 years ago
3e86dd7df0
Apply runtime changes to field of view & view distance
10 years ago
4dd96f3318
Fix missing tiling in skin
10 years ago
fd3d49c171
Fix typo in settings layout
10 years ago
4825744a03
Fix inconsistent health bar skin
10 years ago
033719ccd7
Correct the icon used for custom map markers
10 years ago
b0c4be2316
Multi-select + context menu. ( Fixes #2480 )
...
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
10 years ago
c1edc30ad7
Dead code removal
10 years ago
157d8bfedd
Remove unused mygui files
10 years ago
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
cac288d5be
Remove OgreInit
10 years ago
a592c1a1c2
Remove unused resources
10 years ago
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
f708944657
Remove toggle sneak menu option
...
Users can change the option in settings.cfg.
10 years ago
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
10 years ago
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
10 years ago
36ea374c10
Merge remote-tracking branch 'sandstranger/fixes-for-glsles2'
10 years ago
fb0fdf0312
New look for fps counter
10 years ago
4c57cfc2d3
fixes for glsles2
10 years ago
960e99c4f3
Loading screen align fix
10 years ago
76732b475a
Remove leftover
10 years ago
0cd5437595
gamecontrollerdb.txt updated from upstream, added link and license
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
1e4a845b6f
Minor code cleanup
10 years ago
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
10 years ago
edd3f9f95c
small fix for float
10 years ago
cef725012c
fix transpose error fo gles2
10 years ago
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
10 years ago
68f89318e7
Fix canvas align in skill view
10 years ago
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
10 years ago
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
10 years ago
93ffdb427c
Small tweak to ripples
10 years ago
a139e4efb0
Grey out completed quests in journal quests list
10 years ago
ee574e08ef
MIT License header added to all terrain component files.
10 years ago
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
10 years ago
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
10 years ago
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
10 years ago
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
c63ab673e1
Revert "Add freedesktop.org mimeinfo for OpenMW save game files"
...
This reverts commit 94002b0758
10 years ago
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
10 years ago
9ce3e4b4e1
UI consistency fix in levelup dialog
10 years ago
David Cernat
Leon Krieg
scrawl
Nikolay Kasyanov
MiroslavR
Koncord
David Carlier
Aesylwinn
Alexander Kurtz
Marc Zinnschlag
Sergey "Shnatsel" Davidoff
Chris Robinson
cfcohen
Emmanuel Anne
Jeffrey Haines
Alexandre Moine
Pawel Kubik
Jiří Kuneš
dteviot
Ivy Foster
sylar
Digmaster
jacmoe