Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 16:23:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26717 commits 25 branches 0 tags 1.1 GiB
Commit graph

26717 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
b3bc9c3ef0 first attempt at getting spring-action to handle rotation 2015-06-08 17:10:13 -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
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -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
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -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
Seth Alves
1e858d8bc5 start on spring action 2015-06-08 14:16:03 -07:00
Eric Levin
6d59518149 added meditative ocean landscape and common utilities file 2015-06-08 14:02:38 -07:00
Leonardo Murillo
bd16072053 Conflict fixing 2015-06-08 15:00:06 -06:00
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06: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
Leonardo Murillo
edce36f5a1 Checkpoint - buttons in place 2015-06-08 14:29:10 -06: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
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06: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
David Rowe
f51feca37d Add directory button 2015-06-08 11:29:35 -07:00
Sam Gateau
87536b2f9d Fixing the skinning issue 2015-06-08 11:22:16 -07:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Howard Stearns
6668de56cd Fix AudioInjector::restart() for the non-local case. 2015-06-08 10:34:56 -07:00
Atlante45
c8c372bf3a Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 19:27:49 +02:00
Brad Hefta-Gaub
06c49c9dcf Merge pull request #5072 from samcake/daft 
FIxing merge on moday morning
 2015-06-08 10:21:25 -07:00
Atlante45
36dfec7827 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 19:20:33 +02:00
samcake
d9b7a42f60 FIxing merge 2015-06-08 19:06:04 +02:00
Atlante45
141d8fa055 Use setUniformTexture 2015-06-08 18:55:13 +02:00
Brad Hefta-Gaub
ec55aa74ff Merge pull request #5069 from samcake/daft 
TEAM TEACHING : Improving the transparent rendering
 2015-06-08 09:48:32 -07:00
samcake
cc55056eef Merge pull request #5070 from ZappoMan/team-teaching-drawperf 
TEAM TEACHING - cache the Item bounds across sub tasks
 2015-06-08 18:42:34 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
ZappoMan
84c37bd301 cache bounds with item ids in DrawTask 2015-06-08 09:05:16 -07:00
ZappoMan
46a8b831fc cache bounds with item ids in DrawTask 2015-06-08 09:01:12 -07:00
Atlante45
31e565868d Bind simple textured program 2015-06-08 17:15:50 +02:00