Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:33:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25139 commits 75 branches 59 tags 1.2 GiB
Commit graph

2356 commits

Author SHA1 Message Date
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
ZappoMan
4b8c6fc624 fix typo 2015-05-11 09:53:23 -07:00
Brad Hefta-Gaub
12269ff475 Merge pull request #4822 from Atlante45/edit_js 
Hide/Show Skybox/Atmosphere props only when needed
 2015-05-11 09:10:03 -07:00
Atlante45
beba293d96 Hide Skybox/Atmosphere prps when not needed 2015-05-11 15:54:30 +02:00
Atlante45
94765f0c53 Add print type 2015-05-11 15:54:14 +02:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
Seth Alves
8da3490a4c when grabbing an entity, zero out its gravity. 2015-05-10 09:32:03 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
Philip Rosedale
72e1ea688a Merge pull request #4808 from ZappoMan/moreZoneProperties 
add has stars to edit.js & fix background mode: nothing bug
 2015-05-08 17:10:45 -07:00
Howard Stearns
abc99267af Typo was making edit.js fail and impossible to debug. 2015-05-08 16:19:39 -07:00
ZappoMan
9f229dc3b3 remove spinners from scatter values 2015-05-08 15:03:04 -07:00
Philip Rosedale
6008713a2a Merge pull request #4809 from PhilipRosedale/master 
don't apply changes to velocity unless needed
 2015-05-08 14:06:51 -07:00
Philip Rosedale
d40e4b7218 don't apply changes to velocity unless needed 2015-05-08 14:05:32 -07:00
Seth Alves
60d7e622f6 Merge pull request #4805 from PhilipRosedale/master 
Add a delete button to dice script
 2015-05-08 14:02:27 -07:00
ZappoMan
b1d5b2643f add has stars to edit.js 2015-05-08 13:17:39 -07:00
Philip Rosedale
de6a63c69a add delete button to clear existing dice 2015-05-08 09:49:58 -07:00
Brad Hefta-Gaub
bbc257199b Merge pull request #4802 from Atlante45/add_debug 
Add some debug to edit.js
 2015-05-08 08:18:45 -07:00
Atlante45
01e3c33bf1 Add some debug to edit.js 2015-05-08 16:13:04 +02:00
Philip Rosedale
32dbbbdc8f normalize a vector that needed it. Correct rolloff of grab force 2015-05-07 21:44:09 -07:00
Philip Rosedale
b59352a10e Merge branch 'master' of https://github.com/worklist/hifi 2015-05-07 21:08:06 -07:00
Philip Rosedale
d3a977d3f8 Fix velocity math error, add random color changes 2015-05-07 21:05:13 -07:00
Andrew Meadows
c7952311e5 Merge pull request #4784 from thoys/20522 
Added transparency and positioning updating of Planky button
 2015-05-07 16:55:06 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
ZappoMan
d9f17d010c first cut at adding new zone properties to edit tools 2015-05-07 11:41:23 -07:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
ZappoMan
af2c3d91cf Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 18:05:54 -07:00
Thijs Wenker
b76e22c952 spelling mistake 2015-05-07 01:14:16 +02:00
Thijs Wenker
b3af1840c7 Added transparency and positioning updating of Planky button 2015-05-07 00:14:49 +02:00
Thijs Wenker
477447b95f Planky game script 2015-05-06 23:36:44 +02:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
ZappoMan
edb84a1a14 Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 10:52:04 -07:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02: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
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
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
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -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
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
ZappoMan
8b3b32c70d add example 2015-05-04 17:21: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
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
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