Brad Davis
|
1846ead27c
|
Merge branch 'master' into vs2015
|
2015-06-10 10:11:58 -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 |
|
Brad Hefta-Gaub
|
ef58aa527e
|
Merge pull request #5093 from Atlante45/debug
Fix ghost avatars/displaynames
|
2015-06-10 08:44:18 -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 |
|
Stephen Birarda
|
8b67710022
|
store an in-memory history of the last addresses
|
2015-06-09 18:59:58 -07:00 |
|
Stephen Birarda
|
091ed5b514
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-09 15:51:45 -07:00 |
|
Sam Gateau
|
7de4c2eff7
|
first take on the materialKey
|
2015-06-09 12:17:10 -07:00 |
|
Brad Hefta-Gaub
|
fb4e5a70bd
|
Merge pull request #5077 from jherico/render_cursor
Always use GL rendered cursor & fix broken cursor after merge
|
2015-06-09 12:09:24 -07:00 |
|
Brad Davis
|
78ab6a03af
|
Fixing broken cursor rendering from team-teaching merge
|
2015-06-09 11:47:19 -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 |
|
Clément Brisset
|
6d34bff372
|
Merge pull request #5086 from sethalves/quiet-compiler
quiet compiler, fix some whitespace
|
2015-06-09 15:42:54 +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 |
|
Brad Hefta-Gaub
|
3fb5e47dcc
|
Merge pull request #5064 from ericrius1/paint
bumped max line points to 80
|
2015-06-08 21:20:58 -07:00 |
|
Seth Alves
|
983ae5b2f0
|
quiet compiler, fix some whitespace
|
2015-06-08 21:19:37 -07:00 |
|
Brad Davis
|
c360dde71a
|
Merge branch 'master' into render_cursor
Conflicts:
interface/src/Application.cpp
|
2015-06-08 20:18:32 -07:00 |
|
Seth Alves
|
f491a7a786
|
Merge pull request #5084 from AndrewMeadows/inertia
rewrite grab.js to follow mouse
|
2015-06-08 17:35:03 -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 |
|
Andrew Meadows
|
b682a07714
|
merge upstream/master into andrew/inertia
Conflicts:
examples/grab.js
|
2015-06-08 17:28:14 -07:00 |
|
Andrew Meadows
|
ef1e3aae00
|
faster move and max solid angle for distant grabs
|
2015-06-08 16:59:33 -07:00 |
|
Stephen Birarda
|
c73ccba427
|
Merge pull request #5074 from howard-stearns/restartable-non-local-sound
Fix AudioInjector::restart() for the non-local case.
|
2015-06-08 19:55:17 -04:00 |
|
Andrew Meadows
|
ffeac220f9
|
fix typo in variable name
|
2015-06-08 16:40:50 -07:00 |
|
Howard Stearns
|
d02fac3db3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound
|
2015-06-08 16:01:54 -07:00 |
|
Philip Rosedale
|
016b9c2ab9
|
Merge pull request #5081 from ericrius1/dynamicLandscape
added meditative ocean landscape and common utilities file
|
2015-06-08 15:47:13 -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 |
|
Andrew Meadows
|
e70cd9edd9
|
remove unused variable
|
2015-06-08 15:11:42 -07:00 |
|
ZappoMan
|
1dca379e1a
|
dead code removal machine
|
2015-06-08 15:06:44 -07:00 |
|
Andrew Meadows
|
4647f84638
|
rewrite grab.js to follow mouse
|
2015-06-08 14:58:42 -07:00 |
|
ZappoMan
|
b50b7dd500
|
CR feedback
|
2015-06-08 14:36:31 -07:00 |
|
ZappoMan
|
8fa31ec521
|
dead code removal machine
|
2015-06-08 14:30:31 -07:00 |
|
Howard Stearns
|
564b0b48ef
|
Alternate version that uses signal rather than polling.
|
2015-06-08 14:29:43 -07:00 |
|
Eric Levin
|
6d59518149
|
added meditative ocean landscape and common utilities file
|
2015-06-08 14:02:38 -07:00 |
|
ZappoMan
|
24c8e7d0e6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-08 13:50:50 -07:00 |
|
samcake
|
ad2b9b32f4
|
Merge pull request #5079 from ZappoMan/team-teching-optimize
TEAM TEACHING: use emplace_back and pre-reserved sizes for vectors
|
2015-06-08 22:22:17 +02:00 |
|
Brad Hefta-Gaub
|
773e0b1d5b
|
Merge pull request #5078 from ZappoMan/team-teaching
TEAM TEACHING - merge from master
|
2015-06-08 12:48:23 -07:00 |
|
ZappoMan
|
26ef6af009
|
use emplace_back and pre-reserved sizes for vectors
|
2015-06-08 12:45:39 -07:00 |
|
Philip Rosedale
|
7c0e70b1d1
|
Merge pull request #5076 from birarda/master
play a local sound once first AM packet received
|
2015-06-08 12:31:30 -07:00 |
|
ZappoMan
|
5d6112d9c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-08 12:29:32 -07:00 |
|
Brad Hefta-Gaub
|
d83c3be2a8
|
Merge pull request #5071 from Atlante45/team-teaching
Team Teaching - Fix Avatar display names/billboards
|
2015-06-08 12:12:45 -07:00 |
|
Brad Davis
|
b3534210e4
|
Always use GL rendered cursor
|
2015-06-08 11:51:35 -07:00 |
|
Brad Hefta-Gaub
|
a1ba330e5b
|
Merge pull request #5075 from samcake/daft
TEAM TEACHING: Fixing the broken skinning
|
2015-06-08 11:43:37 -07:00 |
|
Stephen Birarda
|
4e755e304b
|
fix spacing in new JS file
|
2015-06-08 11:31:24 -07:00 |
|
Stephen Birarda
|
666830c04d
|
add a sound once first AM packet received
|
2015-06-08 11:30:12 -07:00 |
|