Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 22:59:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26570 commits 26 branches 28 tags 1.2 GiB
Commit graph

9563 commits

Author SHA1 Message Date
ZappoMan
c17ae593f0 CR feedback 2015-06-12 09:04:16 -07:00
ZappoMan
2fc0233096 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:49:19 -07:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk 
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
 2015-06-11 10:17:38 -07:00
Brad Hefta-Gaub
684e93cf42 Merge pull request #5105 from Atlante45/debug 
Fix zones wireframe rendering
 2015-06-11 10:17:28 -07:00
ZappoMan
a878559e0c fix transforms for items with non-default registration point 2015-06-11 09:38:45 -07:00
ZappoMan
47888b4671 fix transforms for items with non-default registration point 2015-06-11 09:34:56 -07:00
Atlante45
f4f5f16758 Fix zones wireframe rendering 2015-06-11 18:34:39 +02:00
ZappoMan
55ede2b398 Merge branch 'master' of https://github.com/highfidelity/hifi into bugfix 2015-06-11 09:10:05 -07:00
Andrew Meadows
7d0000c537 fix warning about returning ref to temp variable 2015-06-11 08:38:03 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Clément Brisset
d448a3be7f Merge pull request #5101 from ZappoMan/fix-attachments 
Get avatar attachments rendering again
 2015-06-11 10:35:49 +02:00
ZappoMan
93c0bd63e9 fix debug rendering transforms 2015-06-10 18:54:07 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Andrew Meadows
2f32d358c3 merge 2015-06-10 15:27:08 -07:00
Andrew Meadows
6497ac6c82 renderBoundingBox() for sim-ownership debug 2015-06-10 14:24:00 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Andrew Meadows
0e12cdc39e woops, forgot to include this in last commit 2015-06-10 12:41:15 -07:00
Andrew Meadows
8d41960cc3 reset simulation bid counters on object activation 2015-06-10 12:40:14 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Clément Brisset
059b29da83 Merge pull request #5090 from ericrius1/lineClamping 
clamping line points between 0 and TREE_SCALE
 2015-06-10 18:04:10 +02:00
ZappoMan
aa05d9f67c Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
Clément Brisset
73fce52407 Merge pull request #5091 from birarda/master 
store an in-memory history of the last addresses
 2015-06-10 17:52:39 +02:00
Eric Levin
286b7bf573 changed comment to use TREE_SCALE instead of 16000 2015-06-10 08:48:26 -07:00
Sam Gateau
2785f1a0e2 Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox 2015-06-10 01:50:52 -07:00
Sam Gateau
dd84bf010b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-10 00:32:22 -07:00
Sam Gateau
470e24820d Back to clean state, just added the Material Key 2015-06-10 00:31:36 -07:00
Stephen Birarda
8b67710022 store an in-memory history of the last addresses 2015-06-09 18:59:58 -07:00
Eric Levin
f51b1d2ac2 clamping line points between 0 and TREE_SCALE 2015-06-09 17:30:15 -07:00
Andrew Meadows
4df87ec4e8 fix rendering of simulation ownership debug info 2015-06-09 17:23:37 -07:00
ZappoMan
2c6ebcb06a remove a bunch of cruft from Model 2015-06-09 12:57:14 -07:00
ZappoMan
ba0cecb356 remove attachments from Model - only supported at avatar layer 2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
Niraj Venkat
a577d7955c Removed classes and the "hyperlink entity" 2015-06-09 11:27:57 -07:00
Niraj Venkat
2bb1bf8afe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 10:33:39 -07:00
Niraj Venkat
1bf0b15bb0 Removing unnecessary files 2015-06-09 10:33:05 -07:00
Niraj Venkat
0004b1a81c Reversing previous entity work and creation of property group 2015-06-09 10:32:25 -07:00
Brad Hefta-Gaub
759a4a323b Merge pull request #5087 from Atlante45/debug 
Reduce debug on domain connection
 2015-06-09 07:54:21 -07:00
Atlante45
bf56ee49a6 Print new URL only when it actually changes 2015-06-09 16:37:48 +02:00
Atlante45
90c9a82aeb Remove unnecesary debug 2015-06-09 15:27:08 +02:00
Atlante45
303026d86b Reduce qDebug calls 2015-06-09 15:26:41 +02:00
Seth Alves
fb7a0e7219 back out previous change, fix error where translucent is used instead of translucentMesh 2015-06-08 22:41:59 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Brad Davis
90c18d0c48 Merge pull request #5080 from ZappoMan/team-teaching 
Merge TEAM-TEACHING into MASTER
 2015-06-08 17:34:42 -07:00
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -07:00
Howard Stearns
8e41c58fad Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound 2015-06-08 15:45:30 -07:00
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -07:00
Howard Stearns
564b0b48ef Alternate version that uses signal rather than polling. 2015-06-08 14:29:43 -07:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
Niraj Venkat
cd93128236 [ERRORS] Starting on hyperlink entity and properties 2015-06-08 13:29:54 -07:00