Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24283 commits 69 branches 56 tags 1.2 GiB
Commit graph

24283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Brad Davis
ad585f7559 Fixing NaN reference in test dialog 2015-04-17 10:05:54 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -07:00
Brad Davis
781abdd047 Tweaking test dialog and adding browser test 2015-04-17 09:53:40 -07:00
Seth Alves
f77038c52d when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up 2015-04-17 09:37:48 -07:00
Seth Alves
639b9ef9ff Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-17 08:50:07 -07:00
Eric Levin
2b4d894ab3 moved the type computation inside the while loop so it is correctly computed each iteration 2015-04-17 08:17:58 -07:00
Clément Brisset
59e75826fe Merge pull request #4634 from ctrlaltdavid/20471 
CR for Job #20471 - Create rain.js
 2015-04-17 16:33:27 +02:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02:00
Clément Brisset
e780d8e482 Merge pull request #4648 from ctrlaltdavid/dde-shutdown 
Terminate DDE process gracefully
 2015-04-17 16:28:32 +02:00
Brad Davis
8cdc5306cb Merge pull request #4660 from ZappoMan/HMDToolsTweaks 
revert mac version of HMD tools back to meta-H
 2015-04-16 22:44:22 -07:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00
Sam Gateau
1c5c7cc239 faking a checkbox to do a boolean property control 2015-04-16 17:55:55 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
ZappoMan
41e7b75a8d revert mac version of HMD tools back to meta-H 2015-04-16 17:14:18 -07:00
Seth Alves
62a45ccebb re-enable code that gives up simulation ownership 2015-04-16 17:00:36 -07:00
Seth Alves
116123256a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 16:45:39 -07:00
Eric Levin
096f69961a Filtering triggering of collisions with contact type of "continue" 2015-04-16 16:42:28 -07:00
Seth Alves
faf5e7415d don't explicitly release simulator status 2015-04-16 16:32:51 -07:00
David Rowe
d60ee3b6e2 Add velocity filtering to DDE eyelids 2015-04-16 16:28:22 -07:00
Seth Alves
ec26b4595a adjust comment 2015-04-16 16:27:30 -07:00
Seth Alves
f48f9caea4 cut back on debuging prints 2015-04-16 16:18:13 -07:00
Seth Alves
1484d6e37f fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version 2015-04-16 16:10:01 -07:00
Seth Alves
3b2a15f76a more debugging 2015-04-16 15:52:48 -07:00
David Rowe
c46f21152f Add velocity filtering to DDE head movement 
Based on filtering code in Faceshift.cpp.
 2015-04-16 15:47:02 -07:00
Seth Alves
ea8dcfa5b5 read UUIDs as UUIDs rather than as strings. more debugging prints 2015-04-16 15:33:43 -07:00
Seth Alves
d7881f1891 adjust logic for releasing ownership of simulation 2015-04-16 15:15:28 -07:00
David Rowe
3e484ee208 Add menu item for enabling DDE filtering 2015-04-16 15:04:25 -07:00
David Rowe
23d56f5bd0 Remove current DDE filtering 2015-04-16 14:51:55 -07:00
Seth Alves
d7059d8f2d add code for uuids in wire protocol. some debugging prints 2015-04-16 14:46:38 -07:00
Sam Gateau
3872c01340 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Brad Davis
a624ff43c4 Nothing to see here, move along 2015-04-16 14:10:29 -07:00
Andrew Meadows
619d1ba191 rename to measureAcceleration 2015-04-16 14:09:33 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Andrew Meadows
1acb90e23a merge upstream/master into andrew/isothermal 2015-04-16 13:48:47 -07:00
Andrew Meadows
b7ca69d4e1 fix typo 2015-04-16 13:46:26 -07:00
Andrew Meadows
5180e7e715 measure linear velocity of moving objects 2015-04-16 13:44:17 -07:00
Brad Davis
d72bb71030 Merge pull request #4636 from samcake/orange 
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
 2015-04-16 13:39:04 -07:00
Seth Alves
96eba3ca11 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 12:32:08 -07:00
Seth Alves
4d1df0f12e Merge pull request #4652 from AndrewMeadows/bispinor 
more consistency of ShapeType for model entities
 2015-04-16 12:32:02 -07:00
Seth Alves
bce269ada2 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 12:31:25 -07:00
Andrew Meadows
94c6053d52 fix formatting 2015-04-16 12:15:03 -07:00
Andrew Meadows
21d669f2f1 use computed shape type 2015-04-16 12:13:41 -07:00
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Seth Alves
b30b9a0a30 don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership 2015-04-16 12:03:34 -07:00
Sam Gateau
9466cf9345 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-16 10:27:13 -07:00
Seth Alves
df37b853f7 setup test of lockout-period oafter simulator-owner-id change 2015-04-16 08:57:57 -07:00
Clément Brisset
3c67c69745 Merge pull request #4651 from ZappoMan/HMDToolsTweaks 
Some small tweaks
 2015-04-16 16:10:43 +02:00