teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
20465 commits 34 branches 0 tags 66 MiB
Commit graph

3801 commits

Author SHA1 Message Date
Koncord
f5e23d5fc6 [General] Empty strings should be sent too 2017-09-04 04:03:02 +08:00
scrawl
2e58024f1c Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable. 2017-09-03 14:14:15 +00:00
Koncord
d904628103 [General] Avoid limitation of 512 symbols in RakString Ctor 2017-09-03 18:53:45 +08:00
scrawl
5e790b567e Fix node path issue 
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
 2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab Add const qualifiers 2017-09-01 21:42:36 +00:00
scrawl
5d524a6a10 Add custom version of MorphGeometry replacing osgAnimation 
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
 2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry 2017-09-01 21:42:35 +00:00
scrawl
209e139aa8 Move double buffering implementation inside RigGeometry 
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.

Override accept(NodeVisitor&) instead of using callbacks.
 2017-09-01 21:42:34 +00:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
scrawl
45f7563a55 Revert "Revert "Check for a Geometry node when attaching bodyparts"" 
Issue with shaders has been fixed with b9931fb71c

This reverts commit a1e3fb7604.
 2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c Set the shader on the node containing the StateSet 2017-08-31 21:39:21 +00:00
David Cernat
08df8f8d83 [General] Update version to 0.6.1 2017-08-31 18:45:41 +03:00
David Cernat
98a7769b91 Merge branch 'master' into 0.6.0 2017-08-31 15:44:27 +03:00
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-08-31 15:14:13 +03:00
Koncord
54f5104345 [General] Escape format for strings 2017-08-31 20:09:05 +08:00
David Cernat
cca4991e74 [Utils] Use consistent names for utility functions added by tes3mp 2017-08-31 10:12:22 +03:00
scrawl
a1e3fb7604 Revert "Check for a Geometry node when attaching bodyparts" 
This reverts commit 3fc8634206.
 2017-08-29 22:40:19 +00:00
scrawl
3fc8634206 Check for a Geometry node when attaching bodyparts (Fixes #3957) 2017-08-29 12:55:42 +00:00
scrawl
bc82c6a35d Use white color if told to use nonexisting vertexcolors (Fixes #3833) 2017-08-27 21:22:44 +00:00
scrawl
5d2fe5e887 Implement lightmode/vertmode of NiVertexColorProperty 2017-08-27 21:22:17 +00:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document. 
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
 2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
679a284735 Use scoped lock instead of directly locking/unlocking mutex 2017-08-21 13:33:11 -04:00
Kyle Cooley
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
b62cb0e2a4 Clear out GPU texture/stateset cache 2017-08-20 19:55:16 -04:00
Kyle Cooley
7914fd5c9c Re-index BSAs 2017-08-20 19:36:21 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -04:00
Thunderforge
54fe645703 Removing erroneous comment since Qt is not relevant here 2017-08-09 23:12:43 -05:00
Thunderforge
464c64a306 Swap the OIS Ctrl and Meta keys on macOS to match Qt 2017-08-09 20:03:27 -05:00
scrawl
cef415509f Revert "Merge redundant input events" 2017-08-06 20:54:20 +00:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
 2017-08-05 00:09:34 +03:00
David Cernat
0e2038f045 [General] Record and get player positions before their last cell change 2017-08-04 21:45:52 +03:00
Julian
3cfd9af945 merge redundant input events 2017-08-02 18:54:16 +02:00
scrawl
c9d9461d3e Add Spacer class derived from AutoSizedWidget 
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.

The new class sets HStretch and VStretch to true by default to save some typing.
 2017-07-31 16:20:29 +02:00
Koncord
1aabcdd09c [General] Add *_WITH_ACK_RECEIPT to master server packets 2017-07-31 19:08:04 +08:00
Koncord
8384a8aa8a [General] Return sent packet number 2017-07-31 19:08:04 +08:00
Unknown
bfbfbeac43 Added networking and saving for custom spells 2017-07-31 03:45:47 +10:00
David Cernat
f61664ff6d [General] Update version to 0.6.0 2017-07-28 23:22:58 +03:00
David Cernat
4db64e1721 [Client] Synchronize spellcasting for non-bipedal creatures 2017-07-28 20:49:26 +03:00
David Cernat
8b79cdd4f4 [Server] Document script functions, part 3 
Also reorder functions in Cells and CharClass so they are consistent with the rest.
 2017-07-25 18:07:09 +03:00
David Cernat
2c1ece79fc Merge pull request #245 from OpenMW/master 
Add OpenMW commits up to 22 Jul 2017
 2017-07-23 22:02:16 +03:00
PlutonicOverkill
5049fe4320 Pause game when minimised on Windows 2017-07-20 21:31:05 +12:00
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