Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 02:20:31 +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
samcake
55f6ecb070 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-27 09:29:41 -07:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Andrew Meadows
137fccbd91 cleanup ShapeFactory implementation 2017-10-27 08:56:26 -07:00
Andrew Meadows
d45febf1db add description of ShapeManager in comments 2017-10-27 08:55:41 -07:00
Olivier Prat
4cbee72eae Fixed warning on Mac and Ubuntu 2017-10-27 17:50:22 +02:00
Olivier Prat
4cadcd79bf Return full viewport when scissor is disabled and items in outline group 2017-10-27 17:07:19 +02:00
Andrew Meadows
b00d158342 remove DoubleHashKey: it is no longer used 2017-10-27 07:52:51 -07:00
Andrew Meadows
45e571dd02 cleanup ShapeInfo::getHash() 2017-10-27 07:52:51 -07:00
Olivier Prat
dc8c75f403 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-27 15:56:40 +02:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
Sam Gateau
a2765cffbd adjusting the qml again ? i just hate the layout / anchor system 2017-10-26 23:22:06 -07:00
Andrew Meadows
5ed58d5e5d enable Quad in ShapeEntityItem properties 2017-10-26 22:59:25 -07:00
Andrew Meadows
2710dca37c fix rendering of Circles and Quads 2017-10-26 22:58:50 -07:00
Andrew Meadows
474609dabf enforce dimensions of Circles and Quads 2017-10-26 22:58:24 -07:00
Andrew Meadows
901e145712 remove redundant dimensionsChanged() 2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577 more cleanup 2017-10-26 21:30:59 -07:00
Brad Hefta-Gaub
f21a284324 Merge pull request #11700 from SamGondelman/face 
Billboardables face avatar instead of facing away
 2017-10-26 20:40:29 -07:00
ZappoMan
e5becba4e9 migrate away from updateXXX standardize on setXXX 2017-10-26 20:38:07 -07:00
samcake
1dbeac7b88 Adding the idons for Luci and cleaning up the scripts 2017-10-26 19:55:59 -07:00
samcake
0636a2db06 removing historic changes 2017-10-26 19:19:52 -07:00
MissLiviRose
c7857d4fc3 actually remove href not script 2017-10-26 17:47:04 -07:00
MissLiviRose
0ab06d624a remove href property for non-owned avatar entities 2017-10-26 17:35:51 -07:00
samcake
79338f4316 removing the the unecessary files and trying using qrc:///qml 2017-10-26 17:12:49 -07:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
Zach Fox
8cb60fc62c Small edit.js changes 2017-10-26 16:44:21 -07:00
Stephen Birarda
10d05ba6c9 only respond to expected ICE peers in DS 2017-10-26 16:34:49 -07:00
SamGondelman
7951826e49 more advanced laser focusing 2017-10-26 16:10:27 -07:00
beholder
6093cef6f0 add comments to explain '-1' 2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2 adjust to coding standards 2017-10-27 01:25:25 +03:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
samcake
b9112024b8 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-26 14:27:23 -07:00
SamGondelman
755ce183e0 fix is facing avatar 2017-10-26 14:16:31 -07:00
Zach Fox
002141724b Return to using NetworkingConstants 2017-10-26 14:12:36 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub
e6dca8de86 Merge pull request #11698 from kencooke/audio-sample-sound-fix 
Tighter version of sample sound
 2017-10-26 13:45:19 -07:00
Zach Fox
d24f241b88 Fix silly javascript error 2017-10-26 13:31:15 -07:00
beholder
5969e0b118 8211 Add very short haptic feedback when highlighting letters on keyboard 2017-10-26 23:03:06 +03:00
vladest
794355dc35 Merge branch 'master' into webbrowser_updates 2017-10-26 21:18:00 +02:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
vladest
320ab2e682 Rework using StackView. Now backward takes in account popups as well 2017-10-26 21:14:44 +02:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
Bradley Austin Davis
becd99a964 Merge pull request #11584 from SamGondelman/pointerEvents 
First step of cleaning up PointerEvents
 2017-10-26 12:01:03 -07:00
Ken Cooke
2156729a75 Tighter version of sample sound 2017-10-26 11:48:40 -07:00
Sam Gateau
6051a3913f Merge pull request #11684 from NissimHadar/bugFix8610 
Bug fix 8610
 2017-10-26 10:55:29 -07:00
luiscuenca
f0eab58ebd Bug 6719 fixed 2017-10-26 09:41:24 -07:00
beholder
ddd25da430 8315 Stylus appears in wrong place on hand 2017-10-26 19:39:15 +03:00
Liv
c571af6bb2 Merge pull request #11689 from ctrlaltdavid/21580 
Remove stopwatch source in favor of using source in hifi-content repo
 2017-10-26 09:38:51 -07:00
Olivier Prat
0044759196 Disabled broken PCF and reset back to previous bias 2017-10-26 18:29:29 +02:00
Nissim Hadar
c5c996f186 Cleanup. 2017-10-26 09:21:38 -07:00