Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 12:04:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71659 commits 69 branches 56 tags 1.2 GiB
Commit graph

6492 commits

Author SHA1 Message Date
John Conklin II
8e5f2d0e08
Merge pull request #13983 from danteruiz/disable-interstitial 
disable interstitial by default and fix crash
 2018-09-13 14:01:28 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
David Back
06504ade88 Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD 2018-09-12 16:04:22 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -07:00
David Back
55a4c55f78 remove unused and rename var 2018-09-12 14:48:27 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 
MS16192: Fix Near Grabbing After Using Web Entity
 2018-09-12 12:50:44 -07:00
David Back
cf1c1296a7 fix center scale cube in hmd 2018-09-12 11:44:26 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals 2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable 2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables 2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug 2018-09-12 10:54:38 -07:00
Wayne Chen
b9f0af63e1 changing check for near grabbing modules - fixes grabbing for dynamic 2018-09-12 10:38:21 -07:00
Wayne Chen
045ac4cb0d allowing grip button for interrupting web scroll 2018-09-11 17:43:03 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
b6c5ae2a68 staging changes 2018-09-11 15:23:40 -07:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Ryan Huffman
530fa5aee9
Merge pull request #13865 from dback2/editHandleScaleImprovements 
Edit handle scale improvements
 2018-09-11 12:57:47 -07:00
Wayne Chen
0a145fbe2e Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-11 11:47:23 -07:00
Wayne Chen
d9e0352028 removing debug comments 2018-09-11 11:44:32 -07:00
Wayne Chen
7aae536624 adding fix to allow web scroll 2018-09-11 11:41:24 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs 
Improvements to entity list loading times
 2018-09-11 09:33:28 -07:00
John Conklin II
b184ad1334
Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955 
MS13955: Audio Stats are blank
 2018-09-10 17:03:31 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -07:00
unknown
17c3163264 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-10 15:31:58 -07:00
Wayne Chen
1aa8b7c81b Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-10 15:07:12 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash 
MS18269: Fix Reloading Scripts with Create open crashes system
 2018-09-10 15:01:43 -07:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities 
MS17841: CreateApp - Adjust default position of new entities
 2018-09-10 14:45:56 -07:00
Roxanne Skelly
c7b07c8f27
Merge pull request #13946 from roxanneskelly/featuredStories 
For stories, use the action string for notifications instead of a hard-coded value.
 2018-09-10 14:25:03 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
0fadfd2f4c Remove list.js in entityList.html 2018-09-10 12:14:07 -07:00
Thijs Wenker
2000954ad2 Temporary fix for reload crash MS18269 2018-09-10 20:13:06 +02:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
John Conklin II
e578b047b0
Merge pull request #13838 from danteruiz/fix-hmd-debug-window 
fixing scripting window visiblity and size issues
 2018-09-07 11:47:44 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
Wayne Chen
fc4c728181 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-07 10:11:34 -07:00
Dante Ruiz
45a99a9244 fixing some bugs 2018-09-06 17:55:10 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
David Back
3d75d4726a scale invertly once passing minimum 2018-09-06 16:04:59 -07:00
Dante Ruiz
98dafa3b67 fix overlayParentID 2018-09-06 14:31:49 -07:00
David Back
6ac38190c1 tweak scaling multiple 2018-09-06 12:23:38 -07:00
David Back
92ff522862 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-06 11:54:05 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
Roxanne Skelly
8a20969103 Fix typo 2018-09-06 10:38:10 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Roxanne Skelly
4fa7ac1af2 Merge branch 'master' of https://github.com/highfidelity/hifi into featuredStories 2018-09-05 16:51:25 -07:00
Roxanne Skelly
bb8d9c5cf0 For stories, base the notification popups off of the action_string instead of a hard-coded value. 2018-09-05 16:50:08 -07:00