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

41306 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
b26533bc14 Merge pull request #7481 from samcake/lemon 
Monitoring Tool for rendering engine
 2016-03-28 12:20:07 -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
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
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
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
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
samcake
5190878db2 removing a debug trick 2016-03-25 16:18:04 -07:00
Seth Alves
1532800a4e Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash 2016-03-25 16:17:58 -07:00
Philip Rosedale
44c6f81c0f Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks 
make the deadlock watchdog more generous
 2016-03-25 16:10:37 -07:00
Philip Rosedale
dfb09f134a Merge pull request #7476 from ZappoMan/bugFixes 
fix a couple of model bugs
 2016-03-25 15:58:52 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
Zach Pomerantz
9f8848e833 Log on first login 2016-03-25 15:07:14 -07:00
Brad Hefta-Gaub
fe31be71eb protect against unexpected rollover 2016-03-25 14:59:43 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Clément Brisset
82f22b42e1 Merge pull request #7465 from sethalves/redo-polyvox-locking 
Redo polyvox locking
 2016-03-25 14:35:27 -07:00
Zach Pomerantz
1405daa4ee Add guards when checking vsync 2016-03-25 14:18:12 -07:00
Seth Alves
f3ba16ab3e fix locking around polyvox state flags 2016-03-25 14:06:57 -07:00
Ryan Huffman
306425b940 Merge pull request #7475 from birarda/udt-fixes 
guard long sleeps in udt::SendQueue
 2016-03-25 13:56:45 -07:00
Seth Alves
d97ab1e2fc Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-25 13:53:01 -07:00
Stephen Birarda
d9abc79b5d return for AccountManager sendRequest if threads do not match 2016-03-25 13:37:13 -07:00
Alan Z
cffbc2e1a4 Merge pull request #7478 from birarda/new-icons 
replace interface/server-console icons with new set from Alan
 2016-03-25 13:17:58 -07:00
Stephen Birarda
044fb983d7 cast chrono durations to qint64 2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90 add warning for long sendqueue sleeps 2016-03-25 13:06:21 -07:00
Brad Hefta-Gaub
541c1e5c6f Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks 2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7 add some extra debugging at deadlock detection to explain unreasonable numbers 2016-03-25 12:17:24 -07:00
Philip Rosedale
4893d1f09e Merge pull request #7474 from zzmp/fix/drop-network-data 
Drop network data after processing
 2016-03-25 11:43:58 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Stephen Birarda
bb95aec528 replace the interface icons 2016-03-25 11:42:48 -07:00
Stephen Birarda
74e041e9aa cast chrono durations to int explicitly 2016-03-25 11:41:41 -07:00
Stephen Birarda
42e297b458 replace the console beta/PR icons 2016-03-25 11:41:10 -07:00
Stephen Birarda
f0da39be22 replace the console icon with new icons 2016-03-25 11:40:13 -07:00
Seth Alves
13eddef312 fix locking in GenericQueueThread::process 2016-03-25 11:37:04 -07:00
Philip Rosedale
e891fd219b Merge pull request #7472 from AndrewMeadows/delete-mortal-entities 
expire mortal entities correctly
 2016-03-25 11:33:07 -07:00