Marc Zinnschlag
|
86e65944b8
|
Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
apps/openmw/CMakeLists.txt
|
2014-04-15 11:31:48 +02:00 |
|
Jeffrey Haines
|
e2fab228f9
|
Save state is handled correctly now.
|
2014-04-14 18:11:04 -04:00 |
|
cc9cii
|
966ed46870
|
Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.
|
2014-04-13 18:34:08 +10:00 |
|
cc9cii
|
3e6e325e5b
|
Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).
|
2014-04-13 14:53:36 +10:00 |
|
cc9cii
|
e9be6d3f42
|
Fix falling animation where vec.z is set to zero.
|
2014-04-13 11:34:59 +10:00 |
|
cc9cii
|
0bef754873
|
Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271.
|
2014-04-13 08:46:02 +10:00 |
|
cc9cii
|
d2a41167d0
|
Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075
|
2014-04-11 21:24:00 +10:00 |
|
Emanuel Guevel
|
09bd0324c9
|
Fail properly when a content file is not found
|
2014-04-08 20:19:09 +02:00 |
|
Marc Zinnschlag
|
03b3487f1b
|
minor cleanup
|
2014-04-07 09:56:36 +02:00 |
|
Marc Zinnschlag
|
fafb7501e3
|
Merge remote-tracking branch 'cc9cii/PathFinder-split'
|
2014-04-07 09:48:15 +02:00 |
|
Emanuel Guevel
|
ce7aa96371
|
Fix visual glitch happening when closing inventory while sneaking
(bug #1255)
|
2014-04-06 22:21:28 +02:00 |
|
Marc Zinnschlag
|
c7f2cfeca0
|
Merge remote-tracking branch 'gus/AIFix2'
|
2014-04-06 15:13:30 +02:00 |
|
Jeffrey Haines
|
a274b48f2f
|
States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
|
2014-04-05 22:45:40 -04:00 |
|
Jeffrey Haines
|
940c88d2ec
|
Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
|
2014-04-05 10:26:14 -04:00 |
|
Jeffrey Haines
|
df5cbe5dec
|
Minor changes
|
2014-04-04 08:10:35 -04:00 |
|
cc9cii
|
28f7c42fb7
|
One more comment fix.
|
2014-04-04 18:17:42 +11:00 |
|
cc9cii
|
f59226265a
|
Remove redundant parameter from aStarSearch. Also update some comments.
|
2014-04-04 18:10:06 +11:00 |
|
Jeffrey Haines
|
70919ba60a
|
Removed witnesses and minor changes
|
2014-04-03 16:13:14 -04:00 |
|
cc9cii
|
5cf8e7e933
|
Remove logging.
|
2014-04-04 06:16:26 +11:00 |
|
cc9cii
|
040d4f8fc4
|
Move PathgridGraph into separate files.
|
2014-04-04 06:13:47 +11:00 |
|
Jeffrey Haines
|
0c957a3cde
|
Added witnesses to the mix
|
2014-04-03 14:53:31 -04:00 |
|
cc9cii
|
a8b2eb1fe9
|
Make Travis happy.
|
2014-04-03 22:49:22 +11:00 |
|
cc9cii
|
325d0616bb
|
Cleanup debug statements.
|
2014-04-03 22:17:45 +11:00 |
|
cc9cii
|
98f77714ce
|
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
This version still has debugging statements and needs cleaning up.
|
2014-04-03 21:43:44 +11:00 |
|
Jeffrey Haines
|
b1abef7a38
|
Cleaned up code
|
2014-04-03 01:07:56 -04:00 |
|
Jeffrey Haines
|
58b135a2be
|
Crime is now checked every frame call
|
2014-04-03 00:50:09 -04:00 |
|
cc9cii
|
f597d3e88b
|
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
|
2014-04-03 07:46:26 +11:00 |
|
Jeffrey Haines
|
510f2d10ac
|
Replaces broken code with todo
|
2014-04-02 14:20:33 -04:00 |
|
Jeffrey Haines
|
6f1211dd8d
|
Moved mWitnesses into Player. resetCrime for paying fine.
|
2014-04-02 12:23:38 -04:00 |
|
Jeffrey Haines
|
7c0b51fb7e
|
Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
|
2014-04-02 00:18:22 -04:00 |
|
Jeffrey Haines
|
50dac98a2b
|
Feature 1154 & 73: Crime and NPC reactions
|
2014-04-01 20:24:25 -04:00 |
|
Jeffrey Haines
|
4037f3705e
|
Feature 1154 & 73: NPCs react to crime
|
2014-04-01 14:15:55 -04:00 |
|
Marc Zinnschlag
|
12e46c5dc7
|
Merge remote-tracking branch 'megaton/master'
|
2014-03-31 10:24:12 +02:00 |
|
Marc Zinnschlag
|
4ee1069baa
|
Merge remote-tracking branch 'scrawl/master'
|
2014-03-31 10:11:54 +02:00 |
|
scrawl
|
f5810b8e1c
|
Consider aspect ratio for loading screen background
More consistent with the main menu.
|
2014-03-30 23:07:49 +02:00 |
|
scrawl
|
1265131203
|
Set the selected index after all items are added (workaround for MyGUI bug)
|
2014-03-30 20:07:43 +02:00 |
|
megaton
|
50af9bc0d3
|
General perfomance optimizations.
|
2014-03-30 19:45:27 +04:00 |
|
cc9cii
|
d04bb3befb
|
MSVC uses C version of locale.
|
2014-03-30 17:23:22 +11:00 |
|
Jeffrey Haines
|
8ce938c6f1
|
Revert 6b28c06..98fd381
This rolls back to commit 6b28c06b2c .
|
2014-03-29 22:26:53 -04:00 |
|
Jeffrey Haines
|
98fd381564
|
Feature #1154 Not all NPCs get aggressive when one is attacked
Compiling fix
|
2014-03-29 21:25:20 -04:00 |
|
Jeffrey Haines
|
6c866deb1b
|
Feature #1154 Not all NPCs get aggressive when one is attacked
Partially implemented
|
2014-03-29 21:23:34 -04:00 |
|
scrawl
|
5eeed03f5b
|
Only exchange bribe gold if the bribe was accepted
|
2014-03-30 00:12:31 +01:00 |
|
scrawl
|
72df9e77c6
|
Don't show version text in the pause menu
|
2014-03-30 00:07:32 +01:00 |
|
gus
|
d9ea7107b7
|
compile fix.
|
2014-03-29 18:36:32 +01:00 |
|
gus
|
bee057346b
|
Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
|
2014-03-29 18:05:56 +01:00 |
|
Marc Zinnschlag
|
adab85eeb7
|
Merge remote-tracking branch 'jeffreyhaines/master'
|
2014-03-29 13:29:06 +01:00 |
|
Jeffrey Haines
|
6b28c06b2c
|
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
|
2014-03-29 07:47:41 -04:00 |
|
Jeffrey Haines
|
ad9286a30f
|
Revert "Revert "made mReceiver private""
This reverts commit 33aecc5218 .
|
2014-03-29 07:45:56 -04:00 |
|
Jeffrey Haines
|
33aecc5218
|
Revert "made mReceiver private"
This reverts commit 3e8f7b3bae .
|
2014-03-29 07:45:36 -04:00 |
|
Marc Zinnschlag
|
c7b969821f
|
silenced a warning
|
2014-03-29 11:11:43 +01:00 |
|