David Cernat
b8b3856c73
Merge pull request #244 from OpenMW/master
...
Add OpenMW commits up to 19 Jul 2017
2017-07-19 20:49:56 +03:00
scrawl
3e03a0d7bd
Terrain: remove ref argument that is now always true
2017-07-19 16:24:35 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
David Cernat
c8d965488f
Merge pull request #243 from OpenMW/master
...
Add OpenMW commits up to 18 Jul 2017
2017-07-18 16:59:33 +03:00
scrawl
ffb6dff6aa
Merge pull request #1338 from akortunov/valuefix
...
Change mValue type for clothes to unsigned short (bug #3960 )
2017-07-18 10:13:51 +00:00
Andrei Kortunov
2bd105f5e2
Change mValue type for clothes to unsigned short ( fixes #3960 )
2017-07-18 11:51:19 +04:00
David Cernat
43a3daf0aa
[General] Add & implement PlayerShapeshift packet for werewolf states
2017-07-15 09:02:19 +03:00
David Cernat
ad9fa0631a
[General] Rename jailText to jailEndText and add jailProgressText in PlayerJail
2017-07-13 20:13:28 +03:00
David Cernat
e36c0afc59
[General] Send faction reputation via PlayerFaction packets
2017-07-13 13:36:00 +03:00
David Cernat
be93ec8ef6
[General] Implement ObjectState packet
2017-07-13 09:46:30 +03:00
David Cernat
083b46394d
[General] Add ignoreJailSkillIncreases to PlayerJail packets
2017-07-12 18:24:37 +03:00
David Cernat
5962570c48
[General] Add jailText to PlayerJail packets
2017-07-12 16:39:31 +03:00
David Cernat
3280f0c5ee
[General] Implement PlayerJail packet
...
Rework server's DeathFunctions into MechanicsFunctions
Remove connection between PlayerResurrect and jailing
2017-07-11 13:34:09 +03:00
David Cernat
6f6a3ae74d
Merge pull request #238 from OpenMW/master
...
Add OpenMW commits up to 11 Jul 2017
2017-07-11 03:37:53 +03:00
scrawl
40dc1dd6f5
Fix checking a variable before it's assigned (Bug #3950 )
2017-07-10 23:50:24 +02:00
scrawl
be940656db
Add '0' as an alias for 'OFF' for OPENMW_OPTIMIZE
2017-07-10 23:49:42 +02:00
David Cernat
3529f9b090
[General] Add placeholders for PlayerJail, ObjectState & ConsoleCommand
2017-07-10 12:33:53 +03:00
David Cernat
4e74910fdb
[General] Disable automatic sync for PlayerJournal and PlayerFaction
...
Simplify PlayerFaction packets by removing BOTH action
2017-07-08 12:27:48 +03:00
David Cernat
2c05b7f747
[Server] Rename InitiateEvent() into InitializeEvent() for consistency
2017-07-07 08:12:48 +03:00
David Cernat
1d504a665f
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
2017-07-05 07:06:33 +03:00
David Cernat
60574ae667
[General] Implement jail time as a death penalty
2017-07-03 15:45:21 +03:00
David Cernat
71313c5aa6
[General] Implement PlayerMap packet, part 1
2017-07-03 09:28:27 +03:00
David Cernat
1f682749d6
[General] Add optional notes to PasswordDialogs
2017-07-02 13:07:36 +03:00
Koncord
0cf09adb44
[General] Move AddProcessor to BasePacketProcessor
2017-06-30 20:09:05 +08:00
Koncord
ed3e089126
[General] Use C++11 way to delete Ctor
2017-06-27 22:56:02 +08:00
Koncord
5b2cab4c6b
[General] Change NULL to nullptr
2017-06-27 22:49:28 +08:00
Koncord
2b1b4ce2f1
[General] Update PacketControllers to C++11
2017-06-27 22:41:37 +08:00
Koncord
fcccd7b665
[General] Remove creatureStats.mDead from packets
2017-06-27 15:03:41 +08:00
David Cernat
813a3c89c4
[General] Implement PlayerBook packet to track skill books read
2017-06-27 08:27:14 +03:00
David Cernat
b3b73c5cd2
[General] Implement resurrection at nearest shrine or temple
2017-06-27 01:01:45 +03:00
David Cernat
78f29302ef
[General] Fix PlayerJournal logic by sending only refIds for its actors
...
Additionally, make the refIds for actors usable in script functions.
2017-06-23 08:12:32 +03:00
David Cernat
48c63dbce9
[General] Fix ObjectLock packets by making hasCellData true for them
2017-06-22 05:49:44 +03:00
David Cernat
ebf7740969
[General] Repurpose GameConsole packet as GameSettings & add difficulty to it
2017-06-20 05:28:45 +03:00
David Cernat
df67ae4689
Merge pull request #229 from OpenMW/master
...
Add OpenMW commits up to 20 Jun 2017
2017-06-20 04:16:51 +03:00
scrawl
54bb1b13cb
Change NCO/NCC flags to NC* ( Fixes #3915 )
2017-06-20 00:36:17 +02:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Koncord
6192543381
[General] Move bracket to the right position
2017-06-15 13:06:07 +08:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Bret Curtis
c6805314c2
be explicit about what we are trying to catch instead of catching everything and fixed up formatting
...
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love
revert allman formatting changes
2017-06-12 00:32:29 +02:00
Bret Curtis
7c758a6293
std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast
2017-06-12 00:32:28 +02:00
Bret Curtis
f0b21cca22
use own inline hash_combine function
2017-06-12 00:32:28 +02:00
David Carlier
8a5c62de97
needs this head for getuid
2017-06-10 14:50:43 +01:00
David Cernat
70d9374a6a
[General] Implement PlayerKillCount packets
2017-06-10 14:04:19 +03:00
David Cernat
5b23da8e1c
[General] Rename unused PlayerRegionChange packet into PlayerKillCount
2017-06-10 12:01:37 +03:00
David Cernat
ee5c9b65c5
[General] When changing region, send new region name in PlayerCellChange
2017-06-10 11:43:40 +03:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702
replace boost::bind
2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96
remove boost/tuple
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
David Cernat
34378fbb4f
[General] Make coding style consistent
2017-06-08 23:34:56 +03:00
David Cernat
a84cf7c191
[General] Fix packet validation for ActorPackets sent by server scripts
...
This allows Lua scripts to send actor data again, which hadn't been possible anymore after 2ed1bfe
2017-06-08 23:28:58 +03:00
Koncord
2ed1bfe427
[General] Simplify ActorPackets
2017-06-03 03:42:10 +08:00
Koncord
fd8e833d6a
[General] Simplify WorldPackets
2017-06-03 03:10:47 +08:00
Koncord
556bf18535
[General] Minor improvements for player packets
...
Add compression, remove useless loop iterations
2017-06-03 02:23:34 +08:00
Koncord
ad873e16b8
[Client] Limiting updates to ~64 per second
2017-06-02 21:20:35 +08:00
Koncord
c2600bac8e
[General] Allow single bit booleans in packets
2017-06-02 21:03:29 +08:00
Koncord
7e5e877fda
[General] Pack player->direction.pos to 1 byte
2017-06-02 20:16:23 +08:00
Koncord
dded330cc4
[General] Get rid Z axis in direction.pos
2017-06-02 18:33:59 +08:00
Koncord
ae9e5750ac
[General] Aggressive compression of rotations
2017-06-02 17:20:34 +08:00
Koncord
3905e0dae9
[General] Get rid direction.rot again
2017-06-02 15:44:51 +08:00
David Cernat
d0a0b6ffa4
[General] Add basic integrity checks to all Actor and World packets
2017-06-02 01:35:32 +03:00
David Cernat
d8cd57a8be
[Client] Make topic sync work with localized versions of the game
2017-05-31 14:11:16 +03:00
David Cernat
a353a21280
[General] Fix code style inconsistencies
2017-05-31 08:37:11 +03:00
David Cernat
068a45be87
[General] Synchronize player & NPC rotation animations
2017-05-30 12:08:58 +03:00
David Cernat
f4cdedd8cb
[General] Synchronize summoned creatures
2017-05-30 10:11:01 +03:00
David Cernat
4e5c8873e0
[General] Use ObjectSpawn instead of ObjectPlace for actors
2017-05-29 06:59:05 +03:00
David Cernat
c211d53190
[General] Use only direction.pos in ActorPosition, as advised by Koncord
2017-05-29 05:55:25 +03:00
David Cernat
0cce9908be
Merge pull request #222 from OpenMW/master
...
Add OpenMW commits up to 29 May 2017
2017-05-29 04:53:23 +03:00
David Cernat
27148ce9eb
[General] Add placeholders for 12 new packets, to be implemented soon
...
Additionally, make it slightly clearer who created which previously existing packets.
2017-05-29 04:43:52 +03:00
Julian Ospald
5d85fa9220
Fix build with osg >= 3.5.6
2017-05-28 17:30:01 +02:00
Koncord
f7473e3379
[General] Fix copy-posty bug
2017-05-28 17:00:52 +08:00
David Cernat
9fe5b4a305
[General] Remove debug line from ActorAnimFlags
2017-05-28 10:43:53 +03:00
Koncord
8478fed98a
[General] Simplify Actor packets.
2017-05-28 15:23:16 +08:00
Koncord
f6fba70a4e
[General] Use compression for Position packets
2017-05-28 14:57:30 +08:00
Koncord
4934be18f0
[General] Add compression flag to RW methods
...
Advantages: and 2 bytes per float value, using huffman algorithm for structures and strings.
Disadvantages: bad for performance and precision for float/double variables.
2017-05-28 14:56:51 +08:00
David Cernat
73b9683182
[General] Make most ActorPackets smaller by not including refIds in them
2017-05-27 16:59:23 +03:00
David Cernat
311ce4119d
[General] Fix logic issues related to ActorEquipment
2017-05-26 22:53:28 +03:00
David Cernat
4f273932af
[General] Implement sending and reading of ActorEquipment packets
2017-05-26 04:37:49 +03:00
David Cernat
32879adc5b
[General] Allow ObjectTrap to trigger traps, not just disarm them
2017-05-26 01:28:43 +03:00
Koncord
24d4e1c222
[General] Remove useless PacketSendMyID
2017-05-26 02:40:49 +08:00
Koncord
a9fc096c9a
[General] Move password of master server to header
2017-05-26 01:34:39 +08:00
Koncord
056ec2d434
[General] Fix CMake errors
2017-05-25 23:56:22 +08:00
Koncord
3e284a1139
[General] Use unsigned int instead unsigned long
...
sizeof(unsigned long) != 8 on Windows
2017-05-25 22:55:37 +08:00
David Cernat
7ec431ce3d
[General] Make packet style more consistent
2017-05-24 22:09:35 +03:00
David Cernat
11369f6513
[General] Implement sending and reading of PlayerTopic packets
2017-05-24 21:43:34 +03:00
David Cernat
08de349133
[General] Add placeholders for PlayerTopic & ObjectTrap packets
2017-05-24 19:01:28 +03:00
David Cernat
870fd9a78b
[General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead
2017-05-24 13:28:34 +03:00
Koncord
80bd268de6
[General] Use simple types for master server packets
2017-05-20 16:46:59 +08:00
David Cernat
b0cd636924
[General] Add basic integrity check to ProxyMasterPacket
2017-05-20 11:04:20 +03:00
Koncord
892960f913
[General] Add ctor to MasteData::Plugin
2017-05-20 00:06:34 +08:00
Koncord
956b573323
[General] Use different ordering channels for packets
2017-05-19 20:02:16 +08:00
David Cernat
e6983993c2
[General] Implement sending and reading of PlayerFaction packets
2017-05-18 19:27:20 +03:00
David Cernat
0189dbf916
[General] Make JournalItem consistent with other packet structs
2017-05-18 10:32:23 +03:00
David Cernat
ad388c7e12
[General] Add placeholders for ActorEquipment & PlayerFaction packets
...
Also reorder packets and packet processors.
2017-05-16 19:25:31 +03:00
David Cernat
f527fe9ebe
[General] Add basic integrity check to reading of ActorList packets
...
Additionally, add newlines to files missing them.
2017-05-16 14:20:40 +03:00
David Cernat
05564bd123
[General] Add basic integrity check to reading of Container packets
2017-05-14 20:24:06 +03:00
David Cernat
cc559cf8e2
[General] Don't send packets for dead LocalActors, to fix Position spam
2017-05-09 02:47:29 +03:00
David Cernat
26087a182d
Merge pull request #213 from OpenMW/master
...
Add OpenMW commits up to 8 May 2017
2017-05-08 01:03:19 +03:00
scrawl
813af876f6
Use a partial binary search in isReservedName ( Fixes #3835 )
2017-05-07 23:28:56 +02:00
David Cernat
de49f5f175
[General] Add and use isActor bool for WorldObject
2017-05-07 03:07:09 +03:00
David Cernat
9d2c5c3502
[General] Simplify structure of BaseEvent
2017-05-06 21:57:29 +03:00
Koncord
8422ae0ce8
[General] Fix iterators in ProxyMasterPacket
2017-05-07 02:48:02 +08:00
David Cernat
4d81455020
[General] Rework and simplify death reasons so they work with NPCs
2017-05-05 22:16:31 +03:00
David Cernat
a7b06b342f
Merge pull request #211 from OpenMW/master
...
Add OpenMW commits up to 5 May 2017
2017-05-05 18:50:46 +03:00
David Cernat
60cf623455
[Client] Make DedicatedActors transition into LocalActors when eligible
2017-05-05 07:37:09 +03:00
scrawl
8d84869432
Fix commit 8f71b65d38 (don't overwrite the previous user data)
...
This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type.
(Fixes #3829 )
2017-05-05 05:27:00 +02:00
Koncord
8fa8b8d310
[General] Add __WINDOWS define
2017-05-03 14:44:16 +08:00
Koncord
47e6820f97
[General] Move printWithWidth and intToHexStr to components
2017-05-03 14:38:44 +08:00
David Cernat
63dd2d9246
[General] Remove code related to ActorAuthority packets that is not used
2017-05-03 04:43:59 +03:00
David Cernat
c3c04bbfc3
[General] Make coding style consistent
2017-05-02 22:47:58 +03:00
Koncord
931a5896ec
[General] Improve PacketPreInit
2017-05-02 23:31:30 +08:00
David Cernat
1a699329e5
[General] Set new BaseActor booleans in corresponding packets
2017-05-01 20:18:22 +03:00
David Cernat
730df061b3
[General] Add hasPositionData and hasStatsDynamicData bools to BaseActor
2017-05-01 19:44:23 +03:00
Koncord
9c7c0f9989
[General] Send creatureModel & useCreatureName via PacketPlayerBaseInfo
2017-05-01 21:14:30 +08:00
David Cernat
e8e0090b9b
[General] Use new SimpleCreatureStats struct in BaseActor
2017-04-30 18:44:59 +03:00
Koncord
465a05bad0
[Client] Add ability to look like a creature for the DedicatedPlayers
2017-04-30 00:18:44 +08:00
Koncord
a4e45de6ca
[General] Fix playersCount
2017-04-27 11:41:45 +08:00
David Cernat
6a21ec1fdc
[General] Rename PlayerPos into PlayerPosition
2017-04-25 22:11:33 +03:00
David Cernat
7b07d6651f
[General] Add and use PlayerBounty packet and matching script functions
2017-04-25 21:24:39 +03:00
Koncord
6e8750b9e4
[General] Change list players to vector players
2017-04-24 20:22:13 +08:00
Koncord
9643eb6026
[Master] Notify server about announce state
...
Rename structure Server to QueryData
2017-04-24 19:58:48 +08:00
David Cernat
2eaa25e7d4
[General] Update version to 0.6-alpha
2017-04-23 17:31:08 +03:00
David Cernat
ef634a1c52
Merge pull request #205 from OpenMW/master
...
Add OpenMW commits up to 23 Apr 2017
2017-04-23 14:47:10 +03:00
David Cernat
f4c3a28141
[General] Finalize ActorCellChange packet structure
2017-04-23 14:01:13 +03:00
Koncord
c35d5a2c6c
[Master] Implement Master server
2017-04-23 13:39:43 +08:00
Koncord
4c939f6d0a
[General] Split tes3mp components in CMakeLists by group
2017-04-23 13:39:43 +08:00
Koncord
546bb42abb
[General] Add Master Packets
2017-04-23 13:39:43 +08:00
Koncord
5854f680f0
[General] Add Master data types
2017-04-23 13:39:43 +08:00
Koncord
41005b1add
[General] Add orderChannel to packets
2017-04-23 13:39:43 +08:00
scrawl
45d9e38616
Fix check for default material
2017-04-22 14:27:45 +02:00
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03:00
Allofich
e095817ac2
Treat =< and => as == in scripts
...
(Fixes #3744 )
2017-04-21 22:26:13 +09:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
David Cernat
f2e8e14665
[General] Add shouldSend boolean to mwmp::Attack
2017-04-19 16:43:58 +03:00
David Cernat
cc2250815d
[General] Add packet data for attacks on and by Actors
2017-04-18 10:03:58 +03:00
David Cernat
b1a394cd02
[General] Change chars into bools in mwmp::Attack for clarity
2017-04-17 19:54:31 +03:00
David Cernat
a650683bae
[General] Add and use Target struct in mwmp::Attack
2017-04-17 18:31:39 +03:00
David Cernat
9882ceedf3
[General] Remove attackerGuid from mwmp::Attack because it is redundant
2017-04-17 18:03:33 +03:00
David Cernat
caf5428532
[General] Rename mwmp::Attack vars in preparation for Actor support
2017-04-17 17:24:11 +03:00
David Cernat
2397afc6ce
[General] Move mwmp::Attack to BaseStructs
2017-04-17 15:12:11 +03:00
David Cernat
9f226253d4
[General] Rename mwmp::Attack's refid into refId for consistency
2017-04-17 09:35:18 +03:00
David Cernat
f0f0b2dcc9
[General] Send and read ActorSpeech packets
2017-04-16 18:43:13 +03:00
David Cernat
1fb11dafef
[General] Send and read ActorStatsDynamic packets
2017-04-16 16:42:07 +03:00
David Cernat
00aa8839d4
[General] Update CMakeLists in components folder
2017-04-16 09:03:51 +03:00
David Cernat
870886192b
[General] Rename DYNAMICSTATS into STATS_DYNAMIC
2017-04-16 09:00:18 +03:00
David Cernat
ca8fd1aa72
[General] Remove ActorHeadRotation packet because it would be too spammy
2017-04-15 15:49:40 +03:00
David Cernat
2872675f5e
[General] Send and read ActorAnimPlay packets
2017-04-15 13:42:30 +03:00
David Cernat
bf17464074
Merge pull request #198 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
2017-04-15 05:36:50 +03:00
scrawl
8f71b65d38
sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly
2017-04-14 15:04:53 +02:00
David Cernat
e7960eee76
[General] Rename DrawState packets into AnimFlags ones for clarity
2017-04-14 16:00:34 +03:00
David Cernat
d2fe777f89
[General] Send and read ActorDrawState packets
2017-04-13 15:26:48 +03:00
David Cernat
10ad5b2a99
[General] Remove BaseActor's AnimStates that are no longer needed
2017-04-13 13:06:09 +03:00
David Cernat
0d196af685
[General] Add placeholders for 7 new ActorPackets
2017-04-11 11:37:38 +03:00
David Cernat
7700b82952
[General] Clean up BaseEvent and BaseStructs
2017-04-10 16:33:07 +03:00
David Cernat
7662297334
[General] Use ESM::Position to store BaseActor's movement
2017-04-10 16:32:10 +03:00
David Cernat
742d6f653a
[General] Add ActorPosition packet
2017-04-10 12:38:30 +03:00
David Cernat
b6c3830ea0
[General] Rename WorldObject's pos into position for consistency
2017-04-10 09:25:20 +03:00
David Cernat
174f316787
[General] Rename PacketActorFrame into PacketActorTest
2017-04-10 08:37:18 +03:00
David Cernat
a5d0486c82
[General] Set actor data correctly
2017-04-10 07:22:03 +03:00
David Cernat
b9d68c0ab2
Merge pull request #195 from OpenMW/master
...
Add OpenMW commits up to 10 Apr 2017
2017-04-10 01:20:42 +03:00
MiroslavR
c962b6dd6d
Fix correctActorModelPath to work properly when both backward and forward slashes are used in the path ( Fixes #3822 )
2017-04-09 18:34:36 +02:00
David Cernat
c52084a028
[General] Use BaseActorLists in ActorPackets
2017-04-09 16:32:44 +03:00
David Cernat
4f3d05eed2
[General] Add ActorList class
2017-04-09 10:50:35 +03:00
David Cernat
070c6a3bd4
[General] Add ActorPacketController & make controller var names clearer
2017-04-09 08:51:28 +03:00
David Cernat
b8ca2382c7
[General] Remove variables that are not going to be used in ActorFrame
2017-04-08 11:27:08 +03:00
David Cernat
d3f3fb5d05
[Client] Correctly implement movement animation sync for NPCs
2017-04-08 08:59:21 +03:00
David Cernat
d829d219c3
[General] Add (very) partial animation sync for NPCs
2017-04-06 15:11:51 +03:00
David Cernat
67ec81ad0c
[Client] Use utility function for converting strings in mwmp::Cell
2017-04-06 05:45:49 +03:00
David Cernat
d24cde16dd
[General] Add simple BaseActor and LocalActor classes
2017-04-05 12:52:27 +03:00
David Cernat
8f18dc87c4
[General] Model ActorList on Container more closely by including action
2017-04-05 04:45:51 +03:00
David Cernat
8c2469bf6d
[General] Add placeholder ActorList, ActorAuthority & ActorFrame packets
2017-04-05 04:06:45 +03:00
David Cernat
2bd81c3de0
[Client] Use mpNum for every WorldObject
2017-04-04 11:07:16 +03:00
David Cernat
ddedcac510
[General] Read and write mpNums in world packets
2017-04-04 10:16:09 +03:00
David Cernat
8cc61b6048
[General] Generate mpNums on the server when forwarding ID_OBJECT_PLACE
2017-04-04 09:23:34 +03:00
David Cernat
06acd3cbc4
[Client] Add a multiplayer object index and matching methods to CellRef
2017-04-04 07:42:02 +03:00
David Cernat
106c9edead
Merge pull request #192 from OpenMW/master
...
Add OpenMW commits up to 3 Apr 2017
2017-04-04 01:48:43 +03:00
MiroslavR
395e97cf40
Remove evil "implicit GetJournalIndex" hack from expression parser
2017-04-03 01:44:26 +02:00
Koncord
1d2a6d9056
[Server] Rename dontRead to avoidReading
2017-04-03 06:44:14 +08:00
Koncord
4daf471874
[General] Add dontRead flag
2017-04-03 06:13:00 +08:00
David Cernat
dff52d8fbe
Merge pull request #191 from OpenMW/master
...
Add OpenMW commits up to 31 Mar 2017
2017-04-01 03:27:44 +03:00
Koncord
48a59cf9e9
[General] Add new class BasePacketProcessor
2017-04-01 02:33:03 +08:00
Allofich
3780d94214
Cast LAND_SIZE to integer to avoid linking error
2017-03-28 01:57:31 +09:00
Allofich
2a505b427d
Remove second LAND_SIZE definition
2017-03-27 03:45:53 +09:00
David Cernat
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
2017-03-24 07:24:55 +02:00
scrawl
f676b62711
Remove unused variable
2017-03-23 19:35:07 +01:00
David Cernat
ab92b9f795
Merge pull request #187 from OpenMW/master
...
Add OpenMW commits up to 20 Mar 2017
2017-03-20 04:59:12 +02:00
scrawl
c992cb6e82
Fix texture not being applied on rendering the composite map ( Fixes #3791 )
2017-03-19 19:15:22 +01:00
MiroslavR
06dc94552f
Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing
2017-03-18 15:42:24 +01:00
David Cernat
5eb183bacf
Merge pull request #186 from OpenMW/master
...
Add OpenMW commits up to 15 Mar 2017
2017-03-15 23:13:24 +02:00
scrawl
a070551af3
Attempt to fix naming conflict on windows
2017-03-15 17:51:00 +01:00
scrawl
3d58ba7301
Fix boolean test
2017-03-15 17:50:13 +01:00
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
fd215caa02
Add local LandCache to cut down on store searches
2017-03-14 19:27:57 +01:00
scrawl
088d5604bf
Use a shader if required to display the composite map
...
Fixes composited terrain not respecting the 'clamp lighting' setting.
2017-03-14 19:27:56 +01:00
scrawl
7f5beb3172
Remove unused includes
2017-03-14 19:27:56 +01:00
scrawl
5044816770
Remove unused code
2017-03-14 19:27:56 +01:00
scrawl
b66c2abfe3
Build the bounding sphere in the loading thread (only relevant for TerrainGrid)
2017-03-14 19:27:56 +01:00
scrawl
9e9c028f1d
Skip light collection for far away terrain
2017-03-14 19:27:56 +01:00
scrawl
0782839a42
Avoid redundant culling tests on the transform/drawable
2017-03-14 19:27:56 +01:00
scrawl
fb8ac06524
Reduce the minSize of quad tree nodes for better performance
2017-03-14 19:27:56 +01:00
scrawl
a041546b54
Use the quad tree's minSize in the LodCallback
2017-03-14 19:27:56 +01:00
scrawl
e4e8821902
Refactor update of lodFlags
2017-03-14 19:27:56 +01:00
scrawl
2aa09639a9
Re-enable terrain intersections
2017-03-14 19:27:56 +01:00
scrawl
db00d47ca2
Hold a ref to the intersection visitor's view if possible
2017-03-14 19:27:56 +01:00
scrawl
11bee6ee35
Avoid compiling composite maps that are no longer referenced
2017-03-14 19:27:56 +01:00
scrawl
9eed7fa6f5
Fix composite map when force shaders is enabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
7d50b6c2e2
Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps
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
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
c921620ef3
Compile the drawables of a composite map one by one to avoid frame drops for larger maps
2017-03-14 19:27:56 +01:00
scrawl
47ca8aeee5
Use the time elapsed instead of # compiled as limit
2017-03-14 19:27:56 +01:00
scrawl
8a6d909b22
Fix composite map being compiled twice
2017-03-14 19:27:56 +01:00
scrawl
683e625c6c
Rewrite CompositeMapRenderer to be based on Drawable and share the FBO
2017-03-14 19:27:56 +01:00
scrawl
4baa795152
Add preloading implementation to QuadTreeWorld
2017-03-14 19:27:56 +01:00
scrawl
9db71e3f62
Recompute the LOD stitching when the view changes
2017-03-14 19:27:56 +01:00
scrawl
ef704db877
Fix reset of changed flag
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
433900fca5
Fix waiting on initial quad tree build
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
2580de11a4
Refactor ownership of ViewDataMap
2017-03-14 19:27:56 +01:00
scrawl
5a3c645c89
Enable lazy compiling of composite maps
2017-03-14 19:27:56 +01:00
scrawl
99e18f0d68
Clear the ViewData on exit
2017-03-14 19:27:56 +01:00
scrawl
bb991850da
Add LOD stitches
2017-03-14 19:27:56 +01:00
scrawl
6bd286d924
Fix unnecessary resizing in ViewData
2017-03-14 19:27:56 +01:00
scrawl
8c151364df
Add special handling for CullVisitor to QuadTreeWorld.
...
- Cull only against bounding box, not bounding sphere, as this appears to perform better.
- Also traverse into non visible nodes to compute their LOD, this is to avoid nodes having to be loaded in when the player turns the view around, and will avoid unnecessary refs/unrefs of rendering data in the View. This should probably be turned off at some point for static cameras, such as the local maps.
2017-03-14 19:27:56 +01:00
scrawl
f19a88be9d
Reject QuadTreeNodes with invalid bounds
2017-03-14 19:27:56 +01:00
scrawl
7d004bf757
Preliminary rendering of QuadTreeWorld
2017-03-14 19:27:55 +01:00
scrawl
e36bdb490e
Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection
2017-03-14 19:27:55 +01:00
scrawl
0efc54c749
Subdivide the composite maps
2017-03-14 19:27:55 +01:00
scrawl
0756fc4ae6
Optimize getBlendmaps for the general case that most points are within the given cell
2017-03-14 19:27:55 +01:00
scrawl
81c9853fe9
Fix handling in getBlendmaps when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
b384087e28
Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell
2017-03-14 19:27:55 +01:00
scrawl
819860081f
Remove custom bounding box
2017-03-14 19:27:55 +01:00
scrawl
ce8c4ad4f5
Add quad tree implementation (no rendering yet)
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
c487df0abb
Move updateTextureFiltering and material into the base class
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
7e4450da55
Change the renderOrder of composite maps to ensure they are updated before water reflections or other cameras that may be using it.
2017-03-14 19:27:55 +01:00
scrawl
b1d4bb5708
Add CompositeMapRenderer
...
Temporarily render all terrain using composite maps for testing purposes
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
