Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61323 commits 71 branches 56 tags 1.2 GiB
Commit graph

61323 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07: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
Nissim Hadar
c5c996f186 Cleanup. 2017-10-26 09:21:38 -07:00
Ryan Downe Karpf
2f69e757a0 Merge pull request #11690 from highfidelity/RC-57.1 
RC57.1
* Temporarily disable baking of JS files in Asset Server
* Better handling of place name lookup - fixing some cases of unable to connect to domain
 2017-10-26 08:57:27 -07:00
Ken Cooke
4eb8b826c2 Merge pull request #11681 from luiscuenca/case6443 
6443 Audio Menu Sample Sound won't play while domain is loading
 2017-10-26 08:40:30 -07:00
Nissim Hadar
b820f397fc Fix zero-divide. 2017-10-26 08:39:22 -07:00
Ken Cooke
30d6185625 Merge pull request #11687 from ctrlaltdavid/21577 
Fix script reload icon not working in Windows developer builds
 2017-10-26 08:35:59 -07:00
Seth Alves
807b4c4ed2 Merge pull request #11686 from NissimHadar/hazeZone 
Reduced haze background blend range to 27,000 metres.
 2017-10-26 08:13:24 -07:00
luiscuenca
b7c375f396 Cleaning 2017-10-25 19:09:37 -07:00
luiscuenca
3d3077978e Simplyfied and fixed null pointer 2017-10-25 18:47:10 -07:00
Clément Brisset
61a2d80117 Merge pull request #11676 from Atlante45/new-master 
Merge stable back into master
 2017-10-25 18:37:50 -07:00
Stephen Birarda
b7b0172a42 Merge pull request #11682 from birarda/bug/lost-ice-server 
Hotfix: fix null candidate ice-server QHostAddress
 2017-10-25 20:27:56 -05:00
David Rowe
7cb6bae1e6 Remove stopwatch source in favor of using source in hifi-content repo 2017-10-26 14:09:50 +13:00
Stephen Birarda
0b28dfd569 Merge pull request #11685 from birarda/bug/js-bake-disable 
Hotfix: disable baking of JS files in Asset Server
 2017-10-25 19:41:51 -05:00
Seth Alves
0f31631f17 Merge pull request #11677 from druiz17/fix-fargrab 
Make non-dynamic entities collisionless during far-grab
 2017-10-25 17:31:02 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
David Rowe
da33c4fcf2 Fix script reload icon not working in Windows developer builds 2017-10-26 11:41:52 +13:00
Stephen Birarda
e450ac5bd3 don't use COW-less SpecialAddress assignment 2017-10-25 15:28:30 -07:00
Zach Fox
2f28cf1443 Remove unnecessary newline 2017-10-25 15:20:31 -07:00
Zach Fox
3f0108528d Remove unnecessary newline 2017-10-25 15:19:56 -07:00
Nissim Hadar
2ec62ecc9b Reduced haze background blend range to 27,000 metres. 2017-10-25 15:12:01 -07:00
Stephen Birarda
60fbbe4bc0 disable baking of JS files 2017-10-25 14:29:28 -07:00
Brad Hefta-Gaub
b53f1d5027 Merge pull request #11679 from ZappoMan/fixDPISetting 
Fix dpi setting in edit.js
 2017-10-25 14:14:11 -07:00
Nissim Hadar
bfab466827 Bug 8610. 2017-10-25 14:13:53 -07:00
Stephen Birarda
9345f4545f sanitize the ice-server addresses before using 2017-10-25 14:10:11 -07:00
Nissim Hadar
8d11ace1a6 Bug 8610. 2017-10-25 13:46:59 -07:00
samcake
5b0bbbb21e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-25 13:14:47 -07:00
luiscuenca
a1c9285c90 Fixed bug on case 6443 2017-10-25 13:13:50 -07:00
Atlante45
ff547f4e4f Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-25 13:03:46 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Dante Ruiz
8d07f2a6a3 Merge branch 'master' of github.com:highfidelity/hifi into fix-fargrab 2017-10-25 12:53:14 -07:00
ZappoMan
dcb6530b8a Merge branch 'master' of https://github.com/highfidelity/hifi into fixDPISetting 2017-10-25 12:39:57 -07:00
Brad Hefta-Gaub
0c9184566e Merge pull request #11678 from AndrewMeadows/fix-broken-build 
fix compile errors after merge
 2017-10-25 12:39:34 -07:00
Stephen Birarda
a28f2f19e0 Merge pull request #11674 from utkarshgautamnyu/fix/JSBaker 
Fixed issue with QTextStream in JSBaker
 2017-10-25 14:06:43 -05:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Andrew Meadows
c14bbb76e6 fix compile errors after merge 2017-10-25 11:57:44 -07:00
Dante Ruiz
2ec8f3f625 made non-dynamic entities collisionless during far-grab 2017-10-25 11:29:32 -07:00
Ryan Downe Karpf
4cefd3937b Merge pull request #11589 from highfidelity/RC-57 
Beta Release 57 - Includes up to Developer Release 7288
 2017-10-25 10:53:24 -07:00
Andrew Meadows
2d0b94817c Merge pull request #11336 from 1P-Cusack/21389_PR2 
WL21389 PR2: Representation of collision shapes need updating (details below).
 2017-10-25 10:41:21 -07:00
Seth Alves
66e38af1b3 Merge pull request #11671 from ElderOrb/case8553 
8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create
 2017-10-25 10:31:31 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Zach Fox
d7bdbfb37b Fix unix build errors 2017-10-25 09:53:59 -07:00