Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60909 commits 25 branches 0 tags 1.1 GiB
Commit graph

60909 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
17a0dd2a76 Elide long usernames in injected code 2017-10-13 13:32:55 -07:00
Seth Alves
fe9f142bf6 Merge pull request #11562 from druiz17/fix-release-grab 
include release message to controller modules
 2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub
704cb1fd21 Merge pull request #11574 from ctrlaltdavid/shapes-preload 
Preload Shapes app asset files so that they're in disk cache ready for use
 2017-10-13 13:00:03 -07:00
Nissim Hadar
6697d7c93a Simplified setHazeColor. 2017-10-13 12:49:38 -07:00
Brad Hefta-Gaub
9f3331ec19 Merge pull request #11587 from druiz17/stylus-fix 
Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional
 2017-10-13 12:42:26 -07:00
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Zach Fox
051019a57a Fix certificate username text eliding too early 2017-10-13 12:10:37 -07:00
Brad Hefta-Gaub
b1812c30c9 Merge pull request #11571 from huffman/fix/ktx-thrashing 
Fix KTX requests thrashing if a mip level can't be assigned
 2017-10-13 11:53:24 -07:00
Brad Hefta-Gaub
60030c08fa Merge pull request #11573 from druiz17/bug-hud-module 
hud module intersects with dev stats window
 2017-10-13 11:48:06 -07:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
Nissim Hadar
5bfbaf4860 Renamed HazeMode to ComponentMode. 2017-10-13 11:24:56 -07:00
David Rowe
949ed3b33d Add some Quat and Uuid JavaScript helper properties 2017-10-14 07:17:23 +13:00
Zach Fox
95a9675220 Final help QA - minus link to blockchain docs 2017-10-13 10:58:15 -07:00
druiz17
2422c9d9f3 made requested changes 2017-10-13 10:45:24 -07:00
druiz17
6799b9ca13 fix stylus 2017-10-13 09:34:08 -07:00
Ken Cooke
e4e37e65e6 Handle packets in-flight during audio codec startup 2017-10-13 08:19:30 -07:00
Olivier Prat
01c3ca17ee Fixed cube map conversion from equirectangular maps when done after HDR conversion 2017-10-13 11:05:27 +02:00
Ryan Huffman
d6366083a7 Fix baking bug with single-part FBX + multiple materials 
In FBXBaker we were not packing in material IDs if there was only 1 part
in the mesh. This was unintentionally making the assumption that there
was only 1 material at index 0 - if there are more materials, the material index
that the part references may not be 0. The change ensures that we pack
material IDs if there are multiple parts or if the sole part uses a
material ID other than 0 (0 is the default).
 2017-10-12 18:33:57 -07:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread 
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
 2017-10-12 17:37:05 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Nissim Hadar
7eb9dade6a Added hazeTestInitialPose.js 2017-10-12 17:03:33 -07:00
Stephen Birarda
8a331e29a2 Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker 
Feat/JS-Baker
 2017-10-12 16:16:02 -05:00
druiz17
83d2a54b0f fixed some bugs 2017-10-12 13:48:21 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
beholder
8c7462f012 fine-tuning based on discussion with Anshuman 2017-10-12 22:21:40 +03:00
beholder
c31aa6bcdb 8213 Keyboard Input Field: Reveals Passwords 2017-10-12 22:08:46 +03:00
utkarshgautamnyu
75aa3a73ad changed pointer args to references in JSBaker:bakeJS() 2017-10-12 12:08:44 -07:00
Zach Fox
30d6c78e4e Merge pull request #11580 from ElderOrb/case8210 
8210 Keyboard Input Field: Pressing Space should Clear Field
 2017-10-12 11:49:18 -07:00
utkarshgautamnyu
49f601329f Update JSBaker.h 2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc Update JSBaker.cpp 2017-10-12 11:34:28 -07:00
Nissim Hadar
e71df0fc08 Merge branch 'master' into hazeZone 2017-10-12 11:19:10 -07:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Zach Fox
1227168939 Merge pull request #11575 from ElderOrb/QTBUG-49297 
workaround for https://bugreports.qt.io/browse/QTBUG-49297
 2017-10-12 10:56:45 -07:00
druiz17
a6bc6a09a5 Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module 2017-10-12 10:34:17 -07:00
vladest
2d010980b0 Removed special sound for Mute and replace it with hover and click sounds 2017-10-12 19:15:09 +02:00
vladest
35b146b59a Added sounds in Audio menu 2017-10-12 19:01:38 +02:00
vladest
da734b628c Remove sound on stylus show and hide 2017-10-12 18:54:40 +02:00
vladest
b965049651 Do not produce sound and highlight on disabled items and menu separators 2017-10-12 18:39:26 +02:00
vladest
f1d5df5926 Restore lost-in-merge context property 2017-10-12 18:26:50 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
Nissim Hadar
d0deaa631c Trying to pretty-up. 2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547 Name correction. 2017-10-12 07:37:44 -07:00
beholder
f31316b0aa 8210 Keyboard Input Field: Pressing Space should Clear Field 2017-10-12 15:03:32 +03:00
beholder
9c15af9fbe raise highlight above button overlay to reduce flickering 2017-10-12 14:46:01 +03:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9 Added checkbox for altitude effect of haze. 2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8 Renamed haze colours and moved checkbox for glare. 2017-10-11 19:32:09 -07:00