Commit graph

76880 commits

Author SHA1 Message Date
Atlante45
9fe7a3350c Fix windows compile error 2019-02-28 15:06:26 -08:00
Thijs Wenker
ff8cb27256 include fst URL in the GeometryExtra hash 2019-02-28 23:45:08 +01:00
Andrew Meadows
8a7853a701 remove crufty comment 2019-02-28 14:38:13 -08:00
Roxanne Skelly
c721d68ec3 Remove unneeded cruft 2019-02-28 14:35:29 -08:00
Thijs Wenker
6aede024f4 use fst mapping path as reference instead of model path 2019-02-28 23:22:55 +01:00
Andrew Meadows
33d6e2ce3b avoid mem-leaked entities when clearing tree 2019-02-28 14:21:35 -08:00
Andrew Meadows
ed9ebf84c9 remove unuseful log entry 2019-02-28 14:21:14 -08:00
Andrew Meadows
7d9efe4c09 avoid mem-leak for serverless domains 2019-02-28 14:20:11 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
SamGondelman
15064f0097 fix lasers and keyboard on reload 2019-02-28 14:04:22 -08:00
Roxanne Skelly
c7b04865ce Remove debugging code, some thread safety changes 2019-02-28 13:58:33 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
amer cerkic
cda9bce293 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-02-28 12:36:00 -08:00
Shannon Romano
0f0ed0fbc4
Merge pull request #15007 from Atlante45/fix/kick-bug-master
Case 21402: Don't send a KillAvatar packet on kick
2019-02-28 12:26:30 -08:00
Roxanne Skelly
1e1437aab7 Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress 2019-02-28 12:13:17 -08:00
John Conklin II
c2679209ed
Merge pull request #15026 from SimonWalton-HiFi/hero-avatar-zone-79
Avatar priority (hero) zones
2019-02-28 11:45:53 -08:00
NissimHadar
15989e3a89 WIP. 2019-02-28 11:43:16 -08:00
raveenajain
c1516df58d transforms using joints 2019-02-28 11:35:29 -08:00
SamGondelman
a8e6d01279 fix context overlay 2019-02-28 11:33:09 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
amer cerkic
36cd26b190 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-02-28 10:18:04 -08:00
Sam Gateau
22b18c0c3d
Merge pull request #15047 from amerhifi/quest-demo
case 21477: Execute command line args for Quest testing, profiling, etc
2019-02-28 09:44:45 -08:00
Thijs Wenker
de3c5e0ffe relative URLs in FST material parsing 2019-02-28 17:51:58 +01:00
Clement
8032063512 Move to LimitedNodeList 2019-02-27 19:14:36 -08:00
Clement
717c12fe16 Add new connection rate limitting
Limit rate of connection for new Agents
2019-02-27 18:22:49 -08:00
Simon Walton
041a561dbc Handcraft the JSON filter-object rather than parse a string 2019-02-27 17:27:25 -08:00
Simon Walton
db8bd661ce Max domain check-ins was 5, not 4, dammit 2019-02-27 16:50:07 -08:00
Anthony Thibault
72f198fe00
Merge pull request #14904 from hyperlogic/feature/preserve-default-scale
Case 20943: Animations should preserve avatar joint scale
2019-02-27 16:49:27 -08:00
Simon Walton
17c0e40347 Add ability to filter on zone-type with JSON filter 2019-02-27 16:42:36 -08:00
Roxanne Skelly
03326cd471 Build fix 2019-02-27 15:58:49 -08:00
Simon Walton
59b9831c1d Revert max check-ins to 4 2019-02-27 15:56:01 -08:00
Simon Walton
fede8d0525 Minor clean-up 2019-02-27 15:37:11 -08:00
amer cerkic
95628dfc11 removing unused imports 2019-02-27 15:36:49 -08:00
amer cerkic
a425becc8a clean up of debugging 2019-02-27 15:35:33 -08:00
amer cerkic
29ec5486f6 manual pushing args to the app. Removed some debugging printouts 2019-02-27 15:31:23 -08:00
Shannon Romano
1a83ab2dab
Merge pull request #15038 from danteruiz/fix-login-screen
Case 21451: HMD Login Encouragement Screen is not Usable
2019-02-27 14:41:41 -08:00
Anthony Thibault
b5f5900633 Replace animation scale with scale from avatar default pose
This allows avatars to have scale on their joints without being clobbered by animations.
Renamed variables for easier maintenance.
Also small optimization when no ikNode is present.
2019-02-27 14:40:08 -08:00
Roxanne Skelly
e2e1edc8b0 Add test logging, stats, and force domain pings to timer thread
Test code for load testing only.
2019-02-27 14:13:33 -08:00
Roxanne Skelly
6df28da0a5 Fix Avatar Mixer divide by zero error in stats reporting
Under load, the frame count may not be updated between
stats reports, causing the diff between frame counts to
be zero, resulting in divide by zero errors.
2019-02-27 14:13:18 -08:00
Simon Walton
13cda8d212 Use separate priority-queues for hero & other avatars 2019-02-27 13:14:08 -08:00
amer cerkic
8fff3476ec Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo 2019-02-27 11:45:49 -08:00
amer cerkic
92cfa49bfb adding and testing command line parameter passing to application 2019-02-27 11:42:22 -08:00
Shannon Romano
c9edf86558
Merge pull request #15040 from SamGondelman/web
Case 21453: Fix web interaction and debug print filling logs
2019-02-27 11:19:20 -08:00
SamGondelman
bf9e5b9550 comment out another log 2019-02-27 10:25:34 -08:00
danteruiz
2fd94c6bbc fixing login dialog 2019-02-27 10:08:38 -08:00
r3tk0n
ca740c6254 Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab. 2019-02-26 18:44:00 -08:00
Simon Walton
167ddbecff Use session display-name for debugging 2019-02-26 18:35:01 -08:00
r3tk0n
52d80476a8 Fix activation criteria. 2019-02-26 17:55:16 -08:00
r3tk0n
9559f9ffd3 Add off-hand controller manipulation to fargrab. 2019-02-26 17:52:18 -08:00