Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 71 branches 56 tags 1.2 GiB
Commit graph

41398 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
fdf45e0134 Use "-group" classification for section expand and collapse 2016-03-30 17:34:31 +13:00
David Rowe
1c5e414c15 Reinstate original property "-section" classifications 2016-03-30 16:10:32 +13:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
Brad Hefta-Gaub
a9995a8790 Merge pull request #7500 from zzmp/fix/queue-model-geo-get 
Update model URL on render thread
 2016-03-29 15:21:46 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Eric Levin
830d08c385 Merge pull request #7498 from Atlante45/fix/import-entities 
Make svo loading use ResourceManager
 2016-03-29 08:09:47 -07:00
David Rowe
d07cc82512 Color some buttons 2016-03-29 23:39:02 +13:00
David Rowe
791d3b0310 Fix styling of disabled form 2016-03-29 23:24:34 +13:00
David Rowe
252a48ed5b Miscellaneous fixes 2016-03-29 22:28:00 +13:00
David Rowe
ab37534e0d Restyle dropdowns 2016-03-29 20:14:08 +13:00
David Rowe
a2d9f088ab Typos 2016-03-29 18:47:13 +13:00
Brad Hefta-Gaub
9bcc13d4a8 Merge pull request #7497 from samcake/orange 
Fix import for local file.qml tfrom another qml
 2016-03-28 18:44:25 -07:00
samcake
884a3e691d Cleaning up moved files 2016-03-28 18:38:34 -07:00
samcake
a815c50fca fixing the qml component 2016-03-28 18:36:17 -07:00
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
samcake
95418e25c0 Try to fix the iinclude for the PerfPlot/qml 2016-03-28 17:46:19 -07:00
samcake
b34ab28c22 Merge pull request #7456 from zzmp/feat/geocaching 
Add model caching
 2016-03-28 16:28:40 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta 
fix for incorrect next packet delta in udt::SendQueue
 2016-03-28 14:12:04 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
Brad Hefta-Gaub
7396fa1cc3 Merge pull request #7493 from zzmp/fix/plugin-check 
Default to desktop when display plugins fail to load
 2016-03-28 13:49:58 -07:00
Clément Brisset
19ccee5d3c Merge pull request #7490 from birarda/udt-fixes 
cleanup unused public keys in ice-server
 2016-03-28 13:48:45 -07:00
Stephen Birarda
1df7cf5c8d Merge pull request #7484 from Atlante45/fix/atp-req-limit 
Fix segfault with gxx
 2016-03-28 13:31:12 -07:00
Brad Hefta-Gaub
44b37c332a Merge pull request #7480 from jherico/webchannel_redux 
Webchannel redux
 2016-03-28 13:18:22 -07:00
Atlante45
659d7e7335 Fix segfault with gxx 2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2 Add Socket include to see debug macro 2016-03-28 13:11:44 -07:00
Zach Pomerantz
7bcef1d319 Fallback display to last, then desktop 2016-03-28 12:54:38 -07:00
Zach Pomerantz
c348c82307 Merge branch 'master' of github.com:zzmp/hifi into feat/geocaching 2016-03-28 12:28:55 -07:00
Zach Pomerantz
34a77b47a3 Restore SDL2 comments 2016-03-28 12:25:56 -07:00
Zach Pomerantz
b94e244844 Update oculus legacy plugin 2016-03-28 12:24:31 -07:00
Brad Hefta-Gaub
b26533bc14 Merge pull request #7481 from samcake/lemon 
Monitoring Tool for rendering engine
 2016-03-28 12:20:07 -07:00
Zach Pomerantz
37a725b06d Fallback to desktop if display plugin fails 2016-03-28 12:12:52 -07:00
Zach Pomerantz
931cad34d1 Check plugin activation success 2016-03-28 12:05:58 -07:00
samcake
aa085f6955 Putting members of the ENgineStats class NOT public so they can keep their name proudly 2016-03-28 11:52:31 -07:00
samcake
b5028acde1 CLeaning up the location of the global variables, moved them to the gpu::COntext class as static 2016-03-28 11:45:07 -07:00
Brad Hefta-Gaub
3ca02c847d Merge pull request #7489 from zzmp/fix/catch-qml-gl 
Catch and report GL errors in QML render
 2016-03-28 11:23:19 -07:00
Zach Pomerantz
776893a5ab Improve logging for oculus errors 2016-03-28 11:22:56 -07:00
Stephen Birarda
c0b92486f9 fix incorrect next packet delta 2016-03-28 11:09:32 -07:00
Stephen Birarda
869529a435 register RSA_free directly as custom deleter 2016-03-28 10:51:47 -07:00
Stephen Birarda
cffeece08e use time since last packet as short-term status check 2016-03-28 10:51:15 -07:00
Brad Davis
5343dfef24 PR feedback on 7480 2016-03-28 10:19:38 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Stephen Birarda
3e4b4a0fc7 cleanup un-used public keys in ice-server 2016-03-28 10:03:05 -07:00
samcake
7402dafc91 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-28 09:13:00 -07:00
David Rowe
9c953aa491 Style miscellaneous number fields 2016-03-28 14:49:24 +13:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
David Rowe
11ae07a91d Style header type and ID values 2016-03-28 12:43:40 +13:00
Zach Pomerantz
d6640ac520 Update Model::_hasTransparentTextures 2016-03-27 16:38:45 -07:00
David Rowe
2ebde880af Style pitch, yaw, roll fields 2016-03-28 12:10:32 +13:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00