Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:51:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26878 commits 75 branches 59 tags 1.2 GiB
Commit graph

9750 commits

Author SHA1 Message Date
Ryan Huffman
690e2e38f2 Move circle3d and text overlays to batches 2015-06-19 09:45:13 -07:00
Seth Alves
c9a7136d51 Merge pull request #5162 from PhilipRosedale/smoother 
Smoother motion for physical objects as viewed by remote observer
 2015-06-18 16:30:34 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Andrew Meadows
d88d9b2b88 Merge pull request #5141 from sethalves/overloaded-virtual 
use -Woverloaded-virtual with g++.  quiet compiler warnings
 2015-06-18 14:58:47 -07:00
Philip Rosedale
61a2196a30 Reduce error tolerances for ballistic prediction that trigger updating the server 2015-06-18 13:21:37 -07:00
Brad Hefta-Gaub
b008b810e1 Merge pull request #5145 from Atlante45/text 
Bring back display names
 2015-06-18 11:25:45 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
ZappoMan
383a2c3d63 another attempt 2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc first cut and removing openGl dependency in shared 2015-06-18 09:30:34 -07:00
Atlante45
26e8c490c3 constexpr not handled on windows 2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7 Make array size a constexpr 2015-06-18 15:23:53 +02:00
Atlante45
30fbd37645 Transmit normal to text rendering shader 2015-06-18 15:23:52 +02:00
Atlante45
1cab853f18 Better guard Transform scale 2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f Reorder triangle strip 2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Atlante45
254f05072f Fix inverted if 2015-06-18 15:23:49 +02:00
Atlante45
70a020c7e3 BevelRect use triangle strips 2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
Atlante45
ca98b378df Adjust sdf frag shader alpha correctly 2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32 Fix bevel quads 2015-06-18 15:22:48 +02:00
Atlante45
e8e1f81880 Make Batch copy constructor explicit 2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57 Add _glUniform1i to Batches 2015-06-18 15:22:48 +02:00
Seth Alves
eb89835d42 Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling 2015-06-17 18:35:00 -07:00
Seth Alves
610bfc63e8 check success in OctreePacketData::appendValue for qvectors of vec3s before proceeding with further data appends 2015-06-17 18:34:46 -07:00
Seth Alves
8735fa1eac have variantMapToScriptValue handle lists. 2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub
4501fb1d61 Merge pull request #5073 from jherico/ovr6 
Support Oculus SDK version 0.6 on windows only
 2015-06-17 18:17:34 -07:00
Brad Hefta-Gaub
d1777e0231 Merge pull request #5153 from jherico/fix-gl-matrix 
Preserve the GL matrix stack when running batch commands
 2015-06-17 17:14:25 -07:00
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
Brad Hefta-Gaub
d4f4580a7c Merge pull request #5152 from sethalves/fix-build 
fix debug build
 2015-06-17 16:27:58 -07:00
Brad Davis
2ab3f42c6a Merge pull request #5124 from venkatn93/master 
New address bar with forward and back buttons
 2015-06-17 15:33:10 -07:00
Seth Alves
68df6b662d fix ifdefs around asserts 2015-06-17 15:03:09 -07:00
Bradley Austin Davis
a27e06713b Preserve the GL matrix stack when running batch commands 2015-06-17 14:57:14 -07:00
Seth Alves
44bb220130 fix debug build 2015-06-17 14:54:13 -07:00
Seth Alves
9a51a4c5b1 fix debug build 2015-06-17 14:48:37 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
ZappoMan
f2ba91383c fix some warnings 2015-06-17 14:26:36 -07:00
Seth Alves
59389ce506 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-17 14:18:47 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Niraj Venkat
9b9aba48f0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
Philip Rosedale
196a1546ab Merge pull request #5135 from howard-stearns/not-clipped-local-sounds 
Don't clip local audio sounds
 2015-06-17 13:37:56 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Howard Stearns
b4dfaba55e Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Philip Rosedale
8b8f0bcbde Merge pull request #5132 from sethalves/polyvox 
Polyvox fixes
 2015-06-17 10:49:35 -07:00
Clément Brisset
d67d350e72 Merge pull request #5143 from ZappoMan/atmosphereBatchFix 
Change atmospheres to render using batch compatible pipeline and shaders
 2015-06-17 19:48:11 +02:00
Clément Brisset
42a5ddd116 Merge pull request #5144 from birarda/master 
make goToUser public again
 2015-06-17 19:27:29 +02:00