Commit Graph

4217 Commits (717e04cac5be057beb0fe4199293509f63edcc75)

Author SHA1 Message Date
scrawl f1d35b73b8 Cleanup 12 years ago
scrawl 359ae06fcf Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl c9fefc7f5d Simpler, more lightweight underwater effect, changed colors to match vanilla better 12 years ago
Marc Zinnschlag 123a111580 Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl f0e3463e9b Disable assertion for comparing iterators from different containers (Bug #605) 12 years ago
scrawl 5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 3e97943e06 Merge remote-tracking branch 'scrawl/includes' 12 years ago
Marc Zinnschlag 5595675664 Merge remote-tracking branch 'scrawl/effects' 12 years ago
scrawl 05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 002830e13b Make sure render textures are inactive when in a cell without water 12 years ago
scrawl 867b22ce19 Fix a terrain glitch 12 years ago
scrawl 11f21a1988 Weather update should be before renderer update 12 years ago
gus 5951abfae2 fix some script instructions 12 years ago
gus 7fb2ff18a3 Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public) 12 years ago
gus e1882dce32 correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived. 12 years ago
scrawl 9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 12 years ago
scrawl 6037c44ea6 Fix ingredient effect display 12 years ago
scrawl 6f05c4229f Implemented potion & ingredient effect stacking 12 years ago
scrawl 8e05c4159d Magic effect icons for permanent enchantments 12 years ago
scrawl cf87708c1f Magic effect icons for spells 12 years ago
scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
12 years ago
Pieter van der Kloet 0a6e3701ab Made the Play page use a .ui file too 12 years ago
Pieter van der Kloet f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 12 years ago
Pieter van der Kloet 2b6bb9657b Added Qt Designer .ui files 12 years ago
Pieter van der Kloet a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 12 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 12 years ago
k1ll dde43e8c87 Some cleanup 12 years ago
Nathan Jeffords d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 12 years ago
k1ll 9acd4061cc Fix dangling static references in mShared 12 years ago
scrawl e1957e4ee9 Potion effects should be hidden until discovered 12 years ago
Marc Zinnschlag 0f4f91605a some cleanup 12 years ago
Marc Zinnschlag 401903c9ce Merge remote-tracking branch 'lazydev/master' 12 years ago
lazydev ccb7ed93b3 fix for https://bugs.openmw.org/issues/593 12 years ago
Marc Zinnschlag 3961fb36d4 Merge remote-tracking branch 'chris/transparency-fixes' 12 years ago
Chris Robinson e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 12 years ago
scrawl ef1678e47e Oops, rotation center should be dynamic 12 years ago
Chris Robinson 238a8feb18 Fix transparency checks 12 years ago
scrawl d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 12 years ago
scrawl 1d988676fe Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this. 12 years ago
Chris Robinson 1168f15361 Don't disable depth writes when blending is enabled 12 years ago
scrawl b7ab12e7cf Workaround to prevent the map drawing on top of the world button 12 years ago
scrawl 3efbb5e728 Don't try to render a map in empty cells 12 years ago
Marc Zinnschlag 038c5c3e82 Merge remote-tracking branch 'mikesc/bug574' 12 years ago
Michal Sciubidlo 3df34fb5cc fix bug 574 12 years ago
vorenon c9a701cfa1 Removed the 3 dots after the load text. 12 years ago
vorenon f66f67eaa1 Loading text uses now the corresponding GMSTs 12 years ago
vorenon a6fb58bc59 Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell"
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
12 years ago
vorenon d4aa33b9a7 Removing the unloading cells part instead of just commenting them. 12 years ago
vorenon ffd96c7715 Removed "Unloading Cell..." text from loading screen
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
12 years ago
Chris Robinson bfe80bb8dc Avoid duplicating skeletons due to casing issues
Manually created resource names are apparently always case sensitive, causing
some skeletons to get loaded multiple times.
12 years ago
Marc Zinnschlag ce1310614c Merge remote-tracking branch 'potatoesmaster/pinned' 12 years ago
Marc Zinnschlag 14459460c1 Merge remote-tracking branch 'potatoesmaster/gender' 12 years ago
Marc Zinnschlag 7cae69ee4e Merge remote-tracking branch 'vorenon/master' 12 years ago
Emanuel Guevel be9d49c510 Do not hide pinned windows during loadings 12 years ago
Emanuel Guevel 0bc4c3556a Fix dialogue gender filter 12 years ago
scrawl 369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 9b0ac4e299 NPCs / creatures can now emit ripples 12 years ago
vorenon 89cba3cf45 Replaced ifs/elseifs with switch 12 years ago
vorenon 13c33c1613 added missing click sound to main menu 12 years ago
Chris Robinson 35e2b6942a Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Chris Robinson ceafcc2ebb Support float samples with ffmpeg
Requires the AL_EXT_FLOAT32 extension in OpenAL
12 years ago
Nathan Jeffords 21f502e3dd properly handle potentially non 16 bit planar audio formats 12 years ago
vorenon b1ca719d61 Added click sound to OK button for message boxes 12 years ago
vorenon 1a43d86d9e Close messages boxes with the activation key (Bug #589) 12 years ago
scrawl d4264353a3 Merge branch 'z-up' into graphics
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
12 years ago
Marc Zinnschlag dc445844d2 Merge remote-tracking branch 'scrawl/z-up' 12 years ago
Marc Zinnschlag a7102c143f ESX variable type cleanup 12 years ago
scrawl b9912a19e0 Z-up conversion: fix player arrow direction on global map 12 years ago
scrawl cd68012498 Z-up conversion: raycasts 12 years ago
scrawl cc9b72b9b1 Removing some leftovers of mwRoot node 12 years ago
scrawl 341f9b96e2 Local map: restore zHigh 12 years ago
scrawl 284ba58e1e Z-up conversion: global map, shader fix 12 years ago
scrawl 2e7bc1a368 Z-up conversion: local map, fix tcg 12 years ago
scrawl 5c0c5854e8 Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not 12 years ago
scrawl 3ef952172d Z-up conversion: water, sky 12 years ago
scrawl 3cb3ec91c0 Z-up conversion: camera 12 years ago
scrawl a5451eb9d9 Z-up conversion: terrain, objects 12 years ago
Chris Robinson 955e2713a9 Fix encumbrance term calculation 12 years ago
Chris Robinson a576e9e430 Set the race selection character preview in a valid (idle) pose. 12 years ago
Chris Robinson 9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Chris Robinson da575b181e Use the correct GMST for the race menu 12 years ago
Pieter van der Kloet b209b6a0e6 Added missing includes 12 years ago
Pieter van der Kloet 469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
Pieter van der Kloet 9cd8dd39de Make the launcher code conform to the coding standards and cleanup 12 years ago
Marc Zinnschlag bd9884b244 Merge remote-tracking branch 'chris/misc-cleanup' 12 years ago
Chris Robinson 000128d084 Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Marc Zinnschlag 08f13ef5ab Merge remote-tracking branch 'greye/master' 12 years ago
Marc Zinnschlag fa45def475 Merge remote-tracking branch 'scrawl/master' 12 years ago
greye 661fd73c6e fix rotation for objects in inactive cells and forced vanity mode 12 years ago
Chris Robinson 48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 12 years ago
scrawl 8aff033a0c Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog 12 years ago
scrawl b1fc68d44d Merge branch 'master' into graphics 12 years ago
scrawl 355390429e Fix World::isUnderwater to use dynamic waterlevel 12 years ago
Marc Zinnschlag 88e8659a49 minor cleanup 12 years ago
Chris Robinson 5d5d28c06c Increase the ID cache to 40
Helps improve performance with Tribunal and Bloodmoon's scripts
12 years ago
scrawl 73d48a95f6 Add message box when the player tries to move when being overencumbered. 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
12 years ago
Marc Zinnschlag cd40d167ce Merge remote-tracking branch 'chris/animation2' 12 years ago
scrawl dfe29db9cb Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation) 12 years ago
Pieter van der Kloet c4ebdc230c Cleaned up strings and indentation 12 years ago
Pieter van der Kloet a0007325ad Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins 12 years ago
Pieter van der Kloet 6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
Pieter van der Kloet 17a0a201df Various fixes and changes to the settings handling 12 years ago
Chris Robinson 000236ba80 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Chris Robinson 74b8095fc7 Use default parameters where appropriate 12 years ago
Chris Robinson 5267d17408 Revert "forgot to destroy child scene nodes"
This reverts commit f1a3309392.

Unneeded. The caller already calls this which destroys the children recursively
12 years ago
ChrisKCat 9e7b559b09 Merge pull request #6 from scrawl/lights
For light objects without an AttachLight bone, attach the light to the c...
12 years ago
scrawl f1a3309392 forgot to destroy child scene nodes 12 years ago
scrawl 1ae2d3c6ab For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin. 12 years ago
Nathan Jeffords 7ea1f6a02a fixes for using FFMPEG on windows 12 years ago
scrawl a3afb91485 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 94be45e07e Merge remote-tracking branch 'zini/master' into animation2 12 years ago
ChrisKCat aab7cf137b Merge pull request #5 from greye/cross-cell
fix and unify object cell change update in mwrender
12 years ago
Marc Zinnschlag fa880e3274 Merge remote-tracking branch 'lazydev/master' 12 years ago
Chris Robinson db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Chris Robinson 89d4c245e9 Better calculate jump velocity
The fatigue term isn't currently used correctly
12 years ago
greye 6a8c532244 fix and unify object cell change update in mwrender 12 years ago
scrawl 0d6a3367d3 Water shader no longer depends on object shaders being enabled 12 years ago
scrawl 3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Pieter van der Kloet 919d1ee572 Some fixes to the settings handlers 12 years ago
Pieter van der Kloet 4737b20e4c Fixed a bug in the combobox popup font size, items overlapping 12 years ago
Pieter van der Kloet be43fa334f Added support for non-latin characters, fixes Bug #515 12 years ago
Pieter van der Kloet 9198afeefb Improved context menu, added context menu for masters and added multi-selection support 12 years ago
Chris Robinson 90cb9ee0ac Don't set a vertical velocity when on the ground 12 years ago
lazydev a5ff8181b7 fix for https://bugs.openmw.org/issues/569 12 years ago
Chris Robinson 8e59ea4941 Use a separate method to handle animation events 12 years ago
Pieter van der Kloet 150d4a7a72 Added support for multiple ini files 12 years ago
Chris Robinson d77d035d3a Handle the "sound" events in runAnimation 12 years ago
Chris Robinson df8889dcc4 Limit maximum frame time to 200ms
This effectively slows game time when it drops below 5 fps. Something like this
is desirable when dealing with time-based animations, which can jump forward
after a lengthy cell transition.
12 years ago
Marc Zinnschlag 9a03b17b2d Merge branch 'localworkaround' 12 years ago
Marc Zinnschlag a95431c387 fix 12 years ago
Marc Zinnschlag 9e8d0128e0 Merge remote-tracking branch 'blunted2night/size_t-warnings_v2' 12 years ago
Nathan Jeffords 44b1c66c4b fixed various warnings about converting size_t to int 12 years ago
Chris Robinson d208422ca7 Add a method to update an Animation's Ptr object 12 years ago
Marc Zinnschlag d98ec67671 Merge remote-tracking branch 'graffy76/recentfiles' 12 years ago
Chris Robinson a2eaec7878 Avoiding holding the InventoryStore in the NpcAnimation class 12 years ago
Chris Robinson 0d0e75fe0b Don't set animation sources for models that don't have a skeleton 12 years ago
graffy76 89dace3cc3 Fix for operations widget - hides when no operations are running. 12 years ago
Chris Robinson 0148db8ccf Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
12 years ago
Marc Zinnschlag 3472a6f180 workaround for infinite recursion during local variable access 12 years ago
scrawl 4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson e6da9dfae5 Specify the animation key to stop playing at 12 years ago
Marc Zinnschlag 59748a7647 Merge remote-tracking branch 'greye/cross-cell' 12 years ago
Sergey Shambir a3adcf752d TradeWindow: fixed coding style
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
12 years ago
greye ac7095537f remove insertMesh() call on object cell change 12 years ago
greye d983ed5c78 fix invalid SceneNode pointer on cell change 12 years ago
greye 9659b4a95e update NpcAnimation inventory reference on cell change 12 years ago
Marc Zinnschlag 868916a9a2 added add-on global variables in the same way add-on GMSTs were added 12 years ago
Marc Zinnschlag 6f5a772d02 fixed another case handling problem 12 years ago
Chris Robinson b8f5813609 Set all animation sources at once 12 years ago