gus
|
1eb3d3e10e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
Conflicts:
apps/openmw/CMakeLists.txt
|
2013-04-01 14:10:19 +00:00 |
|
gus
|
47cc945ef4
|
more refactoring
|
2013-04-01 12:38:13 +00:00 |
|
Marc Zinnschlag
|
26db983599
|
minor fix
|
2013-04-01 10:46:08 +02:00 |
|
Chris Robinson
|
d0703efd69
|
Another place to check the class' isActor method
|
2013-03-31 17:32:39 -07:00 |
|
Chris Robinson
|
04aeb3dd07
|
Rename Mechanics' Activators to Objects
|
2013-03-31 17:32:38 -07:00 |
|
Chris Robinson
|
10d04c928c
|
Use the object's class to check if it's an actor
|
2013-03-31 17:32:38 -07:00 |
|
gus
|
63424ade56
|
refactoring
|
2013-03-31 17:30:03 +00: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
|
4836ba16f7
|
Implement turning states
|
2013-03-31 03:50:20 -07:00 |
|
Chris Robinson
|
7b02ec411b
|
Apply the rotation when updating the character controller
|
2013-03-31 01:29:24 -07: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
|
af65ecd841
|
Pass the movement vector in as a parameter to CharacterController::update
|
2013-03-30 18:37:40 -07: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
|
cc8f7f238e
|
Enchanted item base ptr fix
|
2013-03-29 00:55:29 +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
|
efe6a3ebee
|
Fix compile error & warnings
|
2013-03-26 18:01:01 +01:00 |
|
scrawl
|
2ecd2f4ecd
|
Merge branch 'next' into HEAD
|
2013-03-26 17:44:53 +01:00 |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
2013-03-23 08:16:46 +01:00 |
|
Marc Zinnschlag
|
fd2c07a6f4
|
delete death events on adding an actor to the scene
|
2013-03-18 10:54:47 +01:00 |
|
Marc Zinnschlag
|
61cb0f98a6
|
keep track of death events
|
2013-03-18 10:47:09 +01:00 |
|
scrawl
|
95e1cdc07d
|
Move getArmorRating to MWWorld::Class.
|
2013-03-17 22:29:12 +01:00 |
|
scrawl
|
dd57eabc3e
|
Better use an enum for magic effect IDs
|
2013-03-16 23:28:26 +01:00 |
|
scrawl
|
1666bc7740
|
Armor rating
|
2013-03-16 22:53:33 +01:00 |
|
gus
|
9efb073617
|
clean up + correct a bug
|
2013-03-14 18:05:00 +00:00 |
|
gus
|
80804fac35
|
check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended.
|
2013-03-14 17:16:37 +00:00 |
|
gus
|
f943580138
|
Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy
|
2013-03-12 17:44:22 +00:00 |
|
gus
|
bbc4c23f7e
|
AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok.
|
2013-03-10 15:07:22 +00:00 |
|
Emanuel Guevel
|
c020665cf2
|
Fix appending int to string in an exception message
|
2013-03-09 01:00:03 +01:00 |
|
gus
|
01908dbcc2
|
little improvement
|
2013-03-06 21:17:33 +00:00 |
|
gus
|
5fc7103425
|
First attempt at pathfinding using boost::graph
|
2013-03-06 20:31:47 +00:00 |
|
scrawl
|
8be9627c8d
|
Fix method signatures
|
2013-03-06 21:26:41 +01:00 |
|
scrawl
|
f7d8f6456f
|
Stats should never go below 0
|
2013-03-06 20:45:11 +01:00 |
|
scrawl
|
268bb23590
|
Implemented sneaking animation
|
2013-03-06 16:58:56 +01:00 |
|
scrawl
|
6f05c4229f
|
Implemented potion & ingredient effect stacking
|
2013-03-03 12:41:37 +01:00 |
|
scrawl
|
cf87708c1f
|
Magic effect icons for spells
|
2013-03-03 12:01:19 +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 |
|
Marc Zinnschlag
|
88e8659a49
|
minor cleanup
|
2013-02-25 16:52:31 +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
|
89d4c245e9
|
Better calculate jump velocity
The fatigue term isn't currently used correctly
|
2013-02-24 03:30:33 -08:00 |
|
Chris Robinson
|
d77d035d3a
|
Handle the "sound" events in runAnimation
|
2013-02-23 14:15:11 -08:00 |
|
Chris Robinson
|
e6da9dfae5
|
Specify the animation key to stop playing at
|
2013-02-23 05:15:10 -08:00 |
|
Chris Robinson
|
f841576bba
|
Don't override animations played with playgroup
|
2013-02-23 01:54:46 -08:00 |
|
Chris Robinson
|
7fcca180b6
|
Implement rudimentary jumping
|
2013-02-20 20:08:04 -08:00 |
|
Chris Robinson
|
1399a06c76
|
Update animation looping when setting the same state
|
2013-02-19 04:01:33 -08:00 |
|