Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 20:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71813 commits 6 branches 1 tag 1.1 GiB
Commit graph

29542 commits

Author SHA1 Message Date
Brad Davis
9a435cdca2 Reduce needless smart pointer duplication 2018-09-12 15:04:35 -07:00
Sam Gondelman
42ded53b5f
Merge branch 'master' into modelBugs 2018-09-12 14:35:46 -07:00
Gabriel Calero
2943502c9b Headset plug/unplug detection 2018-09-12 16:36:04 -03:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e Revert "cycle avatar entity IDs for new avatar mixer" 
This reverts commit 20912349a4.
 2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f Revert "XOR incoming trait instance IDs for other avatars" 
This reverts commit 9b3d9dd0f3.
 2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd Revert "use different XORed instance ID for replicas" 
This reverts commit a37a19da1e.
 2018-09-12 12:20:03 -07:00
luiscuenca
fa3c6932c6 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-12 11:47:18 -07:00
Simon Walton
7136698c6b Move default pose flags out of joint-positions condition 2018-09-12 10:49:26 -07:00
sabrina-shanman
87b5605d69 Add normalOnPick to CollisionPickResult 2018-09-12 10:36:00 -07:00
Simon Walton
0d72e3808c Small changes per review 2018-09-12 10:31:26 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter 
Fix a missing std::chrono::duration_cast
 2018-09-12 08:27:19 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb 
Avatar loading orb now indicates loading status
 2018-09-11 18:01:40 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch 
Pop up login dialog on launch
 2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight 2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back 2018-09-11 17:07:49 -07:00
Simon Walton
15f06264f9 Remove unneeded #include 2018-09-11 17:03:39 -07:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
Simon Walton
2a0ee1c532 Cherry-pick of commit cde2dc2e to fix merge issue 2018-09-11 16:58:21 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars 
handle agent avatar clear on avatar mixer disconnect
 2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
sam gateau
8c7781a6d4 use the std::chrono duration the way it should be 2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2 Avatar loading orb now indicates status 
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
 2018-09-11 13:12:46 -07:00
Dante Ruiz
735ff04fad fixing merge conflicts 2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00
sam gateau
77586933c8 Merge and fix the default _value of GLquery so it is 0, not broken 2018-09-11 11:43:14 -07:00
Simon Walton
80b7e04bc6 Revert change to chrono<system_clock> for usecTimestampNow() 2018-09-11 10:51:36 -07:00
sam gateau
840c8c95fd cleaning the code and comments 2018-09-11 09:34:42 -07:00
Wayne Chen
6bcf6eaae7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 09:13:41 -07:00
Sam Gateau
5e76a0c6d7 changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp 2018-09-10 22:55:12 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Stephen Birarda
a50e55b83a use more efficient iterate and clear for removal 2018-09-10 17:06:57 -07:00
Sam Gateau
47cea49f78
Merge pull request #13922 from samcake/black-bis 
Optimize the vertex formats of meshes for less input buffer bindings
 2018-09-10 16:58:40 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
SamGondelman
0e079e78e6 correct transparent parabola shader 2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
luiscuenca
9c6ee18db5 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 15:18:15 -07:00
sabrina-shanman
3b7dac9058 Account for collisionGroup in CollisionRegion implementation 2018-09-10 15:14:48 -07:00
luiscuenca
6f4e9ded09 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b Add collision group parameter to collision pick and set my avatar as the default 2018-09-10 14:35:04 -07:00
Sam Gateau
082d47d20f Set the correct assert in replacment of the unecessary if branch 2018-09-10 14:31:49 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash 
Destroy script thread on finish instead of on ScriptEngine destroyed
 2018-09-10 14:11:37 -07:00
sam gateau
fed377dc4c Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-10 12:00:09 -07:00
SamGondelman
9a2bdda365 make animation properties threadsafe 2018-09-10 11:58:45 -07:00
Stephen Birarda
19a9fb00c6
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake 
Add comment to Assets.sendFakeHandshake about excluding jsdoc
 2018-09-10 11:47:30 -07:00
SamGondelman
3daaa0ce81 empty urls are invalid 2018-09-10 11:45:40 -07:00
Wayne Chen
ff86e480ba adding debug statement to check for window close 2018-09-10 11:36:45 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck 
fix Agent teardown of recording and ScriptEngine(s)
 2018-09-10 10:51:52 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking 
Add detailed profile range for avatar unpacking
 2018-09-10 10:04:08 -07:00
SamGondelman
a4605289a2 animation on switch url 2018-09-10 10:03:05 -07:00
David Back
3601ade8ba destroy thread from thread finished not scriptEngine destroyed 2018-09-07 18:36:36 -07:00
Sam Gateau
5140999445 Forcing all the meshes with 3 buffers aka the blendshape layout 2018-09-07 15:57:04 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check 
Check that a requested listening port is able to be used
 2018-09-07 15:48:12 -07:00
sam gateau
e8cfac2ab1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e removing performance counters 2018-09-07 15:35:10 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats 
Move animation stats into its own Menu
 2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom 
Fix bloom on edges
 2018-09-07 14:50:31 -07:00
Sam Gateau
81a542982b Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-07 12:02:20 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
SamGondelman
32e2a244a1 detailed profile range for avatar unpacking 2018-09-07 11:44:35 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot 
Fix for lurching walk(case 16945), when walking in hmd.
 2018-09-07 11:43:03 -07:00
Simon Walton
1a67176819 Fix a dangling merge conflict 2018-09-07 11:29:30 -07:00
sam gateau
fa72910ac1 fixing fuckeries 2018-09-07 11:14:12 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
sam gateau
d979d02139 why did i do that? 2018-09-07 10:03:55 -07:00
Simon Walton
3dc993c841 Fix small error in translation delta 2018-09-07 09:46:21 -07:00
Anthony Thibault
5a059e9318 Fix for build failure on linux and android. 2018-09-07 09:44:19 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a Add override qualifier to BaseNestableTransformNode::getTransform 2018-09-06 17:44:06 -07:00
Wayne Chen
72818f3729 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged 2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -07:00
Ryan Huffman
22df1b3bc6 Add comment to Assets.sendFakeHandshake about excluding jsdoc 2018-09-06 17:19:41 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
Andrew Meadows
92210f28b5 cleanup and use correct avatar bounding box 2018-09-06 16:33:30 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels. 
Added state machine tracking as well.
 2018-09-06 16:18:58 -07:00
sam gateau
7349562111 Removing commented code 2018-09-06 15:50:31 -07:00
sam gateau
5ecbdb50c7 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-06 15:36:32 -07:00
Andrew Meadows
021146e4f0 minor tweak to default avatar-update sort coefficients 2018-09-06 15:33:52 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf 
Fix blendshapes crash one last time, one last time
 2018-09-06 14:21:18 -07:00
John Conklin II
b486b6d148
Merge pull request #13928 from AndrewMeadows/enable-workload-feedback 
enable workload regulation by default
 2018-09-06 14:20:40 -07:00
sam gateau
6544e9f0b0 Removing the commented debug code 2018-09-06 13:58:03 -07:00
sam gateau
38bfee7b72 Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer 2018-09-06 13:54:21 -07:00
Gabriel Calero
2d2a4804f7 Add android settings screen. Add AEC setting 2018-09-06 17:49:52 -03:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
Simon Walton
e1aba52c23 Revert to statics for priority sort weights; update defaults from Andrew 2018-09-06 12:09:44 -07:00
sam gateau
e428248472 Adressing build warnings 2018-09-06 11:33:26 -07:00