Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 18:34:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28896 commits 76 branches 59 tags 1.2 GiB
Commit graph

28896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick 
Fix JS calls to computePickRay() when mini-mirror is showing
 2015-07-24 11:46:07 -04:00
Andrew Meadows
c6b2644539 Merge pull request #5418 from sethalves/hull-tool-fatten-ignore-walls 
hull creation tool ignores walls in fatten-mesh mode
 2015-07-24 08:37:47 -07:00
Seth Alves
bd1a661d01 Merge pull request #5416 from ctrlaltdavid/webwindow-title 
Add ability to update title of WebWindow after it's created
 2015-07-24 08:27:54 -07:00
Philip Rosedale
f04291ef65 Merge pull request #5408 from thoys/20626 
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
 2015-07-24 07:47:30 -07:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium 
decouple FPS from rotation rate during mouse drag
 2015-07-24 07:44:22 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
Brad Hefta-Gaub
2e83378c23 Merge pull request #5411 from birarda/master 
don't allow sending of billboards > MTU size
 2015-07-23 18:40:30 -07:00
samcake
8421aafe33 try to fix the scaling issues on mac 2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6 bring back delayed queue of Application events 2015-07-23 18:00:35 -07:00
Philip Rosedale
a1544956e3 Merge pull request #5348 from ctrlaltdavid/20602 
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
 2015-07-23 17:42:24 -07:00
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Stephen Birarda
974108734a add a comment for size guard 2015-07-23 17:17:59 -07:00
Stephen Birarda
f919d2985b don't attempt to send the avatar billboard if too large 2015-07-23 17:17:15 -07:00
Stephen Birarda
dd8d75b38f Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-07-23 17:14:50 -07:00
Stephen Birarda
839001dd8c Merge branch 'protocol' of github.com:birarda/hifi into protocol 2015-07-23 17:14:14 -07:00
Stephen Birarda
407c9d2571 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-23 17:13:53 -07:00
Stephen Birarda
d938f31fab fix for write of sourceID and verificationHash 2015-07-23 17:10:40 -07:00
Stephen Birarda
b68c7fd92a first adjustment in NLPacket after type is known 2015-07-23 16:59:08 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Stephen Birarda
069dff0793 fix bugs from movement of type/version to NLPacket 2015-07-23 16:40:35 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Brad Davis
2ac6304752 Merge pull request #5404 from ZappoMan/renderBug 
Fix rendering of primitive objects on Windows
 2015-07-23 19:10:54 -04:00
Howard Stearns
e59304ae74 Merge pull request #5406 from huffman/variadic-print 
Update script print() to be variadic
 2015-07-23 18:03:37 -05:00
Stephen Birarda
2f03075750 repairs to type/version header write 2015-07-23 15:57:31 -07:00
ZappoMan
8007fba909 add type to shader include 2015-07-23 15:37:56 -07:00
Ryan Huffman
396bb613f8 Avoid creating a new variable in js print 2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459 Update script print() to be variadic 2015-07-23 15:30:54 -07:00
Stephen Birarda
862c788aec move payload adjustments to Packet 2015-07-23 15:27:32 -07:00
Seth Alves
849715953d Merge pull request #5405 from AndrewMeadows/bohrium 
fix for underdamped avatar rotation momentum
 2015-07-23 15:26:49 -07:00
Stephen Birarda
df47f1dd0b add a BasePacket class for headerless packets 2015-07-23 15:20:37 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Atlante45
9a51aef712 Added congestion control base classes 2015-07-23 15:02:34 -07:00
Atlante45
82545df266 Added msecTimestampNow as usecTimestampNow narrowing 2015-07-23 15:01:46 -07:00
Atlante45
c5901c3f6b Sequence Numbers helper class 2015-07-23 15:00:32 -07:00
ZappoMan
e6262de864 CR feedback 2015-07-23 14:56:52 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d fix for underdamped avatar rotation momentum 2015-07-23 14:49:15 -07:00
ZappoMan
1177ffd439 more hacking 2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4 remove gl_FrontMaterial 2015-07-23 14:11:28 -07:00
Stephen Birarda
e5955e39b7 fix QDebug signature for Node 2015-07-23 14:06:40 -07:00
Stephen Birarda
19d0bf403c change NLPacket create signature for new headers 2015-07-23 14:06:10 -07:00
ZappoMan
9496b6c024 more hacking 2015-07-23 13:56:59 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00