Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30823 commits 75 branches 59 tags 1.2 GiB
Commit graph

12044 commits

Author SHA1 Message Date
Stephen Birarda
82f5e2e04f skip processing of control packets before handshake 2015-08-25 17:26:25 -07:00
Stephen Birarda
83d76084f1 don't process packets in Connection without handshake 2015-08-25 17:14:41 -07:00
Stephen Birarda
cabdee8391 send a handshake before first packet send 2015-08-25 17:12:03 -07:00
Ryan Huffman
0bfa0c4942 Add progress to AssetResourceRequest 2015-08-25 16:35:41 -07:00
Ryan Huffman
0e98b179dd Update Asset gettings and uploading in AssetClient 2015-08-25 16:34:44 -07:00
Ryan Huffman
12b2dfb2f9 Clean up HTTPResourceRequest 2015-08-25 15:45:00 -07:00
Ryan Huffman
3eff605d72 Update asset server number 2015-08-25 15:44:37 -07:00
Ryan Huffman
1e6ff8a1e4 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-25 15:25:52 -07:00
Ryan Huffman
3959928bbb Update ResourceRequest::moveData to getData 2015-08-25 15:20:00 -07:00
Ryan Huffman
2efba00e3e Update BasePacket::read to do a copy 2015-08-25 15:19:07 -07:00
Ryan Huffman
6bba2f4cb1 Update Packet to properly copy packet position and message number 2015-08-25 15:18:40 -07:00
Ryan Huffman
c1b9613a30 Update PacketList::writeData() to be non-recursive 2015-08-25 14:58:56 -07:00
Atlante45
1878920ba4 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 21:43:37 +02:00
Stephen Birarda
61507bde09 fix order of member initialization in PacketList 2015-08-25 11:24:26 -07:00
Stephen Birarda
9ff7bfd0b5 some header cleanup in UDTTest output 2015-08-25 11:21:04 -07:00
Stephen Birarda
5e5bd77870 add initialization for all atomics in SendQueue 2015-08-25 09:55:21 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController 
Fix a couple crashes in the Controller scripting interface
 2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
53ae958c74 Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix 
Fix for RenderableParticleEffectEntity crash.
 2015-08-24 17:44:39 -07:00
Stephen Birarda
f7799bcf8f add TODO for settings fail, cleanup 2015-08-24 17:02:47 -07:00
Stephen Birarda
e84595af49 add a wait condition for empty queue and loss list 2015-08-24 17:02:40 -07:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub
6549e47dbc fix crash in Controller when asking for device name out of bounds 2015-08-24 14:35:19 -07:00
Ryan Huffman
4191ccd60d Move *ResourceRequest objects to separate files 2015-08-24 12:16:20 -07:00
Anthony J. Thibault
47b8ab373c Fix for RenderableParticleEffectEntity crash. 
The render item payload now keeps a shared_ptr to the entity.
 2015-08-24 11:15:30 -07:00
Brad Davis
78a08ed7c7 Merge pull request #5641 from thoys/20660 
CR for Job #20660 - Render the world Axis markers into negative space, add view option
 2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314 Merge pull request #5634 from hyperlogic/tony/animation-resource-fix 
Fix for animation resources
 2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0 Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084 Added overload for renderDashedLine 2015-08-24 16:07:07 +01:00
Thijs Wenker
0f8cf80d45 Merge branch 'master' of https://github.com/worklist/hifi into 20660 2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a Merge branch '20660' of github.com:thoys/hifi into 20660 
Conflicts:
	interface/src/Util.cpp
 2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369 Modified the world box to render axes in negative space 
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
 2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
53f9815f69 Merge pull request #5639 from jherico/maggie 
Stereo rendering work
 2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b Merge pull request #5635 from samcake/punk 
Improve the light attenuation formulae
 2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
fe44442ffe Merge pull request #5577 from vastcharade/horizAmbOcclPerf 
Horiz amb occl performance updates
 2015-08-22 12:39:51 -07:00
Anthony J. Thibault
80d3ae68c2 Removed redundant ends with ‘fbx’ check. 2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743 Resource fix for textures in FBX files. 
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
 2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929 Merge pull request #5594 from thoys/20638 
CR for Job #20638 - Scripting: WebSocket Implementation
 2015-08-21 19:13:43 -07:00
Thijs Wenker
d84cf1859c hook up the WebSocket error event directly 2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e properly exposed WebSocketClass::ReadyState to the ScriptEngine 2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97 Merge pull request #5632 from birarda/master 
force the HTTPManager to listen on IPv4
 2015-08-21 16:56:55 -07:00
Anthony J. Thibault
5e31d423b9 Removed some debugging statements 2015-08-21 16:55:08 -07:00
Thijs Wenker
9edba451eb - remove webSockets from List after disconnect. 
- leave it up to the QtScript to delete the WebSocket / WebSocketServer objects
 2015-08-22 01:33:22 +02:00
Sam Gateau
518cf3be15 Improve the light attenuation formulae 2015-08-21 16:28:38 -07:00
Anthony J. Thibault
b7009b4631 Fix for animation resources 
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.

So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
 2015-08-21 16:09:06 -07:00
Stephen Birarda
4b95d54955 remove the explicit failure test 2015-08-21 14:55:24 -07:00
Stephen Birarda
0fbbfb77d1 exit with a code to indicate error 2015-08-21 14:42:05 -07:00
Stephen Birarda
3e4a05a57b leave the listen check but queue Application quit 2015-08-21 14:30:41 -07:00
Stephen Birarda
34b3fb1c0c Revert "force the HTTPManager to listen on IPv4" 
This reverts commit 220ad189a0.
 2015-08-21 14:27:17 -07:00
Howard Stearns
ad0df3a47c Make sixense work in dev builds (if you put the library in the documented place). 2015-08-21 14:21:49 -07:00
Stephen Birarda
220ad189a0 force the HTTPManager to listen on IPv4 2015-08-21 14:16:34 -07:00
Thijs Wenker
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Thijs Wenker
d3a6833133 delete WebSockets on ScriptEngine finish 2015-08-21 20:20:50 +02:00
Thijs Wenker
c7346209fb fix memory leak 2015-08-21 19:44:43 +02:00
Thijs Wenker
fd82f05307 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-21 19:29:38 +02:00
Thijs Wenker
e581a57320 WebSocket constructor could allow more then one parameter now, only the first one is used though. 2015-08-21 19:13:57 +02:00
Thijs Wenker
55fd847636 removed unused code, renamed UnitTest.ready() to UnitTest.done() 2015-08-21 19:07:33 +02:00
ZappoMan
270463fc4e restore new oculus detect code from master 2015-08-21 09:29:25 -07:00
Atlante45
f802f354ca prefer scoped locker to unlocks 2015-08-21 15:36:03 +02:00
ZappoMan
75aff2f281 fix atmosphere rendering 2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828 Fix culling calculations in HMD with new stereo mechanism 2015-08-21 00:29:27 -07:00
ZappoMan
62e8ec3fdf add fullscreen menu item and rename side by side stereo plugin 2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Brad Davis
f6f189c4b8 Merge pull request #5609 from murillodigital/master 
Better handling of socket binding
 2015-08-21 00:22:19 -07:00
Brad Davis
c3991dbb8c Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor 
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
 2015-08-20 23:57:16 -07:00
Brad Davis
8c7711168c Merge pull request #5603 from sethalves/linux-memory-debugger 
memory debugging on linux
 2015-08-20 19:19:24 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Stephen Birarda
1756e60647 complete test for ordered packets in udt-test target 2015-08-20 14:22:05 -07:00
Stephen Birarda
e93b360908 expose options property to AI script interface 2015-08-20 12:12:43 -07:00
Thijs Wenker
7f5fc64f6c Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-20 21:09:22 +02:00
Ryan Huffman
0a290da529 Merge branch 'ordered-sending' into atp-server 2015-08-20 11:50:06 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Ryan Huffman
bb15811f6b Merge remote-tracking branch 'clement/protocol' into ordered-sending 2015-08-20 09:14:04 -07:00
Leonardo Murillo
129761c002 making qtimer interval a const 2015-08-20 08:10:19 -06:00
Leonardo Murillo
2c23dab2e7 More specific logging 2015-08-20 08:03:37 -06:00
Leonardo Murillo
f87f3eb033 Typo 2015-08-20 08:02:45 -06:00
Leonardo Murillo
2b26f302fd Better handling of socket binding 2015-08-20 08:01:33 -06:00
Atlante45
f6854782a4 Debug/Lock cleanup 2015-08-20 14:57:35 +02:00
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02:00
Brad Davis
002aea3333 Add fullscreen menu item to 2D display plugin 2015-08-20 00:30:44 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Stephen Birarda
c8fbb64bbf fix AvatarHashMap read due to COW 2015-08-19 14:36:16 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
ZappoMan
92ae3e758c restore DEFAULT_FAR_CLIP to 16km 2015-08-19 12:28:07 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Ryan Huffman
ebb4db134d Temporarily disable assert in ScriptCache 2015-08-19 12:18:01 -07:00
Ryan Huffman
330a6bb279 Update TextureCache to work with ResourceCache updates 2015-08-19 12:17:36 -07:00
Ryan Huffman
e1f8b6700c Update GeometryCache to work with ResourceCache updates 2015-08-19 12:17:19 -07:00
Ryan Huffman
7305135125 Update ResourceManager 2015-08-19 12:16:34 -07:00
Ryan Huffman
4827d326f4 Update ResourceCache to allow multiple downloads on the same resource 2015-08-19 12:11:47 -07:00
Ryan Huffman
51d4cf84da Fix AnimationReader to work with new ResourceCache updates 2015-08-19 12:10:47 -07:00
Ryan Huffman
d18ce5066f Fix error with Assignment::Type not being hashable 2015-08-19 11:55:06 -07:00
Ryan Huffman
121d3a77ad Fix iterator usage in SendQueue 2015-08-19 11:27:31 -07:00
Seiji Emery
6b5fb60fcf Merge remote-tracking branch 'highfidelity/master' into gputest 2015-08-19 11:24:15 -07:00