scrawl
|
1a2daa3bc1
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
|
2013-03-31 14:50:03 +02:00 |
|
Chris Robinson
|
13c098266c
|
Pass player rotation through the movement settings
|
2013-03-31 02:57:22 -07:00 |
|
scrawl
|
69099c11a2
|
Merge branch 'enchanting' into companion
|
2013-03-31 11:52:55 +02:00 |
|
Chris Robinson
|
18e8ff7198
|
Actually rotate the object when updating physics
|
2013-03-31 02:24:44 -07:00 |
|
Chris Robinson
|
7b02ec411b
|
Apply the rotation when updating the character controller
|
2013-03-31 01:29:24 -07:00 |
|
scrawl
|
13be61812a
|
Made the "Unknown class key" exception slightly more helpful
|
2013-03-31 10:16:02 +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 |
|
Chris Robinson
|
0ce188b7cc
|
Store the position and rotation in MWMechanics::Movement
|
2013-03-30 19:00:46 -07:00 |
|
Chris Robinson
|
63af72c315
|
Avoid converting to and from quaternions
|
2013-03-30 17:31:16 -07:00 |
|
scrawl
|
0079f62180
|
Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references.
|
2013-03-30 16:27:06 +01:00 |
|
scrawl
|
51204f098e
|
Added soulgem dialog; made interactive message boxes not close the previous UI
|
2013-03-30 15:51:07 +01:00 |
|
scrawl
|
e7af718b55
|
Remove unnecessary WindowManager::messageBox arguments
|
2013-03-30 12:56:37 +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
|
86275e5bd4
|
Some enchanting fixes
|
2013-03-29 12:00:09 +01:00 |
|
Glorf
|
eb88463b94
|
Some enchanting fixes
|
2013-03-28 23:39:20 +01:00 |
|
Glorf
|
6643fe789c
|
Enchanting system
|
2013-03-28 17:41:00 +01:00 |
|
scrawl
|
6f1575d42a
|
CELL record corrections
|
2013-03-27 17:27:43 +01:00 |
|
Marc Zinnschlag
|
6c76e97bbc
|
fixed day count in rest dialogue
|
2013-03-25 11:53:02 +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 |
|
scrawl
|
8e2f9f5186
|
Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips
|
2013-03-22 12:24:09 +01:00 |
|
Marc Zinnschlag
|
feaf2b43fb
|
disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active
|
2013-03-22 09:44:59 +01:00 |
|
scrawl
|
918cdcffc2
|
Split up components/esm/loadlocks
|
2013-03-22 05:50:54 +01:00 |
|
Marc Zinnschlag
|
775f9e8402
|
Merge remote-tracking branch 'potatoesmaster/dialogue' into next
|
2013-03-20 20:53:14 +01:00 |
|
Emanuel Guevel
|
6783ff6748
|
Workaround to have dialogues until actor detection is implemented for NPCs
|
2013-03-20 20:10:55 +01:00 |
|
scrawl
|
2509b34ace
|
Enabled bloodmoon weather
|
2013-03-20 02:48:10 +01:00 |
|
scrawl
|
6c1ff8caca
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
|
2013-03-20 02:29:03 +01:00 |
|
scrawl
|
21cc7483e4
|
Fix broken weather transitions
|
2013-03-20 01:20:56 +01:00 |
|
Glorf
|
f5bf7254a8
|
Minor console selection improvements
|
2013-03-18 23:46:17 +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
|
5922637c58
|
Unblocked Solstheim weather that should work now.
|
2013-03-17 20:12:26 +01:00 |
|
Glorf
|
f3fd3a7691
|
Much more moons fallbacks
|
2013-03-17 19:36:14 +01:00 |
|
Glorf
|
1369090a80
|
More moons fallbacks, minor weather fixes
|
2013-03-17 14:50:02 +01:00 |
|
Glorf
|
ea7f386e7d
|
Access to Fallback via getFallback
|
2013-03-17 13:50:15 +01:00 |
|
greye
|
52ed451ae7
|
fix eraseStatic() assumptions
|
2013-03-17 08:36:15 +04:00 |
|
scrawl
|
dd57eabc3e
|
Better use an enum for magic effect IDs
|
2013-03-16 23:28:26 +01:00 |
|
scrawl
|
c0b0227e8a
|
enchanting
|
2013-03-16 19:00:14 +01:00 |
|
Marc Zinnschlag
|
66a2df68db
|
some cleanup
|
2013-03-15 10:26:04 +01:00 |
|
Glorf
|
727a598cbe
|
Last tabulator died
|
2013-03-15 10:32:03 +01:00 |
|
Glorf
|
542c1bcc53
|
Some other tabulators deleted
|
2013-03-15 10:28:39 +01:00 |
|
Glorf
|
e1c6c3fe02
|
Tabulators deleted
|
2013-03-15 10:22:02 +01:00 |
|
Glorf
|
521bebd2f4
|
Fallback system rewritten, added light fallbacks
|
2013-03-15 10:17:30 +01:00 |
|
scrawl
|
5b943a965f
|
Handle always run in the inputmanager, instead of using forced stance.
|
2013-03-14 21:08:19 +01:00 |
|
scrawl
|
2d8f0949a4
|
Always run key (Y)
|
2013-03-14 20:27:16 +01:00 |
|
greye
|
d30b38f336
|
fix Store<T>::eraseStatic()
|
2013-03-14 19:28:17 +04:00 |
|
scrawl
|
84afd87321
|
Placeable objects should not collide unless they have a NiRootCollisionNode
|
2013-03-14 03:04:02 +01:00 |
|
Marc Zinnschlag
|
25fd7a41eb
|
Merge remote-tracking branch 'scrawl/next' into next
|
2013-03-12 18:13:57 +01:00 |
|