Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-17 05:41:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40273 commits 26 branches 28 tags 1.2 GiB
Commit graph

16207 commits

Author SHA1 Message Date
Brad Davis
b2be54a179 Ensure we don't get trapped in the QML rendering loop on shutdown 2016-03-09 13:45:00 -08:00
Brad Hefta-Gaub
975f0f049c Merge pull request #7297 from jherico/upload_fix 
Fix edit.js upload button
 2016-03-09 13:14:35 -08:00
Brad Davis
6e24b66b38 Fix edit.js upload button 2016-03-09 12:21:31 -08:00
Brad Hefta-Gaub
e038c8a43c Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes 2016-03-09 11:47:55 -08:00
samcake
f82bd441a9 IMproving th ecomment 2016-03-09 10:34:49 -08:00
samcake
d1135c4a37 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-09 10:20:54 -08:00
Brad Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Seth Alves
a2eb819bc2 Merge pull request #7282 from zzmp/fix/tex-cache 
Avoid caching textures before they load
 2016-03-09 09:25:01 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
samcake
2fc359d34c Merge branch 'orange' of https://github.com/samcake/hifi into orange 2016-03-08 19:42:54 -08:00
samcake
5f80d7e53e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 19:42:26 -08:00
samcake
bb9957b7f1 using comments from review 2016-03-08 18:45:20 -08:00
samcake
bfed0304c3 Merge pull request #7218 from zzmp/fix/resort-in-octree 
Fix item key lookup on updated items in scene
 2016-03-08 17:48:51 -08:00
samcake
afbec33f36 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 16:12:21 -08:00
Brad Hefta-Gaub
8d4ef28411 CR feedback 2016-03-08 15:29:04 -08:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
Chris Collins
fd53d4de2b Merge pull request #7280 from zzmp/fix/fbx-multiple-mats 
Fix inlined fbx content for identically named texs with different paths
 2016-03-08 14:41:23 -08:00
Zach Pomerantz
883d4ba006 Only cache processed textures 2016-03-08 14:39:53 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Zach Pomerantz
925ea8bcda Add Resource::isCacheable 2016-03-08 13:30:58 -08:00
Bradley Austin Davis
7d046c30a9 Bypass baffling OSX GL error 2016-03-08 12:23:29 -08:00
Zach Pomerantz
77958e2a48 Change FBXReader impl to recognize inlined tex 2016-03-08 12:23:23 -08:00
samcake
5299b06e83 Reintroducing the use of the DiffuseFactor so both Bender and MAya looks closer to Hifi 2016-03-08 11:26:16 -08:00
Seth Alves
b780fad83f Merge pull request #7270 from birarda/local-socket-check 
add a secondary method for local socket check
 2016-03-08 10:48:08 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
Stephen Birarda
909979bab9 fix SLOT connection for local address check 2016-03-08 09:11:38 -08:00
Stephen Birarda
73b7e787d3 change signature of errorTestingLocalSocket 2016-03-08 09:09:28 -08:00
samcake
3ed5a2afe2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-07 19:07:13 -08:00
samcake
3a810152fb Trying to consolidate the FBX reader for Blender /maya 2016-03-07 18:30:22 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00
Chris Collins
5078f486b1 Merge pull request #7266 from sethalves/local-messages 
allow sending interface-local messsages
 2016-03-07 17:21:45 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
f5acf49e47 Fix reticle transform when depth != 1 2016-03-07 17:14:42 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Andrew Meadows
592d29fc7c Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration 
fix collisions with non-default registration
 2016-03-07 15:46:13 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Chris Collins
7850ca3576 Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes 
Avatar eye look at fixes for HMD and desktop
 2016-03-07 11:50:16 -08:00
Seth Alves
40c953e0b9 fix model hulls 2016-03-07 11:40:18 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Brad Hefta-Gaub
3fe89c0cdf Merge pull request #7256 from samcake/orange 
Fix the text rendering Bug
 2016-03-07 09:11:55 -08:00
Chris Collins
d03fb797e7 Merge pull request #7252 from sethalves/fix-polyvox-rendering-again 
fix polyvox fragment shader
 2016-03-07 08:59:22 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00