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

35561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Cake
a018c51945 Drawing background first in the Lighting buffer then lighting passes with stencil test 2015-12-06 23:51:29 -08:00
Sam Cake
dc4b6909bc Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-06 18:58:11 -08:00
samcake
fae1bd98c8 Merge pull request #6569 from Atlante45/graphics 
Alpha/Roughness G-Buffer debugging
 2015-12-06 18:56:38 -08:00
Clément Brisset
c9813e0143 Merge pull request #6574 from samcake/graphicsMaster 
Merging upstream master to upstream Graphics
 2015-12-06 13:45:53 -08:00
samcake
d2081dc6bb Merge branch 'hdr' of https://github.com/samcake/hifi into hdr 2015-12-06 10:53:57 -08:00
samcake
10fe6de9a9 Merge branch 'graphics' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-06 10:49:08 -08:00
samcake
8e26094293 Merge branch 'graphicsMaster' of https://github.com/samcake/hifi into graphicsMaster 2015-12-06 10:48:21 -08:00
Brad Hefta-Gaub
549059dd97 Merge pull request #6571 from imgntn/earthquakes_live 
Earthquakes Live 1.0: Visualization of USGS Earthquake Data for Past Day
 2015-12-05 19:09:05 -08:00
James B. Pollack
378b71d701 dont spin by default 2015-12-05 17:51:55 -08:00
James B. Pollack
7859241ad3 spin the earth for fun 2015-12-05 17:43:13 -08:00
James B. Pollack
906540272e disable collisions for now because of shapetype 2015-12-05 17:39:43 -08:00
James B. Pollack
30b32765b9 make earth grabbable to show parenting 2015-12-05 17:32:02 -08:00
James B. Pollack
ade32cbf61 remove collisions and add parenting 2015-12-05 17:30:38 -08:00
James B. Pollack
a899fe0e1b fix typo 2015-12-05 17:26:11 -08:00
James B. Pollack
945b5bd00f cleanup 2015-12-05 17:11:27 -08:00
James B. Pollack
d518def974 poll by default 2015-12-05 17:01:54 -08:00
James B. Pollack
7fc3d0f34e header 2015-12-05 16:58:50 -08:00
James B. Pollack
4a5b9bd523 start position 2015-12-05 16:57:09 -08:00
James B. Pollack
4999b34327 cleanup interval 2015-12-05 16:54:55 -08:00
James B. Pollack
f33f4cbcae cleanup 2015-12-05 16:22:17 -08:00
James B. Pollack
1f2d726211 awesome stuff 2015-12-05 16:16:58 -08:00
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
Atlante45
0603ead972 Have panels collapsed by default 2015-12-04 21:01:53 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
Atlante45
41af377878 More g-buffer debugging options 2015-12-04 21:01:53 -08:00
samcake
dfd26bebae Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-04 17:53:37 -08:00
samcake
1a404bb3bf Merge pull request #6568 from Atlante45/graphics 
More live g-buffer debug work
 2015-12-04 17:53:31 -08:00
samcake
b28e3d0045 Merging MAster and Graphics 2015-12-04 17:51:30 -08:00
Atlante45
b45b1cc513 More work on live g-buffer debug 2015-12-04 17:43:00 -08:00
Clément Brisset
2ace061893 Merge pull request #6564 from sethalves/fix-line-overlays 
fix 3d line overlays
 2015-12-04 17:38:15 -08:00
Atlante45
5bfcd4ed91 Fix scripted checkbox 2015-12-04 17:30:45 -08:00
Clément Brisset
d09ee41610 Merge pull request #6567 from samcake/graphicsMaster 
Graphics master merging
 2015-12-04 17:30:16 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
Clément Brisset
3c83f1be8b Merge pull request #6566 from sethalves/fix-avatar-mixer-parents-crash 
fix avatar-mixer parents-related crash
 2015-12-04 17:03:15 -08:00
samcake
cfd7373585 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-04 16:52:50 -08:00
samcake
ef7ddce2b6 Trying to fix the problem of the background not showing correctly 2015-12-04 16:52:14 -08:00
Seth Alves
7448d9f262 Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters 
Make Avatar::getJointRotation and getJointTranslation thread-safe
 2015-12-04 16:45:56 -08:00
Seth Alves
62b4eac875 fix avatar-mixer parents-related crash 2015-12-04 16:41:56 -08:00
Anthony J. Thibault
7abfc93ff9 Avatar::getJointRotation and getJointTranslation is thread-safe 
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
 2015-12-04 16:16:17 -08:00
Seth Alves
817f0307a0 fix 3d line overlays 2015-12-04 15:51:19 -08:00
Brad Hefta-Gaub
5bbff7534d Merge pull request #6560 from birarda/log-handler-crash 
don't stop a non-started timer, debug cleanup
 2015-12-04 15:46:51 -08:00
Brad Hefta-Gaub
2c2813e06e Merge pull request #6563 from howard-stearns/fix-present-rate 
Fix present rate stats display
 2015-12-04 15:27:45 -08:00
Anthony J. Thibault
ba001ef4b0 Rig: split Poses into internal and external sets. 
In preparation for making some accessors thread safe.
 2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c Fix present rate stats display, which was counting (roughly) twice for 2D 
display, and flickering.
 2015-12-04 15:10:46 -08:00
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
Stephen Birarda
ad4f818b21 only attempt to stop QTimer if active 2015-12-04 14:12:41 -08:00
Stephen Birarda
d2fdf6a04b Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash 2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Ryan Downe Karpf
950d020d77 Merge pull request #6553 from ericrius1/noBlockCollisions 
Blocks dont collide when held
 2015-12-04 11:59:39 -08:00