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
|
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 |
|
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 |
|
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 |
|