Stephen Birarda
|
cfac4fe9c1
|
remove the Visage find module
|
2015-04-17 14:28:41 -07:00 |
|
Stephen Birarda
|
6b615c1ba1
|
remove Visage from menu header
|
2015-04-17 14:28:20 -07:00 |
|
Stephen Birarda
|
63a81bdcb4
|
remove VISAGE handling in interface CMakeLists
|
2015-04-17 14:27:58 -07:00 |
|
David Rowe
|
931c46345e
|
Move visibility methods into DiscoverabilityManager
|
2015-04-17 14:15:50 -07:00 |
|
Stephen Birarda
|
30e580e207
|
remove visage from Menu
|
2015-04-17 13:42:30 -07:00 |
|
Stephen Birarda
|
604bc2abe1
|
remove visage related files
|
2015-04-17 13:40:31 -07:00 |
|
Stephen Birarda
|
3055359d4c
|
remove visage references from Application
|
2015-04-17 13:40:18 -07:00 |
|
Sam Gateau
|
11879f6142
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-04-17 13:04:00 -07:00 |
|
Philip Rosedale
|
3814fbc0c2
|
Merge pull request #4658 from ctrlaltdavid/dde-filtering
DO NOT MERGE - DDE filtering
|
2015-04-17 15:41:03 -04:00 |
|
Clément Brisset
|
84dc128d40
|
Merge pull request #4657 from samcake/yellow
Address missing rendering pieplines for translucent and simplify Model rendering code
|
2015-04-17 20:47:04 +02:00 |
|
Seth Alves
|
292ba20cf3
|
pull andrew's measure-acceleration branch
|
2015-04-17 11:35:12 -07:00 |
|
Sam Gateau
|
f1e0d5855e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-04-17 11:33:39 -07:00 |
|
Sam Gateau
|
525d1040ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-04-17 11:32:35 -07:00 |
|
Sam Gateau
|
edb388ed83
|
Fixing the function with no implementation
|
2015-04-17 11:32:05 -07:00 |
|
David Rowe
|
ee48024831
|
Remove uninitialized method reference
|
2015-04-17 11:31:48 -07:00 |
|
Seth Alves
|
07b9d73edf
|
bump protocol version
|
2015-04-17 11:20:35 -07:00 |
|
Seth Alves
|
d90dec066c
|
if an entity has no simulatorID, pull it out of list of entities with simulatorIDs
|
2015-04-17 11:12:13 -07:00 |
|
Leonardo Murillo
|
db294ce0ec
|
Merge pull request #4661 from birarda/master
domain-server access token sanity for ENV, cleanup AM token output
|
2015-04-17 12:05:27 -06:00 |
|
Seth Alves
|
32ced31f60
|
adjust logic related to claiming and releasing simulation ownership during scripted changes to entities
|
2015-04-17 10:57:00 -07:00 |
|
David Rowe
|
6b085ca668
|
Move method out of Menu class
|
2015-04-17 10:53:04 -07:00 |
|
Stephen Birarda
|
f94fcdab7b
|
print if DS is using an access token from env
|
2015-04-17 10:44:18 -07:00 |
|
Stephen Birarda
|
64d17f101a
|
obfuscate set access token from AM log
|
2015-04-17 10:44:01 -07:00 |
|
Seth Alves
|
3da2d1680d
|
fix code that causes scripted changes to physics-related entity properties to claim simulation ownership
|
2015-04-17 10:41:11 -07:00 |
|
David Rowe
|
c823fcd083
|
Code tidying
|
2015-04-17 10:35:48 -07:00 |
|
Seth Alves
|
deec577db6
|
if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race
|
2015-04-17 10:21:52 -07:00 |
|
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 |
|