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

78630 commits

This branch
This branch
All branches
Author SHA1 Message Date
amerhifi
804d171102 fixed a bunch of pr comments 2019-05-13 16:38:11 -07:00
Roxanne Skelly
4ad3163ca5 Disable event queue debugging for non-windows platforms. 2019-05-13 16:37:45 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246 
Case 22246: Picks, PickType, RayPick JSDoc update
 2019-05-13 16:16:17 -07:00
Shannon Romano
53b80ba404
Merge pull request #15550 from huffman/fix/gettransform-spam 
BUGZ-89: Suppress getTransform spam
 2019-05-13 16:13:46 -07:00
Zach Fox
2ce9e9ee10 The right way to restrict private user data: 2019-05-13 16:07:29 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Zach Fox
7bb2d6871b Simlpified Slider (not totally working; position is off) 2019-05-13 15:58:04 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Simon Walton
305a215d21 Pass a QObject context for the functor 2019-05-13 15:50:04 -07:00
Shannon Romano
72d000a76d
Merge pull request #15521 from ctrlaltdavid/M22489 
Case 22489: Scene JSDoc
 2019-05-13 15:49:44 -07:00
amerhifi
9652d412ac Merge branch 'master' into feature/platform 2019-05-13 15:39:55 -07:00
David Rowe
70ec84177a Doc review 2019-05-14 10:32:28 +12:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407 
Case 22407: Quat JSDoc update
 2019-05-13 15:17:58 -07:00
Ryan Huffman
2e2d0add93 BUGZ-89: Suppress getTransform spam 2019-05-13 14:50:46 -07:00
Simon Walton
ede8859cc7 Call correct NodeList::reset() from Application 2019-05-13 14:38:34 -07:00
Andrew Meadows
2d21b5c269 use qt.conf file to find Qt resources 2019-05-13 14:26:16 -07:00
Howard Stearns
ee1231362c Merge branch 'tests' of git://github.com/SamGondelman/hifi into SamGondelman-tests 2019-05-13 14:26:15 -07:00
SamGondelman
652ac17dac fix deadlock on startup 2019-05-13 14:17:55 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-40) Check for possible avatar fade race condition
 2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash 
BUGZ-125: Error message instead of crash if the GL version is too low
 2019-05-13 13:12:30 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change 
Clear any reliable connection state upon Node ID change
 2019-05-13 13:11:05 -07:00
Shannon Romano
d37beec6d2
Merge pull request #15535 from Atlante45/fix/warnings 
Fix mac build warnings
 2019-05-13 13:09:59 -07:00
Shannon Romano
b1060bcb83
Merge pull request #15508 from dback2/materialTargetTooltip 
Case 22467: Fix material target tooltip
 2019-05-13 13:08:28 -07:00
Shannon Romano
12bb073d14
Merge pull request #15485 from sabrina-shanman/crash_hfm_normals 
(case 22026) Fix crash due to invalid indices in baker::calculateNormals
 2019-05-13 13:06:01 -07:00
Zach Fox
f799f96fba simplifiedUI UIT switch 2019-05-13 13:04:12 -07:00
amerhifi
270d7feb7f removed the duplicate function declaration 2019-05-13 12:20:22 -07:00
amerhifi
8623c3d74f removing testing function declared in app.h 2019-05-13 12:14:48 -07:00
amerhifi
71d534c97d merged master and resolved application conflict 2019-05-13 12:09:50 -07:00
amerhifi
8759f028f8 fixing Linux warnings 2019-05-13 11:41:30 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch 
Case 22379: Run-time switch for deferred/forward rendering
 2019-05-13 11:14:26 -07:00
Saracen
9aadea81b3 Fix to use correct texcoord2 array. 2019-05-13 19:13:24 +01:00
Zach Fox
feb5021372 UIT RadioButton 2019-05-13 11:07:39 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
amerhifi
541aef5e90 fixing warnings 2019-05-13 09:56:10 -07:00
Shannon Romano
5c58cec5af
Merge pull request #15522 from SaracenOne/forward_lightmapping 
Case 22494, BUGZ-127: Render lightmaps in the forward renderer
 2019-05-13 09:13:34 -07:00
amerhifi
cbd751df89 fixing mac typo 2019-05-13 08:37:05 -07:00
Brad Hefta-Gaub
52eec19d50
Merge pull request #15543 from SamGondelman/zone 
BUGZ-139, Case 22502: Fix zone inheritance
 2019-05-13 08:12:41 -07:00
Shannon Romano
99239f6415
Merge pull request #15542 from hyperlogic/bug-fix/dependency-manager-thread-safety 
Make DependencyManager thread-safe
 2019-05-13 07:43:55 -07:00
amerhifi
9899b8c858 Merge branch 'master' into feature/platform 2019-05-13 06:52:13 -07:00
amerhifi
13c9bb078c cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues. 2019-05-13 06:50:08 -07:00
Saracen
7987ed14b0 Fix mismatched meshpart attributes (generates dummy buffers), re-added normals generation routine, buffer size checks, detect out-of-range indices, 2019-05-11 04:30:14 +01:00
Anthony Thibault
b46378e0b6 Compile error fix 2019-05-10 15:51:42 -07:00
Anthony Thibault
fe17550a80 Code review feedback 
In DependencyManager::set<>() destroy the clear the previous before allocating the new instance.
 2019-05-10 15:41:52 -07:00
amerhifi
d019dc7d54 typo 2019-05-10 15:31:11 -07:00
SamGondelman
dfdace8cdc fix zones for real this time 2019-05-10 15:24:02 -07:00
sabrina-shanman
736c7a9736 Change logging from 'fade-out animation' to 'fade-out transition' 2019-05-10 15:18:52 -07:00
amerhifi
81c0d195e3 added ability to extract cpu info on osx 2019-05-10 15:17:33 -07:00