Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 03:40:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60925 commits 25 branches 0 tags 1.1 GiB
Commit graph

60925 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SamGondelman
975a3e5bbb Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers 2017-10-17 13:23:08 -07:00
SamGondelman
315baeae1f threading fix 2017-10-17 13:22:40 -07:00
Bradley Austin Davis
50929b780d Add constructor to suppress warning 2017-10-17 12:59:41 -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
SamGondelman
ba4f41b59a fix warnings 2017-10-17 12:03:59 -07:00
Bradley Austin Davis
f53a74b515 Support for custom functionality for specific QML URLs 2017-10-17 11:53:30 -07:00
Sam Gondelman
2e69d2b1ad missed one scripting interface reference 2017-10-17 11:13:02 -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
Andrew Meadows
339edc67c8 ifdef out more per-frame-per-entity profiling 2017-10-16 17:27:53 -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
Andrew Meadows
1f09c10fb1 comment out more profiling stuff 2017-10-16 16:43:16 -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
Andrew Meadows
102a1cb36b ifdef out detailed profiling 2017-10-16 16:02:11 -07:00
Bradley Austin Davis
ffc3678ec3 Merge pull request #11609 from SamGondelman/ui 
Update scripts to use new ignore/include Items, fix caching bug
 2017-10-16 16:01:33 -07:00
Andrew Meadows
fb1c075a12 fix animating entities 2017-10-16 15:55:25 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -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
Sam Gondelman
671eb09bf3 Merge pull request #11605 from jherico/pointers_cleanup 
C++ cleanup for pointers / picking
 2017-10-16 14:48:08 -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
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -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
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
Andrew Meadows
23bb8608b1 minor optimizations in updateModelBounds() 2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -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
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
c25008cff3 Merge pull request #11594 from zfox23/commerce_octoberTweaks 
2017-10-13 Commerce frontend tweaks
 2017-10-16 09:25:43 -07:00