graffy76
ce91ef36ea
Fix for warnings on close, leaves all views open until a decision is
...
made
2013-03-10 07:49:43 -05:00
Glorf
d5ca00c927
Another fix
2013-03-10 12:11:38 +01:00
Marc Zinnschlag
bdec87e51b
some cleanup
2013-03-10 11:30:50 +01:00
Glorf
81338d3b23
Weather code fixes
2013-03-10 11:30:24 +01:00
Marc Zinnschlag
65c382116f
Merge remote-tracking branch 'glorf/master'
2013-03-10 11:24:23 +01:00
Marc Zinnschlag
6cef7fb610
rescale all objects to the range of [0.5, 2] when a cell becomes active
2013-03-10 10:00:20 +01:00
Glorf
a68c55fea5
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-03-10 00:29:42 +01:00
Glorf
aebd9a3700
Weather to pull
2013-03-10 00:24:14 +01:00
Marc Zinnschlag
549678394c
Merge remote-tracking branch 'potatoesmaster/fallback-archives'
2013-03-09 23:01:42 +01:00
scrawl
a51b73b609
Fix topics that have the same name as a service opening that service when clicked
2013-03-09 21:50:01 +01:00
Marc Zinnschlag
fbaad8e105
Merge remote-tracking branch 'potatoesmaster/strfix'
2013-03-09 21:33:32 +01:00
Emanuel Guevel
289bbc64f7
Load fallback archives listed in openmw.cfg at startup
2013-03-09 21:14:11 +01:00
Sebastian Wick
0ae48c1f83
fix for Bug #509
2013-03-09 20:40:59 +01:00
scrawl
b19571df89
If character creation dialogs are enabled in the wrong order, force creation stage to advance
2013-03-09 14:59:50 +01:00
Marc Zinnschlag
2cc20c67cb
Merge remote-tracking branch 'scrawl/raycasting'
2013-03-09 14:34:29 +01:00
scrawl
5c94c654d4
Fix wrong rotation of objects dropped on the ground
2013-03-09 13:27:24 +01:00
scrawl
c8b31b4745
Remove an outdated message
2013-03-09 13:26:00 +01:00
graffy76
c17821e6c8
Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose
2013-03-08 20:08:56 -06:00
Emanuel Guevel
c020665cf2
Fix appending int to string in an exception message
2013-03-09 01:00:03 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
Marc Zinnschlag
d396785008
Merge remote-tracking branch 'scrawl/master'
2013-03-08 11:00:20 +01:00
graffy76
03c7f18112
Fixes for save-on-close message boxes
2013-03-07 17:48:05 -06:00
scrawl
285b4bf726
Allow zooming camera in vanity or preview mode with the mousewheel
2013-03-08 00:12:56 +01:00
Emanuel Guevel
1223a2e105
Bsatool: extract and extractall modes
2013-03-07 21:21:00 +01:00
Emanuel Guevel
3adf3f5121
Revive bsatool
2013-03-07 21:13:10 +01:00
Marc Zinnschlag
17e406e58c
Merge remote-tracking branch 'mikesc/bug586'
2013-03-07 20:48:58 +01:00
Michal Sciubidlo
f2f4b6e2d5
Make MWWorld::getInterior case insensitive.
...
Interior cells names can use different mix of uppercase/lowercase in different places.
getInterior() should return same cell in all cases. Fixes bug #586 .
2013-03-07 20:15:01 +01:00
Marc Zinnschlag
2a9d15cd9f
Merge remote-tracking branch 'scrawl/master'
2013-03-07 16:42:07 +01:00
scrawl
66a754e9aa
Fix tooltip position when hovering the crosshair over NPCs
2013-03-07 15:25:22 +01:00
scrawl
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
2013-03-07 14:00:13 +01:00
scrawl
e34685b8a3
Fix manually changed mouse cursor
2013-03-07 12:46:26 +01:00
Marc Zinnschlag
a994a23f4e
file loading fixes
2013-03-07 07:56:29 +01:00
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
2013-03-07 03:00:59 +01:00
scrawl
8be9627c8d
Fix method signatures
2013-03-06 21:26:41 +01:00
scrawl
f7d8f6456f
Stats should never go below 0
2013-03-06 20:45:11 +01:00
Marc Zinnschlag
642653d10e
World constructor fixes
2013-03-06 19:57:00 +01:00
Marc Zinnschlag
7e100c36b5
Merge remote-tracking branch 'gus/AI'
2013-03-06 19:05:55 +01:00
Marc Zinnschlag
ef86a693c3
Merge remote-tracking branch 'scrawl/sneak'
2013-03-06 18:59:37 +01:00
Marc Zinnschlag
69eb5aa99a
Merge remote-tracking branch 'scrawl/master'
2013-03-06 18:59:02 +01:00
gus
5938e19362
Clean up
2013-03-06 17:31:57 +00:00
scrawl
66d2d3522f
Race selection preview: render only the head, and focus the camera on its node
2013-03-06 18:03:47 +01:00
scrawl
268bb23590
Implemented sneaking animation
2013-03-06 16:58:56 +01:00
scrawl
39411eda7b
Fix the spell buying window listing already owned spells
2013-03-06 15:11:40 +01:00
Pieter van der Kloet
c9859382bf
Made the launcher write the custom resolution to file, cleaned resolution parsing
2013-03-06 01:35:32 +01:00
gus
d3bf3812a4
changing rotation order (fix some misoriented objects)
2013-03-05 20:16:57 +00:00
gus
8b6f0e0770
Correct orientation sign
2013-03-05 18:28:57 +00:00
Marc Zinnschlag
d839a4c6c2
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8
Avoid manually updating render targets from within frameRenderingQueued
2013-03-05 14:24:29 +01:00
scrawl
2486ec6cb9
Material fixes (vertex colors, alpha)
2013-03-05 13:51:48 +01:00
Marc Zinnschlag
46de45b9a2
added var type column to globals
2013-03-05 11:37:13 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09
change variant in info record to new type
2013-03-05 10:34:03 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
Pieter van der Kloet
770d8af931
Forgot to add the DataFilesPage .ui
2013-03-05 03:57:27 +01:00
Pieter van der Kloet
75cf009101
Finished implementing the .ui file for the DataFilesPage
2013-03-05 03:47:57 +01:00
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
2013-03-05 03:13:39 +01:00
Pieter van der Kloet
fb5213a754
Made the GraphicsPage use a .ui file and added support for custom res
2013-03-05 02:17:28 +01:00
Marc Zinnschlag
8a887a0aef
Merge remote-tracking branch 'potatoesmaster/tradewindow'
2013-03-04 19:42:51 +01:00
Marc Zinnschlag
ac810faa7e
Merge remote-tracking branch 'scrawl/master'
2013-03-04 19:36:58 +01:00
Marc Zinnschlag
a93034b0a9
Merge remote-tracking branch 'k1ll/store_segfault_fix'
2013-03-04 19:27:14 +01:00
scrawl
d5c6c221c1
Books/scrolls: Fix the take button incorrectly showing
2013-03-04 17:28:01 +01:00
scrawl
ca707aa65f
Transparency should be evaluated per subentity, not per NIF
2013-03-04 16:57:00 +01:00
scrawl
cab5315a8e
Disable mipmaps generation
2013-03-04 16:28:20 +01:00
Marc Zinnschlag
a1ac20c6f3
changed global variable records to new variant type
2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520
added variant class
2013-03-04 14:32:23 +01:00
gus
3384d92761
oups introduced a bug..
2013-03-04 12:28:43 +00:00
gus
48b3f1e0cf
Clean up. But still a little hacky
2013-03-04 12:08:35 +00:00
Emanuel Guevel
8e07638699
Update the trading offer on "max sale" button click
2013-03-04 12:24:41 +01:00
graffy76
6911868f2a
File->close and File->exit menu items added. Exit uses
...
closeAllWindows() to ensure ViewManager::closeRequest is called on the
last open window. Exit will close all open windows but the last one in
cases of active save operation or modified file.
2013-03-03 15:58:26 -06:00
scrawl
f1d35b73b8
Cleanup
2013-03-03 19:52:20 +01:00
scrawl
359ae06fcf
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 19:35:26 +01:00
scrawl
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
2013-03-03 19:28:11 +01:00
Marc Zinnschlag
123a111580
Merge remote-tracking branch 'scrawl/master'
2013-03-03 17:13:05 +01:00
scrawl
f0e3463e9b
Disable assertion for comparing iterators from different containers (Bug #605 )
2013-03-03 16:50:10 +01:00
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06
Merge remote-tracking branch 'scrawl/includes'
2013-03-03 15:37:13 +01:00
Marc Zinnschlag
5595675664
Merge remote-tracking branch 'scrawl/effects'
2013-03-03 15:33:23 +01:00
scrawl
05bd94effb
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:14:20 +01:00
scrawl
002830e13b
Make sure render textures are inactive when in a cell without water
2013-03-03 15:11:45 +01:00
scrawl
867b22ce19
Fix a terrain glitch
2013-03-03 15:11:19 +01:00
scrawl
11f21a1988
Weather update should be before renderer update
2013-03-03 15:10:40 +01:00
gus
5951abfae2
fix some script instructions
2013-03-03 13:59:38 +00:00
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)
2013-03-03 13:06:45 +00:00
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
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
Chris Robinson
ecbf1568a1
Fix NPC part attachment
2013-02-22 10:15:29 -08:00
Chris Robinson
9dee2a72cd
Use a separate method to calculate animation velocity
2013-02-22 09:22:06 -08:00
Chris Robinson
3c0b29de45
Merge remote-tracking branch 'zini/master' into animation2
2013-02-22 01:34:22 -08:00
Chris Robinson
84227caa0c
Cleanup Npc::getSpeed a little
2013-02-22 01:30:06 -08:00
Chris Robinson
7ec73c29f2
Do not return the player's Animation object for non-players
2013-02-22 01:27:26 -08:00
Chris Robinson
9c3af5f344
Do not interpret noclip mode as flying
2013-02-22 01:26:30 -08:00
lazydev
71e5369f04
Loading translation data for all the plugin files, not only for the first one
2013-02-22 02:18:54 +04:00
Chris Robinson
7fcca180b6
Implement rudimentary jumping
2013-02-20 20:08:04 -08:00
Pieter van der Kloet
63a13cf9ca
Whoops, removed an include
2013-02-20 19:29:12 +01:00
Pieter van der Kloet
18d01cd65a
Implemented a first-run dialog to import Morrowind.ini settings
2013-02-20 19:27:04 +01:00
Chris Robinson
bbde0146a7
Merge remote-tracking branch 'zini/master' into animation2
2013-02-20 08:27:40 -08:00
Chris Robinson
4eb8ea0c95
Fix stepping and vertical force accumulation
2013-02-20 07:51:36 -08:00
Chris Robinson
b14def7c09
Set the character as being on the ground when colliding with a shallow enough slope
2013-02-20 05:24:38 -08:00
Chris Robinson
fe6fa9ebe7
Simplify newtrace a bit
2013-02-20 04:14:52 -08:00
Chris Robinson
617158afcd
Ensure updated skeleton bone placement matches in world space
...
Objects attached to actors (shirts, robes, etc) do not require the same node
hierarchy as the character root. So to ensure proper placement, we need to set
the bone target's derived transformation using the source bone's derived
transformation (which in turn means we need to work up from the root, to ensure
the bone's parents are properly placed).
2013-02-20 02:41:46 -08:00
Chris Robinson
cfdc820a1f
Make an actor fly when it has a levitate effect
2013-02-20 01:55:12 -08:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
Emanuel Guevel
43d6392921
Change the way pinnable window are made visible
...
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
2013-02-20 01:00:13 +01:00
Pieter van der Kloet
2172fb4229
Added checkable message box class
2013-02-19 16:41:33 +01:00
Pieter van der Kloet
35b68a3c40
Fixed accidental profile deletion and added sorting by date
2013-02-19 15:58:01 +01:00
Chris Robinson
8196694c08
Avoid applying the animation when resetting it
2013-02-19 06:04:25 -08:00
Chris Robinson
f8349a04bf
Use the looping portion of the animation to calculate the velocity
2013-02-19 05:26:58 -08:00
Chris Robinson
5d55b41714
Remove a now-unneeded(?) hack
2013-02-19 04:59:38 -08:00
Chris Robinson
89fabdb3a9
Update the PhysicActor's RigidBody when moving
...
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
2013-02-19 04:18:15 -08:00
Chris Robinson
1399a06c76
Update animation looping when setting the same state
2013-02-19 04:01:33 -08:00
Chris Robinson
a510adc572
Allow stepping when not being affected by gravity
2013-02-19 02:25:57 -08:00
Chris Robinson
8255a64bfe
Handle levitate and swift swim effects
2013-02-19 02:10:36 -08:00
Chris Robinson
c694161272
Don't try to step if not on the ground
2013-02-19 01:28:02 -08:00
Chris Robinson
5a1a0b7338
Add and use an MWWorld::isFlying method
2013-02-18 22:39:43 -08:00
Chris Robinson
17200cb226
Don't try to move when there's no speed
2013-02-18 20:43:55 -08:00
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
2013-02-19 04:03:24 +01:00
scrawl
427152c518
Disabled ripples until we can properly trigger them from the new character controller.
2013-02-19 03:15:31 +01:00
scrawl
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
2013-02-19 03:08:00 +01:00
Pieter van der Kloet
37fe31e858
Merge remote-tracking branch 'upstream/next' into settings_selwidget
2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
Pieter van der Kloet
bcf4f96209
Added writing masters/plugins to openmw.cfg
2013-02-18 23:10:50 +01:00
Pieter van der Kloet
178cf2154e
Made checking/unchecking work with the new datafiles model
2013-02-18 17:59:08 +01:00
Chris Robinson
627b866744
Don't try to set a new state when dead
2013-02-18 06:29:16 -08:00
Chris Robinson
f2948ced23
Allow diagonal movement
2013-02-18 03:07:31 -08:00
Marc Zinnschlag
0713afb97d
Merge branch 'gmstfixing' into next
2013-02-18 09:24:22 +01:00
Marc Zinnschlag
a50ff34774
better default value for string GMSTs
2013-02-18 09:23:14 +01:00
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01:00
Chris Robinson
bea460955d
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 16:03:39 -08:00
Marc Zinnschlag
1343c2c22b
Merge remote-tracking branch 'scrawl/next' into next
2013-02-17 20:29:45 +01:00
scrawl
b52df83d84
Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again
2013-02-17 20:23:22 +01:00
Marc Zinnschlag
e5149e57ac
Merge remote-tracking branch 'scrawl/next' into next
2013-02-17 20:04:18 +01:00
Marc Zinnschlag
475f4f9311
implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified
2013-02-17 20:03:39 +01:00
scrawl
52d0f0b750
Fixed OpAddItem, OpRemoveItem
2013-02-17 19:44:00 +01:00
Marc Zinnschlag
abd307d70e
Issue #567 : workaround for crash with non-English ESX files
2013-02-17 19:26:01 +01:00
scrawl
e1ca0a15ae
Add message box when item is added to player's inventory
2013-02-17 18:58:54 +01:00
scrawl
170a9762ac
Fix travel services not actually costing gold.
2013-02-17 18:30:21 +01:00
scrawl
791d16bbdb
Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes
2013-02-17 18:12:38 +01:00
Marc Zinnschlag
31bfe62bbc
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 17:41:19 +01:00
Marc Zinnschlag
9221c861c5
Merge remote-tracking branch 'graffy76/next' into next
...
Conflicts:
apps/opencs/CMakeLists.txt
2013-02-17 17:38:33 +01:00
Marc Zinnschlag
bb990b96bf
Merge branch 'globaltype' into next
2013-02-17 17:27:41 +01:00
Marc Zinnschlag
50d61a5b6e
proper implementation of gmst type column
2013-02-17 17:27:25 +01:00
scrawl
7ffcfa3622
Water and clouds no longer depend on timescale.
2013-02-17 16:23:55 +01:00
scrawl
5a11ddc485
Pressing F1 again hides the quick keys menu.
2013-02-17 16:01:36 +01:00
scrawl
d899f33444
Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.
2013-02-17 16:00:31 +01:00
scrawl
00db13be32
Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.
2013-02-17 15:56:22 +01:00
graffy76
ceefae81e8
fix for the opencs icon
2013-02-17 07:46:50 -06:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Marc Zinnschlag
44d66cbf5a
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 09:09:31 +01:00
Marc Zinnschlag
448293f270
Merge remote-tracking branch 'scrawl/bug_559' into next
2013-02-17 09:09:06 +01:00
Marc Zinnschlag
b8c0c94d5f
Merge remote-tracking branch 'wareya/master' into next
2013-02-17 08:58:41 +01:00
