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

4208 commits

Author SHA1 Message Date
gus
e1882dce32 correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived. 2013-03-03 13:02:41 +00:00
scrawl
9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 2013-03-03 13:11:02 +01:00
scrawl
6037c44ea6 Fix ingredient effect display 2013-03-03 12:41:57 +01:00
scrawl
6f05c4229f Implemented potion & ingredient effect stacking 2013-03-03 12:41:37 +01:00
scrawl
8e05c4159d Magic effect icons for permanent enchantments 2013-03-03 12:17:37 +01:00
scrawl
cf87708c1f Magic effect icons for spells 2013-03-03 12:01:19 +01:00
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
 2013-03-03 11:02:38 +01:00
graffy76
eb90bd71ba Fixed triggering confirmation messages boxes when more than one view is 
open.
 2013-03-02 21:34:55 -06:00
Pieter van der Kloet
0a6e3701ab Made the Play page use a .ui file too 2013-03-03 01:49:41 +01:00
Pieter van der Kloet
f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 2013-03-03 00:48:09 +01:00
Pieter van der Kloet
2b6bb9657b Added Qt Designer .ui files 2013-03-02 23:49:31 +01:00
Pieter van der Kloet
a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 2013-03-02 23:01:53 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
k1ll
dde43e8c87 Some cleanup 2013-03-02 21:46:31 +01:00
graffy76
bf6c855e6d Final changes to implement save-on-close features 2013-03-02 12:49:26 -06:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
k1ll
9acd4061cc Fix dangling static references in mShared 2013-03-02 17:04:17 +01:00
graffy76
9193ddc9d3 Merge branch 'master' into saveOnClose 2013-03-02 09:24:42 -06:00
graffy76
a2e36594c9 Completed "abort save on close" feature 2013-03-02 09:22:44 -06:00
graffy76
f85be6a744 80% complete save-on-close feature 2013-03-02 07:57:41 -06:00
scrawl
e1957e4ee9 Potion effects should be hidden until discovered 2013-03-02 13:34:26 +01:00
Marc Zinnschlag
0f4f91605a some cleanup 2013-03-02 11:19:48 +01:00
Marc Zinnschlag
401903c9ce Merge remote-tracking branch 'lazydev/master' 2013-03-02 11:11:41 +01:00
lazydev
ccb7ed93b3 fix for https://bugs.openmw.org/issues/593 2013-03-02 03:54:25 +04:00
Marc Zinnschlag
3961fb36d4 Merge remote-tracking branch 'chris/transparency-fixes' 2013-03-01 23:18:35 +01:00
Chris Robinson
e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 2013-03-01 13:32:30 -08:00
scrawl
ef1678e47e Oops, rotation center should be dynamic 2013-03-01 22:32:02 +01:00
Chris Robinson
238a8feb18 Fix transparency checks 2013-03-01 13:27:25 -08:00
scrawl
d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 2013-03-01 18:45:52 +01:00
scrawl
1d988676fe Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this. 2013-02-28 22:56:29 +01:00
Chris Robinson
1168f15361 Don't disable depth writes when blending is enabled 2013-02-28 12:17:58 -08:00
scrawl
b7ab12e7cf Workaround to prevent the map drawing on top of the world button 2013-02-28 21:12:13 +01:00
scrawl
3efbb5e728 Don't try to render a map in empty cells 2013-02-28 20:27:35 +01:00
Marc Zinnschlag
038c5c3e82 Merge remote-tracking branch 'mikesc/bug574' 2013-02-28 20:21:38 +01:00
Michal Sciubidlo
3df34fb5cc fix bug 574 2013-02-28 19:52:32 +01:00
vorenon
c9a701cfa1 Removed the 3 dots after the load text. 2013-02-28 19:25:18 +01:00
vorenon
f66f67eaa1 Loading text uses now the corresponding GMSTs 2013-02-28 17:54:42 +01:00
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"
 2013-02-28 16:31:24 +01:00
vorenon
d4aa33b9a7 Removing the unloading cells part instead of just commenting them. 2013-02-28 15:58:03 +01:00
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.
 2013-02-28 13:19:05 +01:00
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.
 2013-02-27 12:33:36 -08:00
Marc Zinnschlag
ce1310614c Merge remote-tracking branch 'potatoesmaster/pinned' 2013-02-27 17:37:04 +01:00
Marc Zinnschlag
14459460c1 Merge remote-tracking branch 'potatoesmaster/gender' 2013-02-27 17:36:57 +01:00
Marc Zinnschlag
7cae69ee4e Merge remote-tracking branch 'vorenon/master' 2013-02-27 17:36:03 +01:00
Emanuel Guevel
be9d49c510 Do not hide pinned windows during loadings 2013-02-27 16:17:41 +01:00
Emanuel Guevel
0bc4c3556a Fix dialogue gender filter 2013-02-27 15:58:01 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
scrawl
9b0ac4e299 NPCs / creatures can now emit ripples 2013-02-27 09:20:42 +01:00
vorenon
89cba3cf45 Replaced ifs/elseifs with switch 2013-02-26 19:52:51 +01:00
vorenon
13c33c1613 added missing click sound to main menu 2013-02-26 19:37:47 +01:00
Chris Robinson
35e2b6942a Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-26 10:21:28 -08:00
Chris Robinson
ceafcc2ebb Support float samples with ffmpeg 
Requires the AL_EXT_FLOAT32 extension in OpenAL
 2013-02-26 10:19:33 -08:00
Nathan Jeffords
21f502e3dd properly handle potentially non 16 bit planar audio formats 2013-02-26 09:37:18 -08:00
vorenon
b1ca719d61 Added click sound to OK button for message boxes 2013-02-26 16:37:59 +01:00
vorenon
1a43d86d9e Close messages boxes with the activation key (Bug #589) 2013-02-26 15:58:32 +01:00
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
 2013-02-26 14:54:53 +01:00
Marc Zinnschlag
dc445844d2 Merge remote-tracking branch 'scrawl/z-up' 2013-02-26 14:37:50 +01:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
scrawl
b9912a19e0 Z-up conversion: fix player arrow direction on global map 2013-02-26 14:31:30 +01:00
scrawl
cd68012498 Z-up conversion: raycasts 2013-02-26 14:28:35 +01:00
scrawl
cc9b72b9b1 Removing some leftovers of mwRoot node 2013-02-26 14:01:10 +01:00
scrawl
341f9b96e2 Local map: restore zHigh 2013-02-26 13:53:23 +01:00
scrawl
284ba58e1e Z-up conversion: global map, shader fix 2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
scrawl
5c0c5854e8 Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not 2013-02-26 12:01:10 +01:00
scrawl
3ef952172d Z-up conversion: water, sky 2013-02-26 10:38:48 +01:00
scrawl
3cb3ec91c0 Z-up conversion: camera 2013-02-26 09:12:35 +01:00
scrawl
a5451eb9d9 Z-up conversion: terrain, objects 2013-02-26 08:30:06 +01:00
Chris Robinson
955e2713a9 Fix encumbrance term calculation 2013-02-25 17:29:32 -08:00
Chris Robinson
a576e9e430 Set the race selection character preview in a valid (idle) pose. 2013-02-25 16:40:08 -08:00
Chris Robinson
9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 13:10:21 -08:00
Chris Robinson
da575b181e Use the correct GMST for the race menu 2013-02-25 13:04:17 -08:00
Pieter van der Kloet
b209b6a0e6 Added missing includes 2013-02-25 22:00:51 +01:00
Pieter van der Kloet
469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 21:26:54 +01:00
Pieter van der Kloet
9cd8dd39de Make the launcher code conform to the coding standards and cleanup 2013-02-25 21:22:07 +01:00
Marc Zinnschlag
bd9884b244 Merge remote-tracking branch 'chris/misc-cleanup' 2013-02-25 19:45:09 +01:00
Chris Robinson
000128d084 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 10:38:08 -08:00
Marc Zinnschlag
08f13ef5ab Merge remote-tracking branch 'greye/master' 2013-02-25 19:34:03 +01:00
Marc Zinnschlag
fa45def475 Merge remote-tracking branch 'scrawl/master' 2013-02-25 19:30:30 +01:00
greye
661fd73c6e fix rotation for objects in inactive cells and forced vanity mode 2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 2013-02-25 09:57:34 -08:00
scrawl
8aff033a0c Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog 2013-02-25 18:29:11 +01:00
scrawl
b1fc68d44d Merge branch 'master' into graphics 2013-02-25 17:36:33 +01:00
scrawl
355390429e Fix World::isUnderwater to use dynamic waterlevel 2013-02-25 17:27:50 +01:00
Marc Zinnschlag
88e8659a49 minor cleanup 2013-02-25 16:52:31 +01:00
Chris Robinson
5d5d28c06c Increase the ID cache to 40 
Helps improve performance with Tribunal and Bloodmoon's scripts
 2013-02-25 07:43:56 -08:00
scrawl
73d48a95f6 Add message box when the player tries to move when being overencumbered. 2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
Marc Zinnschlag
cd40d167ce Merge remote-tracking branch 'chris/animation2' 2013-02-25 14:56:03 +01:00
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) 2013-02-25 06:57:32 +01:00
Pieter van der Kloet
c4ebdc230c Cleaned up strings and indentation 2013-02-25 01:28:13 +01:00
Pieter van der Kloet
a0007325ad Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins 2013-02-25 01:22:14 +01:00
Pieter van der Kloet
6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 00:56:23 +01:00
Pieter van der Kloet
17a0a201df Various fixes and changes to the settings handling 2013-02-25 00:56:04 +01:00
Chris Robinson
000236ba80 Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 15:30:46 -08:00
Chris Robinson
74b8095fc7 Use default parameters where appropriate 2013-02-24 14:43:20 -08:00
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
 2013-02-24 14:14:08 -08:00
ChrisKCat
9e7b559b09 Merge pull request #6 from scrawl/lights 
For light objects without an AttachLight bone, attach the light to the c...
 2013-02-24 14:12:53 -08:00
scrawl
f1a3309392 forgot to destroy child scene nodes 2013-02-24 19:03:25 +01:00
scrawl
1ae2d3c6ab For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin. 2013-02-24 19:00:06 +01:00
Nathan Jeffords
7ea1f6a02a fixes for using FFMPEG on windows 2013-02-24 09:42:08 -08:00
scrawl
a3afb91485 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 18:04:51 +01:00
Chris Robinson
94be45e07e Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 06:20:10 -08:00
ChrisKCat
aab7cf137b Merge pull request #5 from greye/cross-cell 
fix and unify object cell change update in mwrender
 2013-02-24 05:32:52 -08:00
Marc Zinnschlag
fa880e3274 Merge remote-tracking branch 'lazydev/master' 2013-02-24 14:07:52 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Chris Robinson
89d4c245e9 Better calculate jump velocity 
The fatigue term isn't currently used correctly
 2013-02-24 03:30:33 -08:00
greye
6a8c532244 fix and unify object cell change update in mwrender 2013-02-24 15:04:56 +04:00
scrawl
0d6a3367d3 Water shader no longer depends on object shaders being enabled 2013-02-24 10:28:50 +01:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Pieter van der Kloet
919d1ee572 Some fixes to the settings handlers 2013-02-24 04:14:18 +01:00
Pieter van der Kloet
4737b20e4c Fixed a bug in the combobox popup font size, items overlapping 2013-02-24 04:00:22 +01:00
Pieter van der Kloet
be43fa334f Added support for non-latin characters, fixes Bug #515 2013-02-24 03:14:19 +01:00
Pieter van der Kloet
9198afeefb Improved context menu, added context menu for masters and added multi-selection support 2013-02-24 03:10:27 +01:00
Chris Robinson
90cb9ee0ac Don't set a vertical velocity when on the ground 2013-02-23 16:30:11 -08:00
lazydev
a5ff8181b7 fix for https://bugs.openmw.org/issues/569 2013-02-24 03:35:43 +04:00
Chris Robinson
8e59ea4941 Use a separate method to handle animation events 2013-02-23 14:39:01 -08:00
Pieter van der Kloet
150d4a7a72 Added support for multiple ini files 2013-02-23 23:18:42 +01:00
Chris Robinson
d77d035d3a Handle the "sound" events in runAnimation 2013-02-23 14:15:11 -08:00
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.
 2013-02-23 13:15:37 -08:00
Marc Zinnschlag
9a03b17b2d Merge branch 'localworkaround' 2013-02-23 20:50:22 +01:00
Marc Zinnschlag
a95431c387 fix 2013-02-23 20:20:40 +01:00
Marc Zinnschlag
9e8d0128e0 Merge remote-tracking branch 'blunted2night/size_t-warnings_v2' 2013-02-23 20:06:27 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
Chris Robinson
d208422ca7 Add a method to update an Animation's Ptr object 2013-02-23 10:12:36 -08:00
Marc Zinnschlag
d98ec67671 Merge remote-tracking branch 'graffy76/recentfiles' 2013-02-23 18:53:33 +01:00
Chris Robinson
a2eaec7878 Avoiding holding the InventoryStore in the NpcAnimation class 2013-02-23 08:03:52 -08:00
Chris Robinson
0d0e75fe0b Don't set animation sources for models that don't have a skeleton 2013-02-23 07:36:11 -08:00
graffy76
89dace3cc3 Fix for operations widget - hides when no operations are running. 2013-02-23 09:07:13 -06:00
Chris Robinson
0148db8ccf Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
 2013-02-23 05:59:35 -08:00
Marc Zinnschlag
3472a6f180 workaround for infinite recursion during local variable access 2013-02-23 14:40:56 +01:00
scrawl
4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 14:37:28 +01:00
Chris Robinson
e6da9dfae5 Specify the animation key to stop playing at 2013-02-23 05:15:10 -08:00
Marc Zinnschlag
59748a7647 Merge remote-tracking branch 'greye/cross-cell' 2013-02-23 13:55:31 +01:00
Sergey Shambir
a3adcf752d TradeWindow: fixed coding style 
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
 2013-02-23 13:51:21 +01:00
greye
ac7095537f remove insertMesh() call on object cell change 2013-02-23 16:50:37 +04:00
greye
d983ed5c78 fix invalid SceneNode pointer on cell change 2013-02-23 16:45:55 +04:00
greye
9659b4a95e update NpcAnimation inventory reference on cell change 2013-02-23 16:45:55 +04:00
Marc Zinnschlag
868916a9a2 added add-on global variables in the same way add-on GMSTs were added 2013-02-23 12:51:45 +01:00
Marc Zinnschlag
6f5a772d02 fixed another case handling problem 2013-02-23 12:35:05 +01:00
Chris Robinson
b8f5813609 Set all animation sources at once 2013-02-23 03:34:03 -08:00
Marc Zinnschlag
c9ca565462 removed a redundant function call 2013-02-23 12:05:09 +01:00
Chris Robinson
f841576bba Don't override animations played with playgroup 2013-02-23 01:54:46 -08:00
scrawl
7e816c826b Fix lights without a mesh 2013-02-23 09:17:12 +01:00
scrawl
01102f9c73 Don't emit if there wasn't enough movement 2013-02-23 05:53:20 +01:00
graffy76
6f89d453a5 Operations widget height fix and abort button feature. Successfully 
tested resizing of Operations QDockWidget for multiple concurrent
operations.
 2013-02-22 21:53:32 -06:00
scrawl
5b099393fa Fix time factor 2013-02-23 04:43:51 +01:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01:00
scrawl
f17ea109ca Fix light positions 2013-02-23 04:06:05 +01:00
Chris Robinson
b12c6a4c16 Fix character preview 2013-02-22 11:16:00 -08:00