Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10478 commits 76 branches 59 tags 1.2 GiB
Commit graph

130 commits

Author SHA1 Message Date
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrzej Kapolka
6ff629dcfd Use different unused variable warning suppressor for GCC. 2014-03-04 11:23:44 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Andrzej Kapolka
ba327232d5 Fixed another Window signed/unsigned mismatch. 2014-02-23 21:07:00 -08:00
Andrzej Kapolka
5cf6c43414 Fix for Windows build error. 2014-02-23 20:29:54 -08:00
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00
Andrzej Kapolka
09677b06f2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
 2014-02-20 12:05:15 -08:00
Andrzej Kapolka
f017d0472f More work on spanners. 2014-02-19 18:17:26 -08:00
Andrzej Kapolka
25ae81e2de More work on spanners. 2014-02-19 15:25:21 -08:00
Andrzej Kapolka
0138ecb3b2 Layout tweaks. 2014-02-19 11:35:45 -08:00
Andrzej Kapolka
55e2ebd92f More spanner bits. 2014-02-18 13:58:44 -08:00
Andrzej Kapolka
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
Andrzej Kapolka
3e40927d3a More work on spanning objects. 2014-02-14 18:01:48 -08:00
Andrzej Kapolka
8920873d70 Working on support for "spanners" (objects that span multiple octree cells). 2014-02-14 15:35:42 -08:00
Andrzej Kapolka
9c91d3c2e7 Use the existing session stuff for metavoxels rather than a separate system. 2014-02-13 10:25:10 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Andrzej Kapolka
5b207e4f8e Work on creating new attributes. 2014-02-12 17:10:32 -08:00
Andrzej Kapolka
d6d95a586d Working on deleting attributes. 2014-02-12 14:16:14 -08:00
Andrzej Kapolka
f9b0ff0608 Various bits of streaming work: send delete messages for main channel on 
reliable channel, test messages on main channel.
 2014-02-12 12:33:40 -08:00
Andrzej Kapolka
36f1e59201 Working on support for sending messages through reliable channels. 2014-02-10 20:26:09 -08:00
Andrzej Kapolka
b9a5b13f0a This should fix the remaining signed/unsigned warning on Windows. 2014-02-10 16:33:35 -08:00
Andrzej Kapolka
200a2d77c2 Incorporated fixes for warnings that Brad reported on Windows. 2014-02-10 10:13:52 -08:00
Andrzej Kapolka
c39f9f6271 Fix (hopefully) for Windows runtime error. 2014-02-10 00:59:51 -08:00
Andrzej Kapolka
e9579feef5 Reordering testing. 2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d Streaming fixes. 2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8 Circular buffer work. 2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec Fix/tests for streaming. 2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00
Stephen Birarda
a1a4a3db8a HifiSockAddr to SharedNodePointer changes in MetavoxelServer 2014-02-07 14:27:10 -08:00
Andrzej Kapolka
d3b005112e Changes from Philip's code review. 2014-02-07 10:03:23 -08:00
Andrzej Kapolka
d7df4173e5 Cleaner component creation. 2014-02-06 18:58:36 -08:00
Andrzej Kapolka
0a6288bda4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-06 15:42:37 -08:00
Andrzej Kapolka
be21eee704 More work on parameterized scripts. 2014-02-06 15:41:21 -08:00
Andrzej Kapolka
f6320d3a81 I think this covers the basic bits necessary for the reliable streaming. Of 
course, I haven't tested it yet.
 2014-02-06 12:27:46 -08:00
Andrzej Kapolka
6b4c8b62c6 Back down the rabbit hole I go, weee! 2014-02-05 21:28:36 -08:00
Andrzej Kapolka
98a432d3e5 Punting on the span tracking thing for now. 2014-02-05 19:24:16 -08:00
Andrzej Kapolka
e77feb8efd More work on reliable transfer. 2014-02-05 16:19:16 -08:00
Brad Hefta-Gaub
a05e07460f fix windows build errors and warnings 2014-02-05 13:54:17 -08:00
Andrzej Kapolka
5e9916302b Working on clearing shared object references. 2014-02-05 13:28:19 -08:00
Andrzej Kapolka
3a378dbeaf Working on extending the concept of a shared object. 2014-02-05 12:20:02 -08:00
Andrzej Kapolka
be4f081465 More work on editing parameterized URLs. 2014-02-04 19:55:11 -08:00