Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 14:34:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78963 commits 76 branches 59 tags 1.2 GiB
Commit graph

23980 commits

Author SHA1 Message Date
PrestonB1123
059d931d17
Merge pull request #15711 from PrestonB1123/removingShortcuts 
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
 2019-06-07 16:26:38 -07:00
Preston Bezos
a0753f6393 removed ctrl+b and ctrl+n as shortcuts 2019-06-07 15:41:44 -07:00
Shannon Romano
e4b26656d4
Merge pull request #15703 from amerhifi/master 
case : BUGZ 560: disabling dde initialization due to random crashes while closing down…
 2019-06-07 15:15:46 -07:00
amer cerkic
f2c6cb79f7 if formatting 2019-06-07 14:17:49 -07:00
amer cerkic
049ff8e618 fixed last space 2019-06-07 14:11:13 -07:00
amer cerkic
c61f0bcf3e more vs cleanup 2019-06-07 14:07:06 -07:00
amer cerkic
64534913af more vs changes udo 2019-06-07 13:59:18 -07:00
amer cerkic
fd7dd7948f reverted vs spacing changes 2019-06-07 13:41:14 -07:00
amer cerkic
9498e0a462 addressing comment concerning preferences 2019-06-07 12:47:04 -07:00
Preston Bezos
e89f499c1a this should work 2019-06-07 12:02:15 -07:00
Preston Bezos
4eccb7a124 Revert "made one more change to get rid of ubuntu warning" 
This reverts commit e7255298de.
 2019-06-07 12:00:36 -07:00
Preston Bezos
e7255298de made one more change to get rid of ubuntu warning 2019-06-07 11:59:26 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
Preston Bezos
ad562b8f91 really need to stop clanging myself 2019-06-07 11:22:11 -07:00
Preston Bezos
e63d98e137 fixed a couple of doc errors and accounted for some edge cases 2019-06-07 11:09:21 -07:00
Preston Bezos
3ab4be6b8d I got clanged 2019-06-07 10:42:31 -07:00
amerhifi
b1df463f56 disabling dde initialization due to random crashes while closing down the socket connection on mac 2019-06-07 10:16:36 -07:00
Shannon Romano
1e827a925a
Merge pull request #15699 from SamGondelman/avatarPick 
BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation
 2019-06-07 09:59:42 -07:00
SamGondelman
3bb645b2d7 put avatar spheres in r3 in simulation 2019-06-06 17:17:18 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
Preston Bezos
a7a765b025 added a couple more notifies and fixed a couple of jsdocs 2019-06-06 16:23:54 -07:00
Zach Fox
b737e31421
Merge pull request #15696 from zfox23/emitWhenDocking 
Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup
 2019-06-06 15:45:32 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
Zach Fox
a7ad087bd0 Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup 2019-06-06 14:23:18 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
Sam Gateau
afdc323622 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-05 17:56:34 -07:00
Sam Gateau
9bc6c3bfcd INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings 2019-06-05 17:56:14 -07:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Seth Alves
c5eb9c03d5 fix uninitialized read 2019-06-04 13:00:26 -07:00
Seth Alves
06436e6a7d quiet build warning 2019-06-04 13:00:26 -07:00
Sam Gateau
f51e491d85 Removing the atomics and fixing mistakes pointed out inreview 2019-06-04 10:11:12 -07:00
Sam Gateau
2a4d0cfaec Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset 2019-06-03 18:06:28 -07:00
Sam Gateau
db04f61c5b Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-03 09:37:13 -07:00
Sam Gateau
54d1705f06 Testing a different approach 2019-05-31 18:42:26 -07:00
Sam Gondelman
d94b685c94
Merge pull request #15661 from SamGondelman/avatarCrash 
BUGZ-478: Fix address manager crash
 2019-05-31 16:01:07 -07:00
Brad Hefta-Gaub
52d02f61a1
Merge pull request #15657 from zfox23/newPerformanceAPI 
BUGZ-447: Use new performance preset API
 2019-05-31 15:31:07 -07:00
SamGondelman
e29bf376a4 fix address manager crash 2019-05-31 14:01:58 -07:00
Brad Hefta-Gaub
f7f17cfbff
Merge pull request #15659 from sabrina-shanman/bug_mac_framerate_minimized 
(BUGZ-416) Fix Application not checking window minimize state properly
 2019-05-31 13:22:56 -07:00
Zach Fox
97bd0d5413 Make this work! 2019-05-31 12:50:32 -07:00
sabrina-shanman
fa79d0ec18 Fix Application not checking window minimize state properly 2019-05-31 11:36:52 -07:00
Andrew Meadows
297517c85d minimize lock duration 2019-05-31 11:06:16 -07:00
Andrew Meadows
5f9262cf5e change data member names to not poke other devs in the eye 2019-05-31 11:03:11 -07:00
Sam Gateau
4e2480d032 cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier 2019-05-31 00:00:44 -07:00
Sam Gateau
916ff31cf6 adjust the preset options 2019-05-30 17:51:21 -07:00
Andrew Meadows
0c916e0c03 guard MyAvatar::_scriptEngine with mutex 2019-05-30 16:08:47 -07:00
Sam Gateau
bb7a182544 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-05-30 12:03:58 -07:00
Sam Gateau
b88deb52b0 Cleaning up the interface for the Performance PRESET and the associated debug ui 2019-05-30 12:03:44 -07:00
Sam Gateau
3100fe4833 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-05-29 19:11:11 -07:00
Sam Gateau
a212a8a36a COnnect the profile tier to the performance setting and assign on first run or after reset... 2019-05-29 17:49:17 -07:00
Dante Ruiz
b0ace1c098
Merge pull request #15646 from huffman/feat/get-home-bookmark 
DEV-62: Add getHomeLocationAddress to bookmark API
 2019-05-29 17:35:40 -07:00