Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34477 commits 71 branches 56 tags 1.2 GiB
Commit graph

34477 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
3fa0bcbcd9 ping the AssetClient from the agent 2015-11-16 10:38:59 -08:00
Stephen Birarda
5908f2d398 put Agent AssetClient on sep thread, cleanup 2015-11-16 10:38:45 -08:00
Stephen Birarda
d941be8d0b allow assignment client to use AssetClient for ATP downloads 2015-11-16 10:38:33 -08:00
Stephen Birarda
429a4d51d5 Merge pull request #6375 from Atlante45/resize 
Fix models resizing
 2015-11-13 10:23:05 -08:00
Stephen Birarda
dff88722f3 Merge pull request #6384 from ZappoMan/serverStats 
fix for infinite loop in erase entities special packet
 2015-11-13 10:21:10 -08:00
Brad Hefta-Gaub
b6b5a5b1c2 add comment 2015-11-12 18:28:08 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
Stephen Birarda
b165d1ae3a Merge pull request #6382 from ZappoMan/serverStats 
add special packets and nack packets to outbound stats
 2015-11-12 16:45:36 -08:00
Brad Hefta-Gaub
83e7eb58b9 add special packets and nack packets to outbound stats 2015-11-12 16:36:06 -08:00
Clément Brisset
9d3235a966 Merge pull request #6378 from ZappoMan/serverStats 
switch various status to use thread safe atomics
 2015-11-12 14:01:46 -08:00
Brad Hefta-Gaub
da651ac475 fix mac compiler error 2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub
8bfb368a61 fix mac compiler error 2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub
33110eda30 fix mac compiler error 2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub
14a6e1fb6b fix mac compiler error 2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50 switch various status to use thread safe atomics 2015-11-12 13:09:51 -08:00
samcake
da8270d50b Merge pull request #6377 from jherico/rec3 
Cleaning up clip and transform
 2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649 Cleaning up clip and transform 2015-11-12 11:48:47 -08:00
samcake
319f9fc30e Merge pull request #6376 from ZappoMan/fixModelCrash 
fix crash in Model::deleteGeometry when _rig is not initialized
 2015-11-12 09:37:30 -08:00
James B. Pollack
39f44115be Merge pull request #6373 from Atlante45/rotationBetween 
Rotation between
 2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a fix crash in Model::deleteGeometry when _rig is not initialized 2015-11-12 09:24:49 -08:00
samcake
b9a0d0b843 Merge pull request #6363 from jherico/rec3 
Recording avatar data refactor
 2015-11-12 00:58:46 -08:00
Brad Davis
f521be10fe Avatar recording work in progress 2015-11-12 00:33:38 -08:00
Atlante45
954391ae3e Fix models resizing 
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
 2015-11-11 18:33:26 -08:00
Seth Alves
315b5e9da2 Merge pull request #6372 from ZappoMan/rightClickMenu 
Tweaks to "click"
 2015-11-11 17:27:50 -08:00
Atlante45
118d05d824 Use a clearer function 2015-11-11 17:24:50 -08:00
Clément Brisset
5e972ecaa1 Merge pull request #6374 from ZappoMan/entityEditRoundtripImprovement 
reduce client to server to client entity edit latency
 2015-11-11 17:19:06 -08:00
Brad Hefta-Gaub
80e15fb77d reduce client to server to client entity edit latency 2015-11-11 17:03:21 -08:00
James B. Pollack
1819e20f74 Merge pull request #6367 from ericrius1/marketplace 
Dynamic loading of models from specified directory
 2015-11-11 16:54:06 -08:00
Brad Hefta-Gaub
a721b13e46 Merge pull request #6364 from imgntn/cleanuptoybox 
Remove Bball and Targets AC Resetter Script from Toybox
 2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub
c4ad1d978b Merge pull request #6344 from imgntn/easystar 
Adapt EasyStar A* Pathfinding Library and Add Example
 2015-11-11 16:22:47 -08:00
Atlante45
e4897a8de7 Use new constants 2015-11-11 15:58:27 -08:00
ericrius1
806d303dcd Added header file 2015-11-11 15:55:32 -08:00
Atlante45
115b63a117 Simplify rotationBetween 2015-11-11 15:54:48 -08:00
Brad Hefta-Gaub
2363ca044e Merge pull request #6280 from imgntn/colorbuster 
Color Busters Game
 2015-11-11 15:52:18 -08:00
ericrius1
56dc9092e0 added s3 server 2015-11-11 15:52:12 -08:00
samcake
e7a6c58a9a Merge pull request #6347 from EdgarPironti/record_branch 
Set clip for ControlledAC
 2015-11-11 15:33:25 -08:00
Brad Hefta-Gaub
d36cc1556a switch back context menu to secondary thumb 2015-11-11 15:32:07 -08:00
Brad Hefta-Gaub
4fddc86851 tweaks to click 2015-11-11 15:26:16 -08:00
ericrius1
4fc44b0929 Updated header summary to be more specific with how the loading works 2015-11-11 15:19:36 -08:00
Brad Hefta-Gaub
eb598bd3d3 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-11-11 15:15:34 -08:00
EdgarPironti
da2b49a1b0 Remove hardcoded url 2015-11-11 15:07:33 -08:00
EdgarPironti
55d386aaab Fixes: Prompt and userData 2015-11-11 15:07:33 -08:00
EdgarPironti
0f057d7229 Set clip for ControlledAC 2015-11-11 15:07:32 -08:00
Clément Brisset
0402933c51 Merge pull request #6366 from ZappoMan/moreEraseHistory 
Left overs bug fix
 2015-11-11 14:33:12 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
samcake
e15d2e022c Merge pull request #6369 from AlessandroSigna/controllers 
handControlledHead.js added
 2015-11-11 14:20:05 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory 2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00