Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-09 13:40:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74228 commits 25 branches 0 tags 1.1 GiB
Commit graph

5509 commits

Author SHA1 Message Date
Ryan Huffman
7701be0742
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick 
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
 2018-11-16 18:41:47 -08:00
unknown
20cb64ead2 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-11-16 17:14:42 -08:00
unknown
a0f79f9881 entity list reordering columns 2018-11-16 17:14:30 -08:00
Thijs Wenker
ba790ae470 fix behavior after merge. 2018-11-17 01:20:36 +01:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading 
Fixing case of interstitial not finishing loading
 2018-11-16 14:53:01 -08:00
unknown
e9fb9b1f4d Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-11-16 14:51:48 -08:00
Thijs Wenker
7b3d2bed15 CR fixes 2018-11-16 22:10:15 +01:00
Thijs Wenker
e89346c146 making rename functionality list refresh proof 2018-11-16 22:10:14 +01:00
Thijs Wenker
31d37e7e75 Fix entity list double click rename / highlight issue 2018-11-16 22:08:58 +01:00
David Back
17404863e7 entity list reordering WIP 2018-11-15 17:42:51 -08:00
Ryan Huffman
556aec9412 Fix hiding of properties in Create 2018-11-15 15:27:30 -08:00
David Back
de7f4a4a4d fix entity list resizing 2018-11-15 15:23:18 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders 
Entity properties - new draggable numbers
 2018-11-15 10:01:07 -08:00
David Back
dfed797682 set more min/max/steps 2018-11-14 15:44:30 -08:00
David Back
76d2519205
Merge pull request #14400 from dback2/missingTypeFilters 
Add PolyLine/PolyVox to entity list/properties types
 2018-11-14 14:39:26 -08:00
David Back
d8f5e0f708 add min/max/step for some properties, remove duplicate createProperty, improve switch between states 2018-11-14 14:32:17 -08:00
David Back
70493e3f29 add polyline/polyvox to entity list/properties types 2018-11-14 12:23:16 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Thijs Wenker
cd12dd8f6d fix OSX shortcut inconsistencies 2018-11-14 19:28:57 +01:00
David Back
1aa048f4d6 style and decimal fixes 2018-11-13 17:56:31 -08:00
David Back
a349bac01c Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-13 16:32:15 -08:00
Thijs Wenker
2c715bf592 make window shortcuts work on OSX 2018-11-14 01:05:39 +01:00
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
Thijs Wenker
e890228fc7 Make shortcuts work in edit windows 2018-11-14 01:05:36 +01:00
David Back
8db81d9ce6 restructure draggable numbers to be more like blender 2018-11-13 16:04:08 -08:00
John Conklin II
d7dd593a97
Merge pull request #14369 from dback2/entityListColumns 
Entity list - dynamic columns
 2018-11-13 16:01:06 -08:00
David Back
91db81cd94 merge fix 2018-11-13 15:10:53 -08:00
David Back
c73e737552 Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-13 15:04:12 -08:00
David Back
e88e131dca Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders 2018-11-13 15:04:02 -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
Dante Ruiz
812373cdab fixing loading bar visual 2018-11-13 11:11:18 -08:00
Dante Ruiz
1a95ee2b31 making requested changes 2018-11-13 11:11:18 -08:00
Dante Ruiz
10d045b11b fix infinate loading if entity server is not running 2018-11-13 11:07:26 -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
David Back
b3ccce9a3f merge follow-up 2018-11-12 17:30:21 -08:00
David Back
c5023b1086 Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders 2018-11-12 17:03:07 -08:00
Ryan Huffman
a787f55506 Remove dead code and cleanup JS styling for entity properties redesign 2018-11-12 16:50:45 -08:00
Ryan Huffman
a020a09e8c Remove redundant dimensions in default entity properties 2018-11-12 16:50:45 -08:00
Ryan Huffman
25df605459 Update the styling for the Entity Properties window 2018-11-12 16:50:45 -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
David Back
0781171912 Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders 2018-11-12 12:20:05 -08:00
David Back
a0d5b1117a Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-12 11:41:00 -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
David Back
eeb8ede8ff Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-12 10:10:38 -08:00
unknown
4eab623fd8 remove debugPrint function 2018-11-09 17:25:48 -08:00
unknown
0160ab23ab fix color pickers 2018-11-09 17:23:51 -08:00
unknown
08d9eda7d7 fix property bugs / style issues 2018-11-09 17:08:10 -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
David Back
615ffebb2c new draggable numbers WIP 2018-11-09 13:14:05 -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
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -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
Ryan Huffman
3b57e45fdd Remove redundant dimensions in default entity properties 2018-11-08 16:36:55 -08:00
Ryan Huffman
44d0a7254c Update the styling for the Entity Properties window 2018-11-08 16:36:55 -08: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
howard-stearns
7115f0e688 update notification refs inventory, not assets 2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e Merge branch 'oculus-store-commerce' into tabless 2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb close wallet app during login so that it doesn't tell to login after 
login
 2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9 remove wallet reference in update notification 2018-11-04 11:25:40 -08:00