cc9cii
b36bb58e8c
Bug #1324 : Artem's solution
2014-05-18 07:34:13 +10:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
scrawl
51020fdb5f
Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.
2014-05-14 09:17:30 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
Thomas
085fb2c5a2
Simplified documentation a bit
2014-05-13 14:13:05 -04:00
Thomas
a61d804de6
now that I've found the documentation, fixed some stuff for extensions
2014-05-13 13:53:06 -04:00
Thomas
77d365e196
Forced some function arguments to take in a specific array size
2014-05-13 13:25:22 -04:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
Thomas
8f90dd43ec
Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier
2014-04-29 12:52:08 -04:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
scrawl
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
scrawl
6929e541dd
Fix texture name issue with Vality's Bitter Coast Mod
2014-04-21 05:30:14 +02:00
scrawl
2cb9f38a45
Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent.
2014-04-20 19:34:58 +02:00
scrawl
262e959699
Remove unused slice_array
2014-04-20 19:28:39 +02:00
scrawl
d3d0b7362f
Fix older savegame compatibility regarding new crime feature.
2014-04-18 12:34:26 +02:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Marc Zinnschlag
300eb6f444
make FNAM sub-record optional for all record types
2014-04-13 13:23:50 +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
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +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
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
scrawl
452b522bc3
Fix typos
2014-03-22 19:01:41 +01:00
slothlife
00eac7d53a
Fixed header include guard to match filename
2014-03-21 01:22:54 -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
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
scrawl
b0a1e1198a
Yet another terrain fix
2014-03-16 16:30:17 +01:00
scrawl
a9dcc90970
Another terrain fix
2014-03-09 11:59:23 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
scrawl
b8ca067730
Small fix for terrain
2014-03-09 03:21:34 +01:00
Marc Zinnschlag
f1353dc84f
Merge branch 'scene'
2014-03-06 16:46:44 +01:00
scrawl
d0f98103e4
Terrain: re-added "distant land=off" path
...
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
2014-03-06 03:04:23 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
4328e08162
Terrain: get rid of unneeded members
2014-03-05 21:46:37 +01:00
scrawl
6a002d19b3
Terrain: destroy no longer used materials
2014-03-05 21:46:37 +01:00
scrawl
97c3efb3ba
Terrain: decoupled Chunk from QuadTreeNode.
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
b3fed853ae
Terrain: take cell world size into account for LOD selection
2014-03-05 21:46:37 +01:00
scrawl
6c863486e1
Terrain: fix an embarrassing copy&paste mistake.
2014-03-05 21:46:36 +01:00
scrawl
64c9932597
Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
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
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
6e8b9c88b2
changed name of default worldspace (should reduce chance of a name conflict)
2014-03-02 22:43:15 +01:00
cc9cii
46867ec0cf
Fix file handles being left open on windows builds
2014-03-01 07:24:20 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
d780364842
fixed record size type
2014-02-22 17:31:44 +01:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
2014-02-22 23:45:13 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Marc Zinnschlag
c5b2c154f8
another esm writer fix
2014-02-20 12:49:56 +01:00
Marc Zinnschlag
72b29ddb79
fix broken esm writer header code
2014-02-20 12:35:57 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marc Zinnschlag
44f6f79bf5
Merge remote-tracking branch 'corristo/osx-ogre-19'
2014-02-16 17:12:52 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Nikolay Kasyanov
8f99da084b
OS X: plugins are now in Frameworks dir, not in Plugins
2014-02-16 14:13:12 +04:00
Marc Zinnschlag
0d84adb2c6
allow x->(y) instead of (x->y)
2014-02-15 12:50:40 +01:00
Marc Zinnschlag
fd665a1994
ignore conditions after an else (only works if condition is put in parentheses)
2014-02-15 12:45:50 +01:00
