Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 06:56:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85136 commits 74 branches 59 tags 1.2 GiB
Commit graph

1707 commits

Author SHA1 Message Date
Zach Fox
240f904b85 DEV-2386: Remove 'Run Client Script Test' 2019-10-10 11:11:27 -07:00
Zach Fox
960440e802 DEV-2352: Modify Release Notes URL 2019-10-08 14:28:01 -04:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Seth Alves
b64ff70d6c add show-lookat-targets DebugDraw. remove old/unused eyetracker code. 2019-09-17 09:43:19 -07:00
milad
f9c5d00efa remove source from variable name 2019-09-11 12:10:47 -07:00
milad
5ec8b0d589 added environment variable check for crash menu 2019-09-11 11:39:19 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Anthony J. Thibault
d410cb4fda Added "shutdown" crash annotation and crash menu option 2019-08-24 11:12:28 -07:00
Oren Hurvitz
d7ef7a052d The "Clear Disk Caches" command also deletes the HTTP cache used by QtWebEngine 
Note that this only clears the HTTP cache (used for files), but not the directory used for
persistent data such as Cookies, Local Databases, etc. There's no Qt API to do that.
Fortunately, this directory should be small.
 2019-07-26 15:28:44 +03:00
Oren Hurvitz
dbd9299e85 The "Clear Disk Caches" command also clears the KTX cache (on the next restart) 2019-07-26 10:30:43 +03:00
Zach Fox
4caa00d6cc Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface 2019-07-10 16:42:48 -07:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings 
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
 2019-05-21 15:08:02 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
SamGondelman
2e666836c7 add more options to render scripting interface 2019-05-20 13:42:53 -07:00
sabrina-shanman
fa7621896a Add debug icon which shows on render items with transitions 2019-05-20 11:58:01 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
SamGondelman
14c38c0fb0 ಠ⌣ಠ 2019-05-16 10:27:59 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait 
Skeleton Trait Implementation
 2019-04-26 10:14:47 -07:00
Sam Gateau
dc7abe1aff
Merge pull request #15450 from amerhifi/feature/macScreenScale 
Case 22350: Setting mac default for resolution render scale
 2019-04-25 19:33:54 -07:00
amerhifi
cc3c75c8d1 adding mac default for screen scale 2019-04-24 10:24:48 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
David Back
1e4a6a7cd8 fix delete key doing ctrl + delete in hmd 2019-03-28 16:46:26 -07:00
Wayne Chen
db22fa9eec show up audio screen using Settings > Audio 2019-03-18 09:23:17 -07:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Ryan Huffman
d29233872e Remove avatar packager from Android builds 2019-01-02 14:59:47 -08:00
Thijs Wenker
1ec8aa8fa5 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-28 17:13:05 +01:00
sam gateau
2f18555ee0 removing comments and dead code, rewiring the debug 2018-12-18 14:42:45 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
sam gateau
237fb4dc4c Shadows are completely working with settings on both pipeline 2018-12-17 17:34:47 -08:00
Wayne Chen
dbebf1a67f having stats mirror master 2018-12-11 19:29:17 -08:00
Thijs Wenker
3943fe2861 avatar packager initial 2018-12-10 21:29:03 +01:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
humbletim
21030fbe5b Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model 2018-11-14 23:40:04 -05:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577 
Add option to start up at home location
 2018-11-13 09:29:37 -08:00
Wayne Chen
f66326fc4d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-08 15:51:24 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Wayne Chen
9beedf9292 changing login overlay size + add keyboard 2018-11-06 12:56:50 -08:00
Zach Fox
d6477993a1 Make it work better with the tablet 2018-11-01 13:08:00 -07:00
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
David Rowe
ae2715af31 Add option to start up at home location 2018-11-01 08:57:12 +13:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Alexia Mandeville
68ab5475fe
Remove duplicate display crash options 2018-10-23 14:13:09 -07:00
Alexia Mandeville
178b8ef37b
Removed duplicate menu items 
Removed duplicates:
Console...
API Debugger
 2018-10-23 12:55:02 -07:00
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item 2018-10-22 15:39:23 -07:00
humbletim
f7cfc61494 Package Model... -> Package Avatar... 2018-10-22 15:02:33 -04:00
Anthony Thibault
640ed6a32a Added "Developer > Avatar > Show Tracked Objects" menu 2018-10-15 12:42:07 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates 2018-10-02 16:43:08 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901 
Improve HMD Menu page navigation
 2018-09-10 11:34:21 -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
Alexia Mandeville
200d862a08 Merge branch 'menu-updates' of https://github.com/alexiamandeville/hifi into menu-updates 2018-08-31 09:56:15 -07:00
Alexia Mandeville
90e98f1608 Moving Log to root Developer menu 2018-08-31 09:55:46 -07:00
David Rowe
ed441d5570 Merge branch 'master' into M17901 2018-08-31 14:30:11 +12:00
Alexia Mandeville
718c32fb8c
Merge branch 'master' into menu-updates 2018-08-30 23:05:10 +01:00
Alexia Mandeville
1233c2ec0d Moving root settings into preferred submenus 2018-08-30 14:46:53 -07:00
Alexia Mandeville
9267919d7f Resorting Developer menu organiztion 2018-08-29 16:49:27 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Seth Alves
965c35292c put back old-style avatar-attachments menu-item 2018-07-19 11:32:19 -07:00
Alexander Ivash
929fec731c remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul 2018-07-06 21:00:54 +03:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
r3tk0n
4426173021 Moved "Show Overlays" menu item to Developer Menu 2018-07-03 11:56:34 -07:00
Dante Ruiz
7f7ca677f0 mac - moving general settings back under settings 2018-06-25 14:23:37 -07:00
Elisa Lupin-Jimenez
b255cf0ba9
Merge pull request #13389 from AndrewMeadows/misc-001 
crash fixes, removing unnecessary writes, and misc cleanup
 2018-06-18 09:19:22 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly 
Remove functionality for rendering collision models directly in the Model class
 2018-06-15 14:46:40 -07:00
Andrew Meadows
be0899c41d remove unnecessary writes to appease Xcode's static analyzer 2018-06-15 11:44:22 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
sabrina-shanman
4c39d08358 Remove "Draw Collision Shapes" option from developer physics menu 2018-06-11 11:03:57 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode 
Center of Gravity Leaning
 2018-06-08 17:53:55 -07:00
Seth Alves
6c8e514367
Merge pull request #13224 from danteruiz/fix-key-conflicts 
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
 2018-06-06 11:08:04 -07:00
Anthony J. Thibault
c3d1daf855 Merge branch 'master' into nativeCGCode 2018-06-04 09:32:38 -07:00
Dante Ruiz
606b6d8947 fix code standard issue 2018-06-04 09:16:39 -07:00
Dante Ruiz
68b18def22 fix copy delete cut paste commands and menus 2018-05-25 15:49:19 -07:00
Dante Ruiz
9a25a74834 fix copy delete cut paste commands and menus 2018-05-25 15:34:17 -07:00
Dante Ruiz
c2ceb48a28 fixing key conflicts 2018-05-23 14:16:05 -07:00
Dante Ruiz
5fb08d0d9c fix speech api not showing up 2018-05-21 14:21:21 -07:00
druiz17
bd3a9865bf moving control speech to developer menu 2018-05-19 18:27:28 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
ea771c2325 make final changes 2018-05-18 09:21:41 -07:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00