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 |
|
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
|
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
|
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 |
|
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
|
86e5179fd8
|
Merge remote-tracking branch 'jeffreyhaines/master'
|
2014-03-28 22:40:12 +01:00 |
|
Jeffrey Haines
|
9efef31bb8
|
Feature #953 Trader Gold - Unused code/warning resolved
Removed unused code
getBaseGold throws proper error
|
2014-03-28 17:27:23 -04:00 |
|
Marc Zinnschlag
|
c38812d026
|
Merge remote-tracking branch 'jeffreyhaines/master'
|
2014-03-28 19:34:40 +01:00 |
|
Jeffrey Haines
|
401d21b4ee
|
getBaseGold implemented in MWWorld::Class for NPC and Creature
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
|
2014-03-28 14:21:38 -04:00 |
|
Marc Zinnschlag
|
2c2106205d
|
Merge remote-tracking branch 'scrawl/master'
|
2014-03-28 09:56:35 +01:00 |
|
scrawl
|
d7df9cae21
|
Bug #1224: Changed fix to potentially allow for language independent saves
|
2014-03-27 22:32:42 +01:00 |
|
scrawl
|
5906d795c0
|
Refactored video player (now a MyGUI widget)
|
2014-03-27 19:10:15 +01:00 |
|
Marc Zinnschlag
|
1b6b4e3442
|
Merge remote-tracking branch 'slothlife/weather_save'
|
2014-03-23 08:36:45 +01:00 |
|
cc9cii
|
772a49b2a6
|
Just some notes for future maintenance.
|
2014-03-23 13:38:11 +11:00 |
|
Marc Zinnschlag
|
87ae03b5d4
|
fix for previous commit
|
2014-03-22 16:39:24 +01:00 |
|
Marc Zinnschlag
|
6bd3b3ee78
|
include local variable state in saved games
|
2014-03-22 15:00:49 +01:00 |
|
slothlife
|
6dce3e5186
|
Fixed include to use C99 header, not C++11 header
|
2014-03-21 01:33:11 -05:00 |
|
slothlife
|
6eab9c5179
|
Move weather state save/load to a new class
|
2014-03-21 01:19:40 -05:00 |
|
slothlife
|
1acd1bd913
|
Feature #1173: Saved Game: include weather state
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
|
2014-03-20 01:25:52 -05:00 |
|
cc9cii
|
f71fb83bfc
|
Cleaned up more inaccurate comments.
|
2014-03-16 20:56:11 +11:00 |
|
cc9cii
|
f57c11254f
|
Revert to original variable names.
|
2014-03-16 20:09:18 +11:00 |
|
cc9cii
|
22c544d9d7
|
Remove unnecessary comment.
|
2014-03-16 12:51:12 +11:00 |
|
cc9cii
|
fdbd564700
|
Apparently fall trace needs to be done with the middle of the object.
|
2014-03-16 08:57:55 +11:00 |
|
cc9cii
|
43757efdc4
|
Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.
|
2014-03-16 08:09:14 +11:00 |
|
Marc Zinnschlag
|
7bc97fb8b8
|
reworked code for player positioning on startup and new game
|
2014-03-13 13:19:32 +01:00 |
|
scrawl
|
072dc6d438
|
Feature #50: Implement marksman mechanics.
|
2014-03-08 06:03:45 +01:00 |
|
scrawl
|
12de0afb03
|
Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
|
2014-03-08 01:31:27 +01:00 |
|
cc9cii
|
f36bea03ab
|
Bug #1189 fix by scrawl
|
2014-03-07 19:36:44 +11:00 |
|
scrawl
|
83b6fcf22e
|
Bug #416: Workaround for page flipping problem
|
2014-03-05 22:24:05 +01:00 |
|
scrawl
|
1d926816b5
|
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
edb5a54092
|
Include some more required Ogre headers explicitely.
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
195071efc7
|
Terrain: geometry is now loaded in background threads.
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
|
2014-03-05 21:46:37 +01:00 |
|
scrawl
|
8730b61362
|
Render maps after *all* cells have finished loading
Still not fixing Bug #772, but at least this will allow for background loading of terrain.
|
2014-03-05 21:46:36 +01:00 |
|
Bret Curtis
|
ab224f93c9
|
remove our stdint.h version that uses boost and force usage of system stdint.h
|
2014-03-05 17:08:58 +01:00 |
|
Marc Zinnschlag
|
0ae9cc0106
|
removed unused function
|
2014-03-03 08:21:16 +01:00 |
|
Marc Zinnschlag
|
ca30f2af3d
|
minor fix
|
2014-03-02 11:03:37 +01:00 |
|
Marc Zinnschlag
|
9b18e01507
|
keep track of which cells have state that needs to be saved
|
2014-02-24 10:03:04 +01:00 |
|
Marc Zinnschlag
|
bfcd768078
|
various bits of cleanup
|
2014-02-23 21:39:18 +01:00 |
|
Marc Zinnschlag
|
83ded18af0
|
encapsulated reference collections
|
2014-02-23 21:21:27 +01:00 |
|
Marc Zinnschlag
|
367919200f
|
moved CellRefList into a separate file
|
2014-02-23 20:11:05 +01:00 |
|
Marc Zinnschlag
|
f220867144
|
make Ptr a bit more pointer-like
|
2014-02-23 18:17:41 +01:00 |
|
Marc Zinnschlag
|
b72c1c2c58
|
encapsulated water level
|
2014-02-23 17:34:18 +01:00 |
|
Marc Zinnschlag
|
79e723ad06
|
encapsulated mIds
|
2014-02-23 16:46:07 +01:00 |
|
Marc Zinnschlag
|
8ea686c6c8
|
encapsulated mState
|
2014-02-23 14:26:36 +01:00 |
|
Marc Zinnschlag
|
7693f712bc
|
started making CellStore into a proper class; encapsulated mCell member
|
2014-02-21 11:35:46 +01:00 |
|
Emanuel Guevel
|
7c981587fc
|
When searching object by id, search in active cells before searching in the player's inventory
|
2014-02-13 22:58:12 +01:00 |
|
Emanuel Guevel
|
e597328b6b
|
Make enable/disable a no-op for items in containers
|
2014-02-13 20:24:27 +01:00 |
|
scrawl
|
ffe19e7a52
|
Feature #50: Handle attach & release of projectiles
|
2014-02-05 05:18:11 +01:00 |
|
Alexander "Ace" Olofsson
|
e50a393de4
|
Fix linking issues on Windows using MSVC.
|
2014-02-02 23:59:57 +01:00 |
|
Marc Zinnschlag
|
1b5301eec0
|
Merge branch 'savedgame'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
|
2014-02-01 18:16:32 +01:00 |
|
Marc Zinnschlag
|
5b04c10e1d
|
added creature/NPC state to saved games (only container/inventory for now)
|
2014-02-01 17:36:23 +01:00 |
|
Marc Zinnschlag
|
d2ec3ffdc8
|
handle equipped items when serialising inventory state
|
2014-02-01 17:31:05 +01:00 |
|
Marc Zinnschlag
|
bcc5894e2d
|
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
|
2014-02-01 15:24:01 +01:00 |
|
Marc Zinnschlag
|
dd674566a2
|
store content of containers in saved game files
|
2014-01-31 13:25:32 +01:00 |
|
Marc Zinnschlag
|
900532a6ca
|
store additional state of lights in saved game files
|
2014-01-30 12:37:33 +01:00 |
|
Marc Zinnschlag
|
ec7cb90ca4
|
added support for serialisation of CustomData state
|
2014-01-30 11:50:13 +01:00 |
|
scrawl
|
2b15b8b484
|
Fix gold bugs (Fixes #1145, Fixes #1146)
|
2014-01-29 15:37:27 +01:00 |
|
scrawl
|
a8a09762ce
|
Don't crash when deleting or disabling a moving door
|
2014-01-29 15:37:26 +01:00 |
|
scrawl
|
190512156d
|
Use some more GMSTs for enchanting
|
2014-01-29 15:37:26 +01:00 |
|
scrawl
|
ba67bf45f8
|
Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail.
This caused an exception when looting a creature that had moved cells.
|
2014-01-29 15:37:26 +01:00 |
|
Marc Zinnschlag
|
fd5486864a
|
Merge remote-tracking branch 'gus/AIFix2'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
|
2014-01-28 12:33:31 +01:00 |
|
Marc Zinnschlag
|
29c3a288e3
|
load and save of reference in cells (without CustomData state)
|
2014-01-27 13:27:42 +01:00 |
|
scrawl
|
79a9c4e048
|
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
|
2014-01-25 16:33:39 +01:00 |
|
scrawl
|
bdb03926c2
|
Fix crash when loading another game after dying
|
2014-01-25 16:13:45 +01:00 |
|
scrawl
|
f09328ca84
|
Clear global map overlay when starting/loading a game
|
2014-01-25 13:34:56 +01:00 |
|
gus
|
707e579dfe
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
|
2014-01-24 19:16:50 +01:00 |
|
scrawl
|
03cf383be7
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-24 18:28:35 +01:00 |
|
scrawl
|
295aed3533
|
Implement savegame screenshots
|
2014-01-24 17:49:16 +01:00 |
|
scrawl
|
ac4c904e62
|
Fix projectile bug
|
2014-01-24 13:22:30 +01:00 |
|
Marc Zinnschlag
|
460089c0aa
|
ignore deleted references that did not came from a content file
|
2014-01-23 12:53:55 +01:00 |
|
Marc Zinnschlag
|
419e3a7d30
|
write references in cells to saved game file
|
2014-01-23 12:51:42 +01:00 |
|
Marc Zinnschlag
|
22cb4784b5
|
store cell state in saved game files (no references yet)
|
2014-01-23 11:29:40 +01:00 |
|
scrawl
|
16f5f5862d
|
Feature #956: Implement blocking melee attacks
|
2014-01-21 23:25:24 +01:00 |
|
Marc Zinnschlag
|
9ebe66e693
|
improved cleanup; failed loads will now drop back into the main menu instead of crashing
|
2014-01-21 14:50:58 +01:00 |
|
scrawl
|
851a7d5014
|
Feature #957: Handle area effects for "on touch" range
|
2014-01-21 12:30:15 +01:00 |
|
scrawl
|
42284603f7
|
Properly handle on target effects with mArea=0
|
2014-01-20 13:44:38 +01:00 |
|
scrawl
|
205e8aa4e9
|
Feature #957: Implement area magic
|
2014-01-20 13:11:29 +01:00 |
|
scrawl
|
ba5300b071
|
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
|
2014-01-20 12:05:13 +01:00 |
|
scrawl
|
5dd3cfa09a
|
Loop projectile sounds
|
2014-01-20 11:50:52 +01:00 |
|
scrawl
|
1a00f26390
|
Bug #1126: Golden saints and many other creatures only have "Bip01 Head"
|
2014-01-19 14:33:41 +01:00 |
|
scrawl
|
589fbbd871
|
Issue #777: Create InventoryStore for creatures with weapons/shields
|
2014-01-19 11:43:23 +01:00 |
|
scrawl
|
4c0045b418
|
Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time)
|
2014-01-18 21:11:12 +01:00 |
|
Marc Zinnschlag
|
14e64c180f
|
on load check player record for dangling ID references
|
2014-01-18 15:06:58 +01:00 |
|
Marc Zinnschlag
|
6584a01d01
|
reset reference to player NPC record during cleanup
|
2014-01-18 14:53:25 +01:00 |
|
scrawl
|
9653355cf1
|
Feature #701: Spawn levelled creatures in cells
|
2014-01-18 07:26:27 +01:00 |
|
scrawl
|
228254c890
|
Handle creature attack animations in character controller
|
2014-01-17 16:31:27 +01:00 |
|
scrawl
|
c76a0448a3
|
Closes #1123: Implement SlowFall magic effect
|
2014-01-17 15:47:34 +01:00 |
|
Marc Zinnschlag
|
1b7697a4b2
|
handle missing player specific state during load/save
|
2014-01-17 13:07:57 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
scrawl
|
2836c7c927
|
Do not set owner when adding items to a container, as opposed to NPC/creatures
|
2014-01-17 10:55:46 +01:00 |
|
Marc Zinnschlag
|
c300cd9375
|
loading/saving of some player state (cell/coordinates and some other bits)
|
2014-01-16 12:03:23 +01:00 |
|
scrawl
|
d544551f61
|
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
|
2014-01-15 15:50:45 +01:00 |
|