Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:47:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73682 commits 25 branches 0 tags 1.1 GiB
Commit graph

5412 commits

Author SHA1 Message Date
John Conklin II
d7dd593a97
Merge pull request #14369 from dback2/entityListColumns 
Entity list - dynamic columns
 2018-11-13 16:01:06 -08:00
Jamil Akram
d65a79e815
Merge pull request #14377 from huffman/feat/ui-updates 
Update the styling for the Entity Properties window
 2018-11-13 14:39:57 -08:00
Jeff Clinton
18bf6bf975
Merge pull request #14143 from ElderOrb/FB18673 
FB18673 - Last line of GOTO desktop notification text cropped off on …
 2018-11-13 14:05:21 -08:00
Ryan Huffman
aecbccc058 Remove dead code and cleanup JS styling for entity properties redesign 2018-11-13 13:45:27 -08:00
Ryan Huffman
8c9015b224 Remove redundant dimensions in default entity properties 2018-11-13 13:45:27 -08:00
Ryan Huffman
536ba645b1 Update the styling for the Entity Properties window 2018-11-13 13:45:27 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
07f94030ce
Merge pull request #14357 from ctrlaltdavid/M19761 
Fix mini tablet JavaScript crash
 2018-11-13 12:15:56 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768 
Add option to enable/disable the mini tablet
 2018-11-13 11:59:24 -08:00
David Back
0b0614c84a CR fixes 2018-11-13 11:13:00 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404 
Fix interstitial page not displaying at Interface start-up
 2018-11-13 10:38:38 -08:00
David Back
b5ec04a534 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns 2018-11-13 10:35:57 -08:00
David Back
047708bedb Merge branch 'master' of github.com:dback2/hifi into entityListColumns 2018-11-13 10:24:02 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
7ffba9d987
Merge pull request #14204 from ctrlaltdavid/M12661 
Fixes for collisionless entities
 2018-11-13 09:42:07 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY 
Case 18436: consistent handling of CapsuleShape dimensions
 2018-11-12 15:25:42 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Ryan Huffman
5e6d0c0f94
Merge pull request #14376 from thoys/feat/create/localGlobalToggle 
[CreateApp] Local/World toggle
 2018-11-12 10:37:55 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859 
Make material entities to be presented in avatarapp
 2018-11-09 15:32:27 -08:00
Jeff Clinton
ee9154a801
Merge pull request #14341 from sethalves/fix-mouse-equip 
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
 2018-11-09 12:54:36 -08:00
Jeff Clinton
3d01949e43
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic 
Case 19495: zero velocities of non-dynamic entities on nearGrab release
 2018-11-09 10:10:49 -08:00
Thijs Wenker
99fcef105f spaceMode / desiredSpaceMode explanation 2018-11-09 17:59:00 +01:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-11-09 13:56:44 +13:00
Thijs Wenker
e483b1342c CR fixes 2018-11-09 01:56:17 +01:00
David Rowe
aca7143449 Fix interstitial music not playing at Interface start-up 2018-11-09 13:41:07 +13:00
David Rowe
5c97954e66 Merge branch 'master' into M19404 
# Conflicts:
#	scripts/system/interstitialPage.js
 2018-11-09 13:35:11 +13:00
Thijs Wenker
9005efb639 style fixes 2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
David Rowe
cdae5cd03d Front-load interstitial scripts and resources 2018-11-09 10:53:34 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard 
3D Keyboard.
 2018-11-08 13:35:13 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles 
Fix horizontal and vertical props in entity properties being swapped
 2018-11-08 12:42:48 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes 
Interstitial bug fixes
 2018-11-08 11:43:38 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic 
Fix new models not obeying dynamic checkbox
 2018-11-08 10:22:12 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values 
Update the default edit.js collidesWith to include myAvatar
 2018-11-08 09:17:40 -08:00
David Rowe
371919b923 Fix mini tablet always displaying if start up in HMD mode 2018-11-08 17:47:02 +13:00
David Back
0597d15771 tabs 2018-11-07 16:06:18 -08:00
David Back
f0c2ec1fa4 entity list data-driven resizable addable/removable columns 2018-11-07 16:02:15 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Andrew Meadows
b38c263e60 use correct capsule dimensions in teleport.js 2018-11-06 12:44:14 -08:00
David Rowe
629559e78c Add extra ()s 2018-11-07 09:20:54 +13:00
David Rowe
f47f77b181 Fix mini tablet JavaScript crash 2018-11-07 09:11:43 +13:00
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless 
Remove tabs from oculus store inventory, and rename to match
 2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6 activity notifications also change ASSETS to INVENTORY 2018-11-05 16:43:06 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591 
Don't attempt purchase of sold out items
 2018-11-05 16:20:02 -08:00
Zach Fox
f10b9ae30c Squashed commit of the following: 
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b3845
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dd
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4 Fix seven bugs 2018-11-05 13:03:34 -08:00