Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-05 14:46:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24812 commits 74 branches 59 tags 1.2 GiB
Commit graph

24812 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
e9c76da8d4 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-06 10:30:10 -07:00
Philip Rosedale
e2541c4243 Merge pull request #4740 from ctrlaltdavid/20518 
CR for #20518 - Mute camera button next to mute audio button
 2015-05-06 09:54:42 -07:00
Brad Hefta-Gaub
410baa6ac0 Merge pull request #4778 from ctrlaltdavid/20525 
CR for 20525 - Fix lobby not displaying in HMD mode
 2015-05-06 08:34:32 -07:00
Clément Brisset
0470e72459 Merge pull request #4777 from cozza13/20529 
CR for Job #20529 - Change defaulscripts.js
 2015-05-06 16:12:22 +02:00
David Rowe
333da93642 Updated face tracker mute icons 2015-05-05 23:20:23 -07:00
David Rowe
b519884609 Fix lobby not displaying in HMD mode 
This usage of Glower is similar to that in renderAvatarBillboard(). Both
may indicate that something needs changing in the graphics pipeline.
 2015-05-05 20:54:12 -07:00
Chris Collins
7396bb138d Removed headmove 
removed head move, it is not being used by Oculus users at the moment
 2015-05-05 16:52:38 -07:00
Seth Alves
e637a9b5ae Merge pull request #4776 from PhilipRosedale/master 
dice don't go away unless 'X' key is clicked, harmonicOscillator.js
 2015-05-05 16:52:35 -07:00
David Rowe
1c21874f00 Make face tracker mute action start / stop face tracker 2015-05-05 16:51:31 -07:00
samcake
5f19141050 Merge pull request #4773 from AndrewMeadows/bispinor 
fix crash in UserInputMapper::update() for invalid DeviceProxy
 2015-05-05 15:18:16 -07:00
Philip Rosedale
5fb79df4c9 dice don't go away unless 'X' key is clicked, added harmonicOscillator test script 2015-05-05 15:18:16 -07:00
Andrew Meadows
419cfee775 more correct fix for invalid DeviceProxy crash bug 2015-05-05 15:06:51 -07:00
Andrew Meadows
bbb8e2e076 merge upstream/master into andrew/bispinor 2015-05-05 15:00:19 -07:00
Andrew Meadows
0d4d5d024e revert last change (fix for invalid DeviceProxy) 2015-05-05 14:59:22 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
samcake
7ee4a1baca Merge pull request #4774 from ZappoMan/atmosphereInZones 
change skyboxMode to backgroundMode
 2015-05-05 12:54:35 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
Andrew Meadows
00bea4d274 fix crash for NULL deviceProxy 2015-05-05 11:05:28 -07:00
samcake
61f6139f4f Merge pull request #4764 from ZappoMan/atmosphereInZones 
First cut at adding "Atmosphere" support to zone
 2015-05-05 11:00:58 -07:00
Leonardo Murillo
fa9dfbe073 Merge pull request #4769 from birarda/master 
handle the case where a symlink replaces a copy
 2015-05-05 10:31:29 -06:00
Philip Rosedale
e9476029fb Merge pull request #4724 from jherico/menu_polish 
Menu polish
 2015-05-04 23:44:06 -07:00
Philip Rosedale
4dfc329af2 Merge pull request #4770 from ericrius1/mouseGrab 
added rotation ability to grab script
 2015-05-04 21:22:05 -07:00
ZappoMan
4422c63c79 another sample for changing atmosphere properties 2015-05-04 20:31:37 -07:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
Eric Levin
39efde7e8c added rotation ability to grab script 2015-05-04 18:14:46 -07:00
Philip Rosedale
d52d3513a4 Merge pull request #4768 from jherico/track-camera 
Remove camera wobble caused by having a face tracker enabled
 2015-05-04 18:01:47 -07:00
Stephen Birarda
b28e7cc765 handle case where a symlink replaces copy 2015-05-04 17:46:03 -07:00
Andrew Meadows
457ae5b0dd Merge pull request #4763 from ericrius1/quatHelpers 
added axis and angle helper methods to Quat class- script user can now g...
 2015-05-04 17:22:52 -07:00
ZappoMan
8b3b32c70d add example 2015-05-04 17:21:50 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Bradley Austin Davis
dc1b5a262f Remove camera wobble cause by the face tracker and by idle animations 2015-05-04 17:03:33 -07:00
Seth Alves
bdfdc8c016 Merge pull request #4767 from birarda/master 
fix objects below array in JSONBreakableMarshal
 2015-05-04 16:57:15 -07:00
Eric Levin
6a987fdaf5 now conforming to coding standards 2015-05-04 16:40:04 -07:00
ZappoMan
3f8c52cdd4 attempt to fix unix build buster 2015-05-04 16:36:38 -07:00
Stephen Birarda
00b8c937c7 remove spacing change in AudioMixerClientData 2015-05-04 16:34:50 -07:00
Stephen Birarda
ff89831894 fix for object below array in JSONBreakableMarshal 2015-05-04 16:32:26 -07:00
ZappoMan
2c02bfdda5 fix build buster 2015-05-04 16:01:50 -07:00
Seth Alves
8890c40e15 Merge pull request #4750 from PhilipRosedale/master 
Add limit to grab range to reduce max energy added by grabbing
 2015-05-04 15:59:07 -07:00
Philip Rosedale
7e7500eaad fix for coding standard 2015-05-04 15:57:21 -07:00
ZappoMan
32ef0c2010 removed some dead code 2015-05-04 15:49:21 -07:00
ZappoMan
3827e961a7 hook sunBrightness to keyLightIntensity 2015-05-04 15:31:50 -07:00
Eric Levin
e097950277 added axis and angle helper methods to Quat class- script user can now get normalized axis and scalar angle from a quaternion 2015-05-04 15:22:10 -07:00
ZappoMan
403ed6d77b wire up sunlocation from keylight direction 2015-05-04 15:20:16 -07:00
ZappoMan
741323e6c1 wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
Seth Alves
5cd1c6fd23 Merge pull request #4762 from samcake/orange 
Everquest standard controls
 2015-05-04 14:09:42 -07:00
Stephen Birarda
3f5b3a2b74 Merge pull request #4760 from birarda/master 
remove an unused variable
 2015-05-04 17:08:35 -04:00
Sam Gateau
b36775e781 After a very long debate it's clear that we shouldn;t have change the a and d keys behavior, so we bring them back but with a twist, now RIghtButton + A or D strafe right and left making the controller equivalent to everquest, world of warcraft 2015-05-04 13:57:40 -07:00
ZappoMan
cfe717fe08 only override environment when skyboxMode is atmosphere 2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00