Marc Zinnschlag
d5741c7141
Merge remote-tracking branch 'scrawl/master'
2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a02d62c1bdaf3fa0fda470189f5182bb, reversing
changes made to 67422c397c883017b4ff6a7adfb405cdf767f807.
2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2
Fix a case folding bug
2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38
Merge remote-tracking branch 'scrawl/insertrecords'
2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
2013-05-01 13:44:23 +02:00
scrawl
40a0969055
Insert records that may not exist in vanilla MW
2013-05-01 12:47:50 +02:00
Glorf
236ec3409f
Finished acrobatics
2013-05-01 12:21:59 +02:00
scrawl
67422c397c
GetWindSpeed
2013-05-01 11:42:24 +02:00
scrawl
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
2013-05-01 11:15:43 +02:00
Glorf
5a8c1661be
Jump acrobatics working, started falling acrobatics implementation
2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33
Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.
2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
2013-04-30 20:26:59 +02:00
Marc Zinnschlag
61e476118d
Merge remote-tracking branch 'kcat/animations'
2013-04-30 10:25:26 +02:00
scrawl
c0dd383cd0
Fix door collision to work with all possible movement directions
2013-04-30 09:43:32 +02:00
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
Marc Zinnschlag
bab899513a
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6
Enabled collision when new game
2013-04-29 17:56:16 +02:00
Chris Robinson
d17e1e83d5
Rename MWRender's Player to Camera
2013-04-29 05:50:40 -07:00
scrawl
867c7db014
Fix wrong door sounds
2013-04-29 11:00:15 +02:00
scrawl
78596cad83
Fix enchantment points value
2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b
Don't store the player base node in MWRender::Player
2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b
Merge remote-tracking branch 'zini/master' into animations
2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034
Merge remote-tracking branch 'scrawl/doors'
2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1
Fix some doors
2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b
Merge remote-tracking branch 'glorf/bugfix-4'
2013-04-28 16:52:48 +02:00
Glorf
98baf9fac1
Bugfix #718
2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14
More fixes
2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02
Put door physics in a separate method, some fixes
2013-04-28 15:36:37 +02:00
scrawl
9343b4459e
Opening doors
2013-04-28 14:59:15 +02:00
Marc Zinnschlag
738a54337d
removed redundant case smashing
2013-04-28 14:07:53 +02:00
scrawl
fdf80c1c4f
Fix unused variable
2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4
Fix changeWeather
2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1
Avoid special-casing player rotation
2013-04-28 01:14:58 -07:00
Glorf
3669d0a998
Bugfix #742
2013-04-27 20:57:44 +02:00
Chris Robinson
137017b325
Don't allow forcing vanity mode
2013-04-27 01:24:36 -07:00
Marc Zinnschlag
4e45222a63
Merge remote-tracking branch 'glorf/rotate-update1'
2013-04-25 20:57:24 +02:00
Glorf
240217ae42
Fixed rotations more than 360 degrees
2013-04-25 20:52:38 +02: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
Marc Zinnschlag
71fc8f5830
Merge remote-tracking branch 'scrawl/item' into next
2013-04-25 10:21:14 +02:00
scrawl
9e3917881d
Don't fail on nonexistent items in a levelled list
2013-04-25 04:44:30 +02:00
Nathan Jeffords
2dc01fe56b
fixed the type of iterator uses in MWWorld::Store
...
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
2013-04-25 02:31:39 +02:00
Glorf
53fb17da10
Rotation system fixes
2013-04-24 21:42:04 +02:00
greye
cfccf0981d
update IndexedStore::setUp() for multiple datafile support
2013-04-23 14:36:38 +04:00
scrawl
3c5e4ceefd
Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)
2013-04-18 16:46:32 +02:00
scrawl
547f77031d
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again
2013-04-17 17:06:30 +02:00
Glorf
1fd59d0ce0
Removed useless include
2013-04-16 21:21:54 +02:00
Glorf
1e92ffc314
Added rotation layer
2013-04-16 21:17:19 +02:00
Glorf
e0357c7b7c
Merge rotate
2013-04-15 20:29:38 +02:00