scrawl
|
1773c70455
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
|
2013-11-10 22:03:17 +01:00 |
|
Marc Zinnschlag
|
ef8360f346
|
silenced a warning
|
2013-11-10 21:45:27 +01:00 |
|
scrawl
|
6cd373c5c6
|
Only allow using powers once every 24 h. Apply on touch effects.
|
2013-11-10 15:40:31 +01:00 |
|
scrawl
|
71828351e6
|
Code cleanup: use enum instead of integer
|
2013-11-10 15:28:26 +01:00 |
|
Emanuel Guevel
|
aefa54d72d
|
Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
|
2013-11-10 02:45:16 +01:00 |
|
Emanuel Guevel
|
2786530430
|
Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
|
2013-11-10 02:45:16 +01:00 |
|
Emanuel Guevel
|
10abb9d297
|
Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
|
2013-11-10 02:45:16 +01:00 |
|
scrawl
|
3e58655a90
|
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
|
2013-11-09 10:49:00 +01:00 |
|
scrawl
|
cbe96a2170
|
Refactor ActiveSpells to track range type. Added basic self range magic.
|
2013-11-09 07:51:46 +01:00 |
|
gus
|
683b8d77dd
|
build fix (thanks travis)
|
2013-10-31 11:02:26 +01:00 |
|
gus
|
d587f3c946
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
|
2013-10-31 09:51:17 +01:00 |
|
gus
|
02ded18fc5
|
Linux backslash fix
|
2013-10-31 09:43:12 +01:00 |
|
gus
|
2a927f65d3
|
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
|
2013-10-30 20:52:23 +01:00 |
|
gus
|
650a112e2e
|
better timer
|
2013-10-30 20:42:50 +01:00 |
|
gus
|
a6e7c6c104
|
disable AI combat for creatures
|
2013-10-28 23:04:46 +01:00 |
|
gus
|
0e86209224
|
linux fix :p
|
2013-10-28 18:33:10 +01:00 |
|
gus
|
b7a9243173
|
fighting should stop when the target is dead
|
2013-10-28 18:22:36 +01:00 |
|
gus
|
12d8b4e0f8
|
bugfix
|
2013-10-28 18:13:07 +01:00 |
|
gus
|
2d84f7d33d
|
NPC run
|
2013-10-28 18:10:00 +01:00 |
|
gus
|
d7584f9df7
|
getLineOfSight, no script instruction yet
|
2013-10-28 18:01:40 +01:00 |
|
gus
|
2515a1239e
|
improved combat conditions
|
2013-10-27 14:22:51 +01:00 |
|
gus
|
968968502e
|
NPC always face you when fighting
|
2013-10-27 14:03:58 +01:00 |
|
gus
|
a0edb55f60
|
only NPC with fight over 80 will attack you now
|
2013-10-27 13:50:29 +01:00 |
|
gus
|
882b136b35
|
bugfix of bugfix ^^
|
2013-10-27 13:21:16 +01:00 |
|
Marc Zinnschlag
|
19bd0f90b9
|
Merge remote-tracking branch 'rainChu/torches'
|
2013-10-16 21:24:45 +02:00 |
|
Alex "rainChu" Haddad
|
2643214ca6
|
Lights extinguish underwater
|
2013-10-15 21:50:32 -04:00 |
|
Alex "rainChu" Haddad
|
30ee3c5cf6
|
Equipped torches and lights run out of fuel
|
2013-10-15 21:50:14 -04:00 |
|
Emanuel Guevel
|
dcfff79460
|
Regenerate fatigue over time
|
2013-10-13 00:40:27 +02:00 |
|
Marc Zinnschlag
|
458c752425
|
Merge remote-tracking branch 'mckibbenta/tgm'
|
2013-10-12 13:38:10 +02:00 |
|
gus
|
94069e3a7e
|
bugfix
|
2013-10-07 20:30:12 +02:00 |
|
gus
|
1ac3d99c78
|
pathfinding now works in AICombat.
|
2013-10-07 10:20:02 +02:00 |
|
Emanuel Guevel
|
2abe5c1c9a
|
Acrobatics: do not apply fall damages when slowfalling spell effect is active
If spell effect ends up in mid-air, calculate fall height from then.
|
2013-10-02 23:34:25 +02:00 |
|
Emanuel Guevel
|
6e09a5fb4a
|
Acrobatics: reinit fall height at current height rather than zero
To prevent problems.
|
2013-10-02 23:34:25 +02:00 |
|
Emanuel Guevel
|
2b992ef3b5
|
Acrobatics: use calculated fatigueTerm
|
2013-10-02 23:34:24 +02:00 |
|
Emanuel Guevel
|
4c151e59a2
|
Acrobatics: do not touch modified stats
|
2013-10-02 23:34:24 +02:00 |
|
Emanuel Guevel
|
4860514865
|
Acrobatics: cosmetic changes
|
2013-10-02 23:34:24 +02:00 |
|
mckibbenta
|
857deb3723
|
Merge branch 'master' into tgm
|
2013-10-02 13:54:03 -04:00 |
|
mckibbenta
|
073f64c8bb
|
stop weapon condition degredation (for the player) with tgm on
|
2013-10-02 13:46:33 -04:00 |
|
Emanuel Guevel
|
b8c60dabb3
|
Reintroduce Acrobatics changes made by Glorf
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
|
2013-10-01 23:35:34 +02:00 |
|
gus
|
83a375b55d
|
AI now continue to hit you.
TODO: change the way time is handled
|
2013-09-28 21:17:06 +02:00 |
|
gus
|
2537384c50
|
bug fix
|
2013-09-28 12:25:37 +02:00 |
|
gus
|
9353f4d14f
|
WIP AI combat
|
2013-09-25 18:01:36 +02:00 |
|
Marc Zinnschlag
|
94bb97e766
|
replacing tabs with spaces
|
2013-09-21 08:40:00 +02:00 |
|
Marc Zinnschlag
|
96b181bb54
|
Merge remote-tracking branch 'xethik/master'
|
2013-09-21 08:07:00 +02:00 |
|
Xethik
|
094e4d93b7
|
Generally speaking, you should never compare iterators from two different compilers
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
|
2013-09-20 21:38:10 -04:00 |
|
mckibbenta
|
6bb6ba6372
|
added god mode comment
|
2013-09-15 16:12:59 -04:00 |
|
mckibbenta
|
89b7d6121d
|
Initial toggleGodMod/tgm instruction. Currently only affects player health.
|
2013-09-12 08:30:00 -04:00 |
|
gus
|
f9bfbc8764
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
|
2013-09-10 16:18:39 +02:00 |
|
gus
|
46a734852b
|
adding script instruction getLOS + some test about AI
|
2013-09-10 16:16:13 +02:00 |
|
mckibbenta
|
e545f49807
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
|
2013-09-02 18:40:37 -04:00 |
|