Chris Robinson
|
15a2eeebb8
|
Merge remote-tracking branch 'zini/master' into animations
Conflicts:
apps/openmw/mwworld/worldimp.cpp
|
2013-04-29 10:16:29 -07:00 |
|
Marc Zinnschlag
|
93868c8bca
|
Merge remote-tracking branch 'scrawl/master'
|
2013-04-29 18:08:25 +02:00 |
|
Glorf
|
74de8b83b6
|
Enabled collision when new game
|
2013-04-29 17:56:16 +02:00 |
|
scrawl
|
867c7db014
|
Fix wrong door sounds
|
2013-04-29 11:00:15 +02:00 |
|
Chris Robinson
|
24e503330b
|
Merge remote-tracking branch 'zini/master' into animations
|
2013-04-28 09:41:31 -07:00 |
|
scrawl
|
9343b4459e
|
Opening doors
|
2013-04-28 14:59:15 +02:00 |
|
Chris Robinson
|
137017b325
|
Don't allow forcing vanity mode
|
2013-04-27 01:24:36 -07:00 |
|
Marc Zinnschlag
|
1e9656ee9c
|
Merge remote-tracking branch 'glorf/rotate-update1'
|
2013-04-25 20:22:40 +02:00 |
|
Glorf
|
7cd4dd0c91
|
Improved local rotations
|
2013-04-25 19:14:10 +02:00 |
|
Chris Robinson
|
274f3c7b77
|
Force character state to update after switching view modes
|
2013-04-25 07:08:11 -07:00 |
|
Glorf
|
e0357c7b7c
|
Merge rotate
|
2013-04-15 20:29:38 +02:00 |
|
Glorf
|
763308868d
|
Fixed rotation speed
|
2013-04-15 17:45:18 +02:00 |
|
Glorf
|
972481f63f
|
Working rotate, rotateworld
|
2013-04-15 16:45:53 +02:00 |
|
scrawl
|
2693b78536
|
Add initial player inventory when new game is started
|
2013-04-15 02:56:23 +02:00 |
|
Tom Mason
|
6ca2b1af74
|
fix for turning animations playing when in vanity mode
|
2013-04-09 19:24:41 +01:00 |
|
scrawl
|
ebaf80d539
|
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
|
2013-04-03 23:55:57 +02:00 |
|
scrawl
|
43cdbd033d
|
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
|
2013-04-03 21:17:31 +02:00 |
|
scrawl
|
05a5cb3ae4
|
Improved responsiveness of the inventory window when resizing.
|
2013-04-03 00:27:29 +02:00 |
|
scrawl
|
1a2daa3bc1
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
|
2013-03-31 14:50:03 +02:00 |
|
scrawl
|
b0199c703c
|
Companion UI
|
2013-03-31 13:13:46 +02:00 |
|
Chris Robinson
|
466c0086b8
|
Use a full Movement to hand off to the world physics update
|
2013-03-31 00:13:56 -07:00 |
|
scrawl
|
51204f098e
|
Added soulgem dialog; made interactive message boxes not close the previous UI
|
2013-03-30 15:51:07 +01:00 |
|
Marc Zinnschlag
|
573368849b
|
Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
apps/openmw/CMakeLists.txt
|
2013-03-29 16:48:21 +01:00 |
|
Glorf
|
6643fe789c
|
Enchanting system
|
2013-03-28 17:41:00 +01:00 |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
2013-03-23 08:16:46 +01:00 |
|
scrawl
|
20774f8f81
|
Added merchant repair feature
|
2013-03-22 14:13:10 +01:00 |
|
Glorf
|
a07c910d0b
|
Feature #535: Console object selection improvements
|
2013-03-18 21:33:12 +01:00 |
|
Marc Zinnschlag
|
08f6d04960
|
constness fixes
|
2013-03-18 08:29:40 +01:00 |
|
Marc Zinnschlag
|
19c3b5516d
|
Merge remote-tracking branch 'glorf/fallbacks-next' into next
|
2013-03-18 08:14:25 +01:00 |
|
scrawl
|
95e1cdc07d
|
Move getArmorRating to MWWorld::Class.
|
2013-03-17 22:29:12 +01:00 |
|
Glorf
|
ea7f386e7d
|
Access to Fallback via getFallback
|
2013-03-17 13:50:15 +01:00 |
|
scrawl
|
1666bc7740
|
Armor rating
|
2013-03-16 22:53:33 +01:00 |
|
scrawl
|
cebcbe11f8
|
Implemented service refusal
|
2013-03-16 20:32:21 +01:00 |
|
Glorf
|
521bebd2f4
|
Fallback system rewritten, added light fallbacks
|
2013-03-15 10:17:30 +01:00 |
|
scrawl
|
285b4bf726
|
Allow zooming camera in vanity or preview mode with the mousewheel
|
2013-03-08 00:12:56 +01:00 |
|
scrawl
|
e34685b8a3
|
Fix manually changed mouse cursor
|
2013-03-07 12:46:26 +01:00 |
|
scrawl
|
fe7b2732d8
|
Avoid manually updating render targets from within frameRenderingQueued
|
2013-03-05 14:24:29 +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 |
|
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
|
355390429e
|
Fix World::isUnderwater to use dynamic waterlevel
|
2013-02-25 17:27:50 +01:00 |
|
scrawl
|
73d48a95f6
|
Add message box when the player tries to move when being overencumbered.
|
2013-02-25 16:31:48 +01:00 |
|
Chris Robinson
|
5a1a0b7338
|
Add and use an MWWorld::isFlying method
|
2013-02-18 22:39:43 -08:00 |
|
Chris Robinson
|
158e18b98d
|
Remove an unused method
|
2013-02-16 00:30:07 -08:00 |
|
Chris Robinson
|
ac717373b1
|
Add a method to check if an object is on the ground
|
2013-02-14 22:35:15 -08:00 |
|
Chris Robinson
|
6a9755778e
|
Merge remote-tracking branch 'zini/next' into animation2
|
2013-02-12 18:14:46 -08:00 |
|
Marc Zinnschlag
|
64d9d9e2ce
|
Merge remote-tracking branch 'wheybags/master' into next
|
2013-02-10 17:29:28 +01:00 |
|
Tom Mason
|
158c6fc9fa
|
pressing enter when a messagebox is prompting for "ok", will activate ok button
|
2013-02-10 14:58:46 +00:00 |
|
Chris Robinson
|
34ddf69a31
|
Merge remote-tracking branch 'zini/next' into animation2
|
2013-02-09 09:46:57 -08:00 |
|
Chris Robinson
|
0a4568bd11
|
Move the PtrMovementList typedef to MWWorld
Use it for the doPhysics parameter, too
|
2013-02-05 11:03:39 -08:00 |
|