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

60887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
e9d4da5a01 Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard 
Fix web3Doverlays and webEntities keyboard not showup
 2017-10-17 17:32:04 -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
druiz17
9a881c5e57 fix keyboard 2017-10-17 15:43:23 -07:00
Nissim
5249e97fa0 Merge branch 'master' into hazeZone 2017-10-17 15:09:22 -07:00
Nissim
845f3e4bee Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 2017-10-17 15:03:57 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Andrew Meadows
5225ca3ca7 Merge pull request #11448 from jherico/future/clang_format 
Use clang format to enforce coding standards
 2017-10-17 13:34:01 -07:00
Seth Alves
aaf3c24a44 handle camera-relative controller joints for other avatars 2017-10-17 12:36:15 -07:00
Nissim
d53aadc617 Merge branch 'master' into hazeZone 2017-10-17 12:13:40 -07:00
Bradley Austin Davis
f53a74b515 Support for custom functionality for specific QML URLs 2017-10-17 11:53:30 -07:00
Zach Fox
f3b641a833 Edit.js caused a testing fail :( 2017-10-17 11:30:15 -07:00
Zach Fox
eceb0dcc95 Fix appearance of domain settings page 2017-10-17 11:29:43 -07:00
Nissim
5a1c4d5a30 Fixed gcc warning. 2017-10-17 11:08:15 -07:00
John Conklin II
31b8013ed9 Merge pull request #11538 from kencooke/audio-mac-bugfix2 
Additional cleanup of audio noise gate
 2017-10-17 11:02:55 -07:00
Nissim
3e228acdb6 Fixed gcc warning. 2017-10-17 10:41:49 -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
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
Brad Hefta-Gaub
f7a1816a99 Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue 
Reduce present traffic on main thread event queue.
 2017-10-16 18:02:11 -07:00
Nissim
072ac13120 Fixed gcc warnings. 2017-10-16 17:12:59 -07:00
Brad Hefta-Gaub
b0fc050fe2 Merge pull request #11586 from Zvork/hdrcube 
HDR cube map equirectangular bug fix
 2017-10-16 16:49:20 -07:00
Brad Hefta-Gaub
c1ce84b060 Merge pull request #11602 from kencooke/audio-startup-fix 
Fix loud screeching sound when certain users join a domain
 2017-10-16 16:47:42 -07:00
John Conklin II
42a018c2c5 Merge pull request #11606 from ElderOrb/case8213 
8213 Keyboard Input Field: Reveals Passwords (RC-57)
 2017-10-16 16:14:43 -07:00
beholder
fa7892e5c6 8217 Search in tablet doesn't update 2017-10-17 02:02:21 +03:00
Zach Fox
e1b0e5a2dd Move some include files around 2017-10-16 16:00:32 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
Seth Alves
648ae731da Merge pull request #11603 from MiladNazeri/fogBugz/8382 
Fix for fogbugz:8382 to shutdown debug window on reload scripts
 2017-10-16 15:32:28 -07:00
Bradley Austin Davis
1f8bd50d2b Add clang format specification 2017-10-16 15:19:12 -07:00
Bradley Austin Davis
17a6847609 Fix CMake command line options 2017-10-16 14:58:19 -07:00
Brad Hefta-Gaub
c4e672d6b8 Merge pull request #11582 from ElderOrb/case8213 
8213 Keyboard Input Field: Reveals Passwords
 2017-10-16 14:57:18 -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
Zach Fox
3c572b0f7a Fix deadlock 2017-10-16 13:41:39 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
Zach Fox
960f1fbfe4 Still broken, but safer 2017-10-16 13:28:14 -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
46f0189ab4 Merge pull request #11601 from zfox23/walletNotifFix 
Fix Wallet notification appearing when taking screenshots
 2017-10-16 12:19:50 -07:00
Ken Cooke
bd82f47c66 Remove debug logging 2017-10-16 12:11:50 -07:00
Ken Cooke
7c14d5bbdf Remove debug logging 2017-10-16 11:43:52 -07:00
Ken Cooke
a702c5a0e4 Fix audio glitches caused by initial burst of SelectedAudioFormat packets. 
Temporary codec mismatch is expected during audio codec startup, due to packets already in-flight.
 2017-10-16 11:41:40 -07:00
Zach Fox
552defb418 Change protocol version 2017-10-16 11:23:34 -07:00
Zach Fox
1cf816a261 Fix Wallet notification appearing when taking screenshots 2017-10-16 11:15:09 -07:00
Nissim
45ffd3bd58 Merge branch 'master' into hazeZone 2017-10-16 11:01:33 -07:00
Nissim
0a5302ce25 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-10-16 11:01:13 -07:00
Nissim
e51b8047f1 Corrected gcc warning. 2017-10-16 11:00:10 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
Zach Fox
c25008cff3 Merge pull request #11594 from zfox23/commerce_octoberTweaks 
2017-10-13 Commerce frontend tweaks
 2017-10-16 09:25:43 -07:00
John Conklin II
1fcbf56ab7 Merge pull request #11596 from samcake/RC-57 
RC-57 : Fixing the zone entity not rendered properly when created
 2017-10-16 09:12:18 -07:00