Commit graph

22218 commits

Author SHA1 Message Date
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Sam Gateau
e9360a77f2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-23 07:04:36 -08:00
Sam Gateau
ffaea07130 trying to ge the shadow to render correctly 2015-02-23 07:04:14 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Andrew Meadows
d650a092c2 Merge pull request #4321 from ctrlaltdavid/faceshift-readme
Update Faceshift readme.txt with Windows instructions
2015-02-20 18:02:35 -08:00
Andrew Meadows
d5733f3782 Merge pull request #4318 from PhilipRosedale/master
Billiard balls are now textured models
2015-02-20 17:59:33 -08:00
Sam Gateau
41b5b199a8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-20 15:23:00 -08:00
dev
05ae1b6fe6 fixing the mac osx code path for Transform 2015-02-20 15:20:34 -08:00
Sam Gateau
987562976a Fixing the remaining issue with the avatar rendering path 2015-02-20 14:46:36 -08:00
Brad Hefta-Gaub
70400f7f8c Merge pull request #4323 from huffman/notifciation-local-only-audio
Update notifications.js audio to be local-only
2015-02-20 14:29:20 -08:00
Ryan Huffman
cf0b13f869 Update notifications.js audio to be local-only 2015-02-20 14:22:59 -08:00
Sam Gateau
4e2d2bc188 Fixing the remaining issue with the avatar rendering path 2015-02-20 12:05:06 -08:00
David Rowe
3a95614ca4 Update Faceshift readme.txt with Windows instructions 2015-02-20 11:29:51 -08:00
Sam Gateau
ded78816b5 Fixing the remaining issue with the avatar rendering path 2015-02-20 11:26:08 -08:00
Brad Hefta-Gaub
5d6d9bb1d4 Merge pull request #4320 from huffman/fix-camera-move-on-mirror
Fix entity camera tool from taking over in mirror mode
2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551 Merge pull request #4317 from birarda/master
dynamically grab animation URL as model URL from model
2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00
Philip Rosedale
66d1eeb327 Add textured models as balls 2015-02-19 21:11:51 -08:00
Sam Gateau
d08142d37d replacing glTRansform by gpu/Transform features 2015-02-19 15:12:13 -08:00
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -08:00
Philip Rosedale
f3b37bba54 Merge branch 'master' of https://github.com/worklist/hifi 2015-02-19 12:04:43 -08:00
Grayson Stebbins
fd3bbb6553 Merge pull request #4316 from nbq/removeat
Fix TP text in welcome page
2015-02-19 11:58:22 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05:00
Jason Hawks
e66e098cd2 Merge branch 'master' of github.com:nbq/hifi 2015-02-19 14:38:50 -05:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
2015-02-19 10:27:27 -08:00
Sam Gateau
b27b599643 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-19 09:53:18 -08:00
Sam Gateau
7e04f8a491 Model almost working with Transform 2015-02-19 09:52:58 -08:00
Andrew Meadows
21405135f9 Merge pull request #4310 from talentraspel/20323
CR for Job #20323 - BUG: another crash on exit in interface
2015-02-19 09:52:23 -08:00
Clément Brisset
ac3b172dee Merge pull request #4312 from ctrlaltdavid/update-svg-url
Update SVG URL to Amazon S3
2015-02-19 04:36:16 -08:00
Andrew Meadows
e207dad009 Merge pull request #4314 from AndrewMeadows/inertia
fix EntityServer crash for zero view aspectRatio
2015-02-18 18:09:05 -08:00
Sam Gateau
b78106400e Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:52:41 -08:00
Stephen Birarda
24468a7936 Merge pull request #4315 from birarda/master
use http link for gverb in case no git available
2015-02-18 16:18:04 -08:00
Stephen Birarda
5a3ef34d1e use http link for gverb in case no git available 2015-02-18 16:14:51 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Sam Gateau
11060ed273 trying to tackle the unenderstood transform value not going through corectly? 2015-02-18 16:00:37 -08:00
Andrew Meadows
cf9d92abc0 fix EntityServer crash for zero view aspectRatio 2015-02-18 15:48:12 -08:00
Philip Rosedale
f6f54809d0 Merge pull request #4291 from Atlante45/reverb_smoothing
Reverb smoothing
2015-02-18 15:34:14 -08:00
David Rowe
a947cda0b2 Update SVG URL to Amazon S3 2015-02-18 13:02:37 -08:00
Kai Ludwig
d659ac573a now all application timers should get stopped correctly on exit 2015-02-18 19:53:45 +01:00
Clément Brisset
906f7ecced Merge pull request #4306 from birarda/master
make sure the Agent has a SoundCache available
2015-02-18 10:05:22 -08:00
Stephen Birarda
758a552267 make sure the Agent has a SoundCache available 2015-02-18 09:59:33 -08:00
Clément Brisset
87f4ae2425 Merge pull request #4304 from thoys/20245
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
2015-02-18 09:55:34 -08:00
Thijs Wenker
d10f37291b check if sounds are downloaded before play thanks @Atlante45 2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43 Merge pull request #4305 from ctrlaltdavid/20308
CR for Job #20308 - Refine progress.js
2015-02-18 08:10:57 -08:00
Clément Brisset
1af3a6ffa8 Merge pull request #4302 from AndrewMeadows/inertia
correct gain variance in linearFade()
2015-02-18 06:57:51 -08:00
Clément Brisset
6e5c3593b6 Merge pull request #4298 from talentraspel/20339
removed id "g3322" in start-script.svg because it is no longer used and ...
2015-02-18 06:13:35 -08:00
Clément Brisset
3f117ce322 Merge pull request #4293 from AndrewMeadows/thermonuclear
fix crash in AudioScope for bad memory access
2015-02-18 06:03:03 -08:00
Andrew Meadows
1c8f1bbcdd Merge pull request #4299 from talentraspel/20338
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
2015-02-17 17:47:47 -08:00
Andrew Meadows
d7664718ee Merge pull request #4303 from sethalves/font-load-failed
Font load failed
2015-02-17 17:31:26 -08:00