Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 03:38:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35912 commits 76 branches 59 tags 1.2 GiB
Commit graph

35912 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
ede375a889 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-08 12:28:16 -08:00
samcake
61fb3c1c66 Merge pull request #6589 from samcake/graphicsMaster 
Graphics: upstream master merged into upstream graphics
 2015-12-08 12:27:20 -08:00
samcake
83279489f3 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-08 09:46:29 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
samcake
d12fdb9726 Merge pull request #6584 from birarda/pref-no-auto 
fix for avatar URL text editing, assert in Model.cpp
 2015-12-07 18:11:49 -08:00
Brad Hefta-Gaub
4cbbd252d5 Merge pull request #6587 from jherico/rigel 
Fix crashes on exit due to poor cleanup
 2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c Fix crashes on exit due to poor cleanup 2015-12-07 17:50:08 -08:00
Seth Alves
742288c583 Merge pull request #6586 from Atlante45/master 
Fix grab behavior
 2015-12-07 17:47:47 -08:00
James B. Pollack
6cf1ad464f Merge pull request #6583 from birarda/extension-ci 
use a case insensitive check for extensions in Application
 2015-12-07 17:33:03 -08:00
Atlante45
fc77d6cd40 Fix grab behavior 2015-12-07 17:08:36 -08:00
Leonardo Murillo
5d789095b5 Merge pull request #6570 from ctrlaltdavid/20740 
Update Leap Motion script to use animation state handlers
 2015-12-07 16:37:42 -08:00
Stephen Birarda
6dbff93bbd fix assert on model URL change from _renderItemsSet 2015-12-07 16:24:26 -08:00
Stephen Birarda
4a0c6eebd8 change avatar URL when typing completed or accepted 2015-12-07 16:17:59 -08:00
Stephen Birarda
7beaf5e235 force asset upload to use a lowercase extension 2015-12-07 15:18:32 -08:00
Stephen Birarda
0fee004bdd use case insensitive check for extensions 2015-12-07 15:13:14 -08:00
Brad Davis
353fe774ca Merge pull request #6572 from howard-stearns/fix-render-rate 
Fix render rate.
 2015-12-07 14:12:54 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
samcake
9ddc3c27bf compilation errors fixed 2015-12-07 13:25:55 -08:00
samcake
5d207d0c9c INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect 2015-12-07 13:19:43 -08:00
Clément Brisset
0be35ec6ea Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix 
MyAvatar.clearJointData bug fix
 2015-12-07 12:18:28 -08:00
Howard Stearns
72ce46af59 Mac-only. 2015-12-07 11:46:36 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -08:00
Howard Stearns
8666cdd689 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate 2015-12-07 11:27:30 -08:00
Clément Brisset
390836b64e Merge pull request #6431 from huffman/proto-received-message 
Combine Packet and PacketList into ReceivedMessage on receiving end
 2015-12-07 09:58:52 -08:00
samcake
c55c1e0d7f Merge pull request #6579 from samcake/graphicsMaster 
Graphics: upstream master merging into upstream graphics
 2015-12-07 09:51:05 -08:00
Brad Hefta-Gaub
3240c1dbfe Merge pull request #6577 from Atlante45/master 
Fix UNIX warnings
 2015-12-07 09:50:00 -08:00
samcake
9f4fd3b684 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-07 09:49:00 -08:00
Ryan Huffman
dd6c8cbe33 Remove verbose piggyback logging 2015-12-07 09:42:04 -08:00
Atlante45
cdf621e8d0 Remove unnecessary moveToThread to remove warning 2015-12-07 09:11:41 -08:00
Anthony J. Thibault
fd4ed29405 MyAvatar.clearJointData bug fix 
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
 2015-12-07 09:03:40 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Ryan Huffman
c2049e5308 Fix udt-test to work with ReceivedMessage updates 2015-12-07 08:52:23 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00
Atlante45
18198cb6fb Fix missing override 2015-12-07 08:36:49 -08:00
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click 
No more right-click-move editing in edit.js
 2015-12-07 08:29:01 -08:00
Clément Brisset
4cf0f091af Merge pull request #6576 from samcake/hdr 
Graphics: Fix the broken background rendering
 2015-12-07 08:11:50 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
Sam Cake
7e59d5cc04 Fixing the failing test for shader compilations (because we removed the shadowing shaders) 2015-12-07 01:27:50 -08:00
Sam Cake
3595d0d719 less commented stuff 2015-12-07 01:15:10 -08:00
Sam Cake
01d48b29aa cleaning code and removing cruft 2015-12-07 01:03:14 -08:00
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