Chris Robinson
da575b181e
Use the correct GMST for the race menu
2013-02-25 13:04:17 -08:00
Chris Robinson
000128d084
Merge remote-tracking branch 'zini/master' into misc-cleanup
2013-02-25 10:38:08 -08: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
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
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
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
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
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
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
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
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
