Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:19:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75237 commits 76 branches 59 tags 1.2 GiB
Commit graph

75237 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
d6f2a0ebe3 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-17 12:19:04 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
NissimHadar
21bad12b4c Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac 2019-01-17 11:17:46 -08:00
NissimHadar
c0519c5a64 Corrected back to interface 2019-01-17 11:15:45 -08:00
NissimHadar
5e5374ebdd DEBUG 2019-01-17 09:47:53 -08:00
NissimHadar
77f381b558 DEBUG 2019-01-17 09:29:47 -08:00
NissimHadar
88078d168f DEBUG 2019-01-17 08:26:18 -08:00
NissimHadar
9593b0e764 Removed debug code. 2019-01-17 08:23:49 -08:00
NissimHadar
20c52e4104 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-16 23:55:57 -08:00
NissimHadar
74b8937004 Copy folder only in DEV builds. 2019-01-16 18:38:03 -08:00
NissimHadar
84dd4c4e1d Fixed Linux compilation error. 2019-01-16 18:37:38 -08:00
NissimHadar
c6529ae86d Minor clean-up. 2019-01-16 17:44:48 -08:00
NissimHadar
bfe7742e97 Use the `applicationDirPath on Mac 2019-01-16 17:30:55 -08:00
NissimHadar
2307be2785 Corrections. 2019-01-16 17:30:13 -08:00
NissimHadar
7d5bb6eaf8 Added AppData folder copy. 2019-01-16 14:46:52 -08:00
SamGondelman
9727c8fd38 CR 2019-01-16 14:14:01 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv 
pepper AssociatedTraitValues with some needed comments
 2019-01-16 10:59:08 -08:00
NissimHadar
b0fc794426 Trying to get Jenkins to build correctly. 2019-01-16 10:42:49 -08:00
birarda
a63c2b3e29 pepper AssociatedTraitValues with some needed comments 2019-01-16 10:15:04 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
John Conklin II
7c06c18fe4
Merge pull request #14699 from ingerjm0/api-directory 
JSDoc > Grav directory change
 2019-01-15 18:15:11 -08:00
NissimHadar
f8f8e35e6d Trying ... honestly! 2019-01-15 17:54:25 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge 
log purge
 2019-01-15 16:19:03 -08:00
NissimHadar
fcd0a6f20a Funny ... this is needed on Mac... 2019-01-15 15:59:03 -08:00
NissimHadar
b2cf8c8e18 New CMake for nitpick. 2019-01-15 15:21:48 -08:00
Stephen Birarda
73a5f30350
Merge pull request #14709 from birarda/add-traits-to-dissectors 
add message fragment handling to wireshark dissectors
 2019-01-15 12:06:18 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large 
Log a warning if an entity's property is too large
 2019-01-15 12:00:04 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280 
fix a couple shutdown crashes and a class of asan warning
 2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix 
Fix the distance attenuation of stereo local injectors
 2019-01-15 10:54:54 -08:00
Antonina Savinova
6499c4f0ea
Merge pull request #14700 from SimonWalton-HiFi/update-icons 
New icons for interface and server-console
 2019-01-14 16:04:55 -08:00
Antonina Savinova
89600f4880
Merge pull request #14701 from roxanneskelly/Case20615 
Case20615 - Changing Avatars doesn't update to everyone intermittently
 2019-01-14 14:44:35 -08:00
NissimHadar
b1788c7228 Corrections. 2019-01-14 14:31:50 -08:00
NissimHadar
86fb794ecf Moved setting of NITPICK_BUNDLE_NAME 2019-01-14 14:31:10 -08:00
NissimHadar
40f83b2564 Just removed blank line 2019-01-14 14:30:07 -08:00
Dante Ruiz
4ab7308669 addressing code review requests 2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
NissimHadar
f0dfa5edd2 Integrating Stephen's hints. 2019-01-14 12:30:58 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
Brad Hefta-Gaub
a115af6353
Merge pull request #14674 from kencooke/audio-asan-warnings3 
Fix ASAN warning due to mixed signed/unsigned arithmetic
 2019-01-14 09:32:22 -08:00
NissimHadar
d284b9b1e1 WIP. 2019-01-13 21:44:38 -08:00
Roxanne Skelly
69af0ea0ee CR Fix 2019-01-11 17:52:47 -08:00
NissimHadar
7129556049 Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac 2019-01-11 17:30:25 -08:00
NissimHadar
9e61e3415c WIP. 2019-01-11 17:26:28 -08:00
Roxanne Skelly
fca15c1362 CR Fix 2019-01-11 17:13:32 -08:00
Seth Alves
1ef047a329 revert unneeded change to LimitedNodeList 2019-01-11 16:49:09 -08:00
Roxanne Skelly
cd6495286d More code review changes 2019-01-11 16:49:04 -08:00
Roxanne Skelly
d3528ba289 Code review changes 2019-01-11 16:33:23 -08:00
NissimHadar
39ee69d959 Added .gitignore to repo. 2019-01-11 16:26:06 -08:00