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

41353 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
Seth Alves
442339bbc3 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-29 09:39:50 -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
Seth Alves
4f65f26717 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-28 20:26:23 -07: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
Seth Alves
b273d5efd3 fix defaultScripts filename 2016-03-28 13:48:19 -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
Seth Alves
cefc5293b0 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-28 12:23:37 -07:00
Seth Alves
de8153bd75 on windows and osx use default scripts bundled with interface 2016-03-28 12:23:23 -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
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
Zach Pomerantz
d6640ac520 Update Model::_hasTransparentTextures 2016-03-27 16:38:45 -07:00
James B. Pollack
50cc632b9c Merge pull request #7424 from ericrius1/batonSoundEntityTest 
Add a test case for playing a short sound from an entity using virtual baton
 2016-03-27 10:49:59 -07:00
samcake
5a3896b1de FIxing warnigns 2016-03-27 09:35:13 -07:00
samcake
c182330b6e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-26 10:59:57 -07:00
Philip Rosedale
473b7ff6d7 Merge pull request #7486 from ZappoMan/reduceFalsePositiveDeadlocks 
one more crack at fixing false deadlock
 2016-03-25 20:15:39 -07:00
James B. Pollack
e261519b11 Update utils.js 
remove extra letter that would be crashing things
 2016-03-25 19:29:18 -07:00
Brad Hefta-Gaub
f7e6f60e87 one more crack at fixing false deadlock 2016-03-25 19:04:01 -07:00
samcake
c96d5b093c Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 18:42:00 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
Brad Hefta-Gaub
bb42d84bbd Merge pull request #7479 from sethalves/fix-logging-crash 
fix locking in GenericQueueThread::process
 2016-03-25 17:56:10 -07:00