Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 03:57:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26565 commits 25 branches 0 tags 1.1 GiB
Commit graph

26565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -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
Brad Davis
ac0fc5d974 Working on oculus overlay code 2015-06-11 00:57:58 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Brad Hefta-Gaub
5ba9880602 Merge pull request #5100 from AndrewMeadows/inertia 
reset simulation bid counters whenever an object is activated
 2015-06-10 17:27:46 -07:00
Brad Hefta-Gaub
c36912ae27 Merge pull request #5098 from jherico/mac_cursor_fix 
Fix doubled cursor on OSX
 2015-06-10 17:24:40 -07:00
ZappoMan
139855f487 handle remove attachment case 2015-06-10 16:13:17 -07:00
Brad Hefta-Gaub
409e099638 Merge pull request #5099 from venkatn93/master 
Sanitizing entityProperties.html
 2015-06-10 15:57:59 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Brad Davis
c77c41405d Merge remote-tracking branch 'sam/yellow' into render_cursor 2015-06-10 15:30:27 -07:00
Brad Davis
ad265b4bbb Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-10 15:29:37 -07:00
Andrew Meadows
2f32d358c3 merge 2015-06-10 15:27:08 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Brad Davis
296d2511e4 Merge pull request #5094 from venkatn93/master 
Hyperlink property group and hyperlink UI added
 2015-06-10 14:58:10 -07:00
Andrew Meadows
6497ac6c82 renderBoundingBox() for sim-ownership debug 2015-06-10 14:24:00 -07:00
Bradley Austin Davis
1dfc9c89eb Fix doubled cursor on OSX 2015-06-10 13:57:48 -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
Sam Gateau
780547b6c7 Merge branch 'render_cursor' of https://github.com/jherico/hifi into yellow 2015-06-10 11:35:55 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Brad Davis
7374fb84e8 Working on fixing overlays with team-teaching merge 2015-06-10 09:36:14 -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
Brad Davis
5e279367b7 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-10 08:57:45 -07: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
Brad Hefta-Gaub
ef58aa527e Merge pull request #5093 from Atlante45/debug 
Fix ghost avatars/displaynames
 2015-06-10 08:44:18 -07:00
Brad Davis
94c414e4e8 Add unit quad, commonly used in compositing the overlays 2015-06-10 08:12:58 -07:00
Clément Brisset
062dd95753 Merge pull request #5092 from samcake/daft 
TEAM TEACHING : Fixing blackout when stepping into a skybox & Material class refinments
 2015-06-10 15:13:10 +02:00
Atlante45
8570fe0c19 Shared ptr tweaks 2015-06-10 15:02:26 +02:00
Atlante45
3af8bec3d7 Fix ghost avatars/displaynames 2015-06-10 14:59:27 +02: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
ZappoMan
dbae2c34ba Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-09 21:55:25 -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
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 15:51:45 -07:00
ZappoMan
2c6ebcb06a remove a bunch of cruft from Model 2015-06-09 12:57:14 -07:00
ZappoMan
e0adb8e38a render avatar attachments as model payload items 2015-06-09 12:57:04 -07:00
David Rowe
a4885ff38c Close directory window after domain change 2015-06-09 12:33:30 -07:00
David Rowe
01b1e9c4ed Signal domain changes for those handled by ICE as well as not 2015-06-09 12:33: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