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

4533 commits

Author SHA1 Message Date
Olivier Prat
43f9db5b70 Fixed small bug due to half texel offset in outline shader 2017-10-23 11:08:13 +02:00
Olivier Prat
0f120a1a2a Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-23 10:08:02 +02:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
Olivier Prat
2d49cc1a75 Fixed bug in debugOutline script 2017-10-20 12:04:20 +02:00
Olivier Prat
732fe3b8db Improved outline debugging script for easier test plan 2017-10-20 11:32:43 +02:00
Olivier Prat
8229c41622 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-20 09:59:07 +02:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master 
Fingerpaint  PR
 2017-10-19 13:13:59 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Brad Hefta-Gaub
e2ccfb84f9 Merge pull request #11626 from Delanir/BubbleScaleMaster 
7429 IPD Secondary Task List: bubble.js Scale
 2017-10-19 09:31:15 -07:00
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
Olivier Prat
410b1904cd Fixed bug in outline.qml that associated outline tab to wrong outline job config 2017-10-19 17:36:16 +02:00
Olivier Prat
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
Seth Alves
28d0da51b9 Merge pull request #11628 from luiscuenca/case8269 
8269  controllerDispatcher is creating log spam with web entities
 2017-10-18 18:11:13 -07:00
Sam Gateau
4d7accabdf Merge pull request #11439 from NissimHadar/hazeZone 
Adding haze component to the zone entity.
 2017-10-18 16:14:28 -07:00
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
Olivier Prat
f63b4a64b0 Working debugging script with tabs 2017-10-18 16:02:38 +02:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Nissim
afa93f46e5 Merge branch 'master' into hazeZone 2017-10-17 09:28:07 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Olivier Prat
9ed5185a3e Multiple outline group config working 2017-10-17 10:01:06 +02:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
David Rowe
1e3a2b3e4e Merge branch 'master' into 21568 2017-10-17 15:15:49 +13:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Nissim
1b42572f99 Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2017-10-16 14:29:56 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
milad
97c255c59e Fix for fogbugz:8382 to shutdown debug window on reload scripts 2017-10-16 16:12:54 -04:00
Nissim
fd2b0da76d First version. 2017-10-16 12:20:31 -07:00
Zach Fox
1cf816a261 Fix Wallet notification appearing when taking screenshots 2017-10-16 11:15:09 -07:00
Olivier Prat
f716d0cc44 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-16 09:00:59 +02:00
Nissim Hadar
afb8b2d8e7 Merge branch 'master' into hazeZone 2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
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
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