Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24753 commits 2 branches 0 tags 1.1 GiB
Commit graph

24753 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -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
Seth Alves
bdfdc8c016 Merge pull request #4767 from birarda/master 
fix objects below array in JSONBreakableMarshal
 2015-05-04 16:57:15 -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
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
ZappoMan
8c47736c3b add skybox mode property 2015-05-04 11:41:03 -07:00
Stephen Birarda
31bbf15a55 remove unused variable 2015-05-04 11:30:56 -07:00
Stephen Birarda
6312d8643b Merge pull request #4759 from ericrius1/dice 
changed dice script to only play sound locally on collision, to avoid ev...
 2015-05-04 14:27:09 -04:00
Stephen Birarda
a039d5f28c Merge pull request #4753 from samcake/orange 
Introducing UserInputMapper
 2015-05-04 14:26:51 -04:00
ZappoMan
78f7870cbb more tweaks to atmosphere properties 2015-05-04 11:13:05 -07:00
Seth Alves
5daaa89cce Merge pull request #4747 from birarda/avatar-mixer-throttling 
improve domain-settings, tweak avatar-mixer sending
 2015-05-04 11:12:00 -07:00
Sam Gateau
fad623ae48 ANd really add the 2 files we need 2015-05-04 10:47:33 -07:00
Stephen Birarda
14fa89858e use epsilon constant in MovingMinMaxAvgTests 2015-05-04 10:45:26 -07:00
Stephen Birarda
87e586dfe6 remove a stray space 2015-05-04 10:42:58 -07:00
Sam Gateau
936eefd4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-04 10:41:32 -07:00
Sam Gateau
c7153bcc14 fixing commetns from review 2015-05-04 10:40:11 -07:00
Stephen Birarda
fb7646b02b add a QDebug for failed conversion in fromString 2015-05-04 10:32:49 -07:00
Stephen Birarda
aeb04cf9c3 use existing numerical constant in Avatar 2015-05-04 10:28:28 -07:00
Eric Levin
d930c942ff changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect 2015-05-04 10:16:50 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
7eb965f24f Merge pull request #4756 from thoys/patch-4 
Fix for RealSense menu item
 2015-05-04 12:46:25 -04:00
Stephen Birarda
96b75b57fe Merge pull request #4754 from Atlante45/fix_local_injector_on_win 
Fix local injector modifying system volume
 2015-05-04 12:45:06 -04:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Stephen Birarda
efb4d34598 Merge pull request #4755 from Atlante45/quiet_compiler 
Quiet compiler
 2015-05-04 12:43:13 -04:00
Thijs Wenker
9a6e442b25 Fix for RealSense menu item 
This was missed while moving to the new MenuWrapper class.
 2015-05-04 18:07:48 +02:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Clément Brisset
6b04ceffba Merge pull request #4752 from sethalves/quiet-compiler 
Quiet compiler
 2015-05-04 15:09:13 +01:00
Atlante45
1dcc2f7988 Fix local injector modifying system volume 2015-05-04 15:53:58 +02:00
Sam Gateau
3921156978 fix end of line 2015-05-04 01:09:25 -07:00
Sam Gateau
b7bacccce7 Fine tunning on windows 2015-05-04 00:54:54 -07:00
samcake
8e65ce34d1 FINe tune the scales for the Mac Book 2015-05-03 23:47:43 -07:00
Sam Gateau
116e29ae57 adjust the timer for touch event to work around the missing touch begin / touch end 2015-05-03 18:40:55 -07:00
Sam Gateau
ae14396fd7 adjust the key mapping for mac book and the scales 2015-05-03 18:03:27 -07:00
samcake
d2e61dba05 Make the nw mapper work for th einputs 2015-05-03 17:34:39 -07:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00