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
Marc Zinnschlag
6ebd0aa56a
Merge remote-tracking branch 'potatoesmaster/pinned' into next
2013-02-20 14:26:53 +01: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
Marc Zinnschlag
f5445a8ce4
Merge remote-tracking branch 'scrawl/next' into next
2013-02-20 14:14:47 +01: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
Chris Robinson
6ae00be8a3
Fix nifbullet shape transformation
2013-02-19 22:28:15 -08:00
scrawl
f4749f10da
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
2013-02-20 05:35:52 +01:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
2dea86bbc7
Make the "lock window" button appealing
2013-02-20 01:30:42 +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
Chris Robinson
66743ecee7
Remove some unused trace fields
2013-02-19 07:00:22 -08:00
Chris Robinson
86f6491bc8
Remove unused pmove code
2013-02-19 06:38:48 -08: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
ChrisKCat
5eca26903a
Merge pull request #3 from scrawl/animation2
...
Fix collision debug drawer (tcg)
2013-02-18 19:07:39 -08:00
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
2013-02-19 04:03:24 +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
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
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
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
Chris Robinson
6356d3a385
Start actors with collision enabled
...
NPCs are now affected by gravity. The player still starts in no-collision mode
though, since they start in the void rather than a door marker.
2013-02-17 06:02:57 -08:00
graffy76
ceefae81e8
fix for the opencs icon
2013-02-17 07:46:50 -06:00
