Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 17:46:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30846 commits 75 branches 59 tags 1.2 GiB
Commit graph

30846 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
c1b9613a30 Update PacketList::writeData() to be non-recursive 2015-08-25 14:58:56 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Ryan Huffman
0352782e46 Add SendAssetTask 2015-08-25 12:46:44 -07:00
Atlante45
1878920ba4 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 21:43:37 +02:00
Ryan Huffman
b865a3f8fb Add thread pool to AssetGet requests 2015-08-25 12:41:55 -07:00
Stephen Birarda
6f14eb2206 fix for 0 entity avg ping 2015-08-25 12:35:34 -07:00
Clément Brisset
08ee5cbc17 Merge pull request #5656 from howard-stearns/fix-direct-url-avatars 
fix direct-url avatars
 2015-08-25 21:30:05 +02:00
Clément Brisset
34b3bd211d Merge pull request #14 from birarda/atp 
test for ordered sending in udt-test
 2015-08-25 21:05:42 +02:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00
Stephen Birarda
d76e8a7e48 remove double settings request for testing 2015-08-25 11:27:31 -07: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
92116dd6e7 added stats for receive rate in Mbits 2015-08-25 11:04:24 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Stephen Birarda
5e5bd77870 add initialization for all atomics in SendQueue 2015-08-25 09:55:21 -07:00
Atlante45
083a14bf4d Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 15:08:52 +02:00
Philip Rosedale
ff3a0480fe Merge pull request #5652 from birarda/master 
tweaks to domain-server web interface
 2015-08-24 21:36:52 -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
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Brad Hefta-Gaub
34e32ddaeb Merge pull request #5636 from howard-stearns/marketplace-avatars 
marketplace avatars
 2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a Merge pull request #5628 from ctrlaltdavid/webwindow-external-links 
Make WebWindow hyperlinks with target="_blank" open in user's browser
 2015-08-24 17:45:35 -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
Brad Hefta-Gaub
c6174ad88a Merge pull request #5647 from jherico/homer 
Removing tabs from our javascript
 2015-08-24 17:33:57 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -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
Stephen Birarda
9275b954f4 Merge pull request #13 from huffman/ordered-sending 
Ordered sending
 2015-08-24 16:41:50 -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
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
Stephen Birarda
fe591f61cc fix class rename in processConnectRequestPacket 2015-08-24 14:54:48 -07:00
Stephen Birarda
d57c1fc2d5 fix a typo in DomainGatekeeper comment 2015-08-24 14:50:18 -07:00
Stephen Birarda
7591a29c48 add back indentation to STATICALLY_ASSIGNED_NODES 2015-08-24 14:44:24 -07:00
Stephen Birarda
d2acf327dd fix NodeConnectionData discrepancy on request 2015-08-24 14:43:49 -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
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Seiji Emery
bd18951be8 fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/ 2015-08-24 13:13:24 -07:00
Ryan Huffman
4191ccd60d Move *ResourceRequest objects to separate files 2015-08-24 12:16:20 -07:00
Seiji Emery
691cb48a08 Fixed to use standard shaders from render-utils 2015-08-24 11:26:56 -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 Hefta-Gaub
275cdf9d8f Merge pull request #5581 from larsnaesbye/master 
Preliminary da_DK translation of Interface
 2015-08-24 10:36: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