Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 20:20:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
7616fe193c Migrate the DS config version to the config file 2017-10-31 17:35:23 -07:00
SamGondelman
5a7298f15b Merge remote-tracking branch 'upstream/master' into pointers 2017-10-31 17:33:52 -07:00
SamGondelman
64665c87b2 replace ids with unsigned ints 2017-10-31 17:07:48 -07:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
Stephen Birarda
b8370128ce remove master config from HifiConfigVariantMap/domain-server 2017-10-31 16:19:50 -07:00
Dante Ruiz
f44025a8b1 completely removed non-need laserPointers 2017-10-31 15:57:57 -07:00
Sam Gateau
be74b5c9ed
Merge pull request #11692 from NissimHadar/hazeZone 
Bug fixes 8672-8673-8674 related to Zone entity Haze component
 2017-10-31 15:25:32 -07:00
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
SamGondelman
3c779f1528 HUD events WIP, fix entity/overlay hover, no hover for empty renderState 2017-10-31 14:42:31 -07:00
Dante Ruiz
4688eaa18f Merge branch 'ui' of github.com:SamGondelman/hifi into ui 2017-10-31 14:14:47 -07:00
Dante Ruiz
30332c3d00 removing more laserPointers 2017-10-31 14:13:42 -07:00
Zach Fox
d49e281fab Add RSA error handling 2017-10-31 14:12:30 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
SamGondelman
df237eae54 HUD events WIP, fix entity/overlay hover 2017-10-31 13:26:43 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Ken Cooke
cfba6ae819 Implement master avatar gain in the audio-mixer 2017-10-31 11:18:03 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui 
Pointers generate PointerEvents (WIP)
 2017-10-31 10:01:15 -07:00
Dante Ruiz
a3f002ac11 fixing merge conflict 2017-10-31 09:13:38 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Nissim Hadar
b00db6a68f Correction. 2017-10-30 19:20:49 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Brad Hefta-Gaub
fbcd813d7b
Merge pull request #11694 from ElderOrb/FB8315 
8315 Stylus appears in wrong place on hand
 2017-10-30 18:00:56 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
Dante Ruiz
e5600e4f1e one universal controller pointer for all modules 2017-10-30 16:58:14 -07:00
luiscuenca
8d5c95b1d6 Various corrections 2017-10-30 16:47:59 -07:00
SamGondelman
76eb4c656e fix multi-touch and keyboard on web entities 2017-10-30 16:41:59 -07:00
Andrew Meadows
0f1139343c
Merge pull request #11709 from druiz17/equip-adjustment 
Remember adjustment made to equipped entities
 2017-10-30 15:45:28 -07:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
vladest
aa9ae6c838 License header fix 2017-10-30 20:29:44 +01:00
vladest
ea55b5407e bracket fix 2017-10-30 20:22:47 +01:00
vladest
7b57fe1a5d type fixed 2017-10-30 20:21:34 +01:00
vladest
d9c6f17e42 Coding standards 2017-10-30 20:06:17 +01:00
Nissim Hadar
6391282680 Swapped location of keylight attenuation and the blending factor. 2017-10-30 12:05:23 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -07:00
Nissim Hadar
d6b3fa4cb1 Removed references to Haze from Stage. 2017-10-30 10:49:08 -07:00
Ken Cooke
3a2780bdf6 Enable gain slider in PAL menu to control Avatar MASTER Gain 2017-10-30 10:42:26 -07:00
SamGondelman
e9a5acda06 control hovering, preset buttons for clicking, constness, scroll off 
surface
 2017-10-30 10:28:43 -07:00
vladest
d3c62db65d Merge branch 'master' into webbrowser_updates 2017-10-30 18:17:19 +01:00
vladest
586dde7dd7 Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues 2017-10-30 18:15:42 +01:00
Nissim Hadar
349e12c065 Merge branch 'master' into hazeZone 2017-10-30 10:08:35 -07:00
SamGondelman
e6582a0370 control hovering, preset buttons for clicking, constness, scroll off 
surface
 2017-10-30 09:47:54 -07:00
Brad Davis
23653f08ca Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 09:20:58 -07:00
samcake
8fd8226073 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-30 09:06:33 -07:00
Ryan Downe Karpf
c0f44c8fc8
Merge pull request #11636 from birarda/bug/draco-in-debug 
use config specific install dir for draco external
 2017-10-30 09:00:14 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00