David Cernat
60037e4081
Merge pull request #185 from OpenMW/master
...
Add OpenMW commits up to 14 Mar 2017
2017-03-15 11:20:06 +02:00
scrawl
e987fe85d0
Add abort flag to TerrainPreloadItem
2017-03-14 21:28:57 +01:00
scrawl
42e9891504
Fix issues caused by loading multiple views into the same terrain View
2017-03-14 20:27:55 +01:00
scrawl
97ed999097
Fix cleanup issue
2017-03-14 20:02:22 +01:00
scrawl
c22fde2bcd
Preload terrain while reading savegame
2017-03-14 19:27:56 +01:00
scrawl
59bf100907
Fill exteriorPositions in preloadFastTravel
2017-03-14 19:27:56 +01:00
scrawl
03c07d3bd5
Remove old code
2017-03-14 19:27:56 +01:00
scrawl
86e75f0987
Preload terrain even when cell preloading is disabled
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
4549196b31
Use the new way of terrain preloading in CellPreloader/Scene
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
b898315962
cellpreloader: abort all tasks first before waiting
2017-03-14 19:27:55 +01:00
scrawl
804f873649
terrain: factor out texture caching into a separate class
2017-03-14 19:27:55 +01:00
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2017-03-13 18:20:07 +02:00
scrawl
809f5cd01b
Fix bad override
2017-03-08 01:28:56 +01:00
Koncord
690211ad99
[General] Extract BaseEvent & BasePlayer from packets to functions
...
Move Send and Read functions to BasePacket
2017-03-06 18:40:07 +08:00
David Cernat
df051a777a
Merge pull request #181 from OpenMW/master
...
Add OpenMW commits up to 4 Mar 2017
2017-03-04 22:56:16 +02:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
Koncord
cea1425db1
[Client] Remove redundant newlines & keep ~120 columns
2017-03-04 14:55:35 +08:00
David Cernat
a2ef39c655
Merge pull request #178 from OpenMW/master
...
Add OpenMW commits up to 2 Mar 2017
2017-03-02 22:14:15 +02:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
2017-02-28 19:11:00 +00:00
Rafael Moura
05cc69f6f1
Porting more ContainerStoreIterator usage to const version
2017-02-26 21:24:51 +00:00
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
2017-02-26 16:59:53 +02:00
David Cernat
341ec28b1f
[Client] Don't allow actors to cast spells that don't exist on client
2017-02-26 15:34:15 +02:00
David Cernat
ff0d21ef38
[Client] Spawn in 0,0 if Pelagiad doesn't exist (for other master files)
2017-02-24 19:42:33 +02:00
David Cernat
328e3b6618
Merge pull request #167 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2017
2017-02-24 06:57:39 +02:00
scrawl
25ca89b560
Avoid redundant allocations in Store::search
2017-02-23 23:28:50 +01:00
David Cernat
ed2176c984
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
2017-02-23 09:19:09 +02:00
David Cernat
38ccc2671c
Merge pull request #164 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2017-02-23 00:52:53 +02:00
scrawl
a5247394dc
(Re)set the inventory listener outside of the Animation class
2017-02-22 15:08:22 +01:00
Koncord
b0ebad8b83
[Client] Fix crash on Linux
2017-02-22 16:30:07 +08:00
David Cernat
67b67ce1c4
[Client] Don't automatically rescale objects on cell change
2017-02-22 04:21:25 +02:00
scrawl
a45335ffc3
Do not reduce magicka in god mode
2017-02-21 16:33:18 +01:00
David Cernat
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
2017-02-21 07:02:59 +02:00
scrawl
9728a6967e
Reset fall height when teleporting ( Fixes #2629 )
2017-02-20 20:27:05 +01:00
scrawl
7e02bb7348
Preload summoned creature models before the spell is cast
2017-02-20 19:58:00 +01:00
scrawl
22482b7eec
Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes
2017-02-20 19:04:02 +01:00
David Cernat
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
2017-02-19 23:47:32 +02:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
Rafael Moura
ecbde7b11e
Added ConstContainerStoreIterator
...
using base template for ContainerStoreIterators
less template arguments for ContainerStoreIteratorBase
2017-02-18 13:47:18 +00:00
Allofich
bc60421615
Change NPC equip logic to be more like original
...
(Bug #3754 )
2017-02-18 21:59:09 +09:00
Koncord
74cfc4a821
[Client] Use enum instead magic values
2017-02-18 15:26:11 +08:00
David Cernat
0d75264221
Merge pull request #155 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017, part 2
2017-02-17 23:19:30 +02:00
MiroslavR
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
2017-02-17 03:11:37 +01:00
David Cernat
c32c004516
Merge pull request #151 from OpenMW/master
...
Add OpenMW commits up to 16 Feb 2017
2017-02-16 11:53:02 +02:00
