Philip Rosedale
|
2a84149d15
|
Merge pull request #3728 from ey6es/master
Fix for lights/shadows on Oculus, as well as a couple fixes for 3DTV mode.
|
2014-11-04 12:01:03 -08:00 |
|
Andrzej Kapolka
|
f00c54c23c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-11-04 11:45:23 -08:00 |
|
Andrzej Kapolka
|
03ce8081a4
|
Oh, when will I learn not to use "near" and "far" as variable names?
|
2014-11-04 11:44:47 -08:00 |
|
AndrewMeadows
|
61d5bfc751
|
Merge pull request #3730 from ZappoMan/deadcode
removed some dead code
|
2014-11-04 11:09:24 -08:00 |
|
AndrewMeadows
|
d7234d5995
|
Merge pull request #3731 from ctrlaltdavid/20138
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
|
2014-11-04 11:08:47 -08:00 |
|
Brad Hefta-Gaub
|
37d95b7f82
|
Merge pull request #3733 from huffman/inspect-tool-fixes
Inspect tool fixes
|
2014-11-04 10:13:59 -08:00 |
|
Ryan Huffman
|
2e8e31fce9
|
Update inspect tool behavior to pan correctly
|
2014-11-04 10:06:45 -08:00 |
|
Ryan Huffman
|
573e6f119f
|
Add entity camera options to settings
|
2014-11-04 10:06:17 -08:00 |
|
David Rowe
|
4fdc00948f
|
Repopulate example models in newEditEnties.js too
|
2014-11-04 09:39:37 -08:00 |
|
David Rowe
|
fd8fb32190
|
Repopulate example models for "Upload URL" to better sized models
|
2014-11-04 09:33:39 -08:00 |
|
Ryan Huffman
|
fc977e21e6
|
Remove print statements
|
2014-11-04 09:14:14 -08:00 |
|
ZappoMan
|
af1b69d8a1
|
removed some dead code
|
2014-11-04 09:01:45 -08:00 |
|
Brad Hefta-Gaub
|
1707025bd0
|
Merge pull request #3729 from huffman/inspect-tool
Add inspect tool functionality to newEditModels.js
|
2014-11-04 08:54:31 -08:00 |
|
AndrewMeadows
|
2083a4dd89
|
Merge pull request #3727 from birarda/domain-tunnel
report restricted access state from domain-server in heartbeat
|
2014-11-04 08:42:39 -08:00 |
|
Ryan Huffman
|
a3fa1e4ce8
|
Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool
|
2014-11-04 08:32:58 -08:00 |
|
Ryan Huffman
|
185b9ac545
|
Add Inspect tool to newEditEntities
|
2014-11-04 08:32:21 -08:00 |
|
Ryan Huffman
|
640c2c5fbf
|
Add optional orientation easing to entity camera
|
2014-11-04 08:30:10 -08:00 |
|
Andrzej Kapolka
|
3ba3299e35
|
Use glFrustum rather than Oculus's projection utility method, which seems to
be returning weird results.
|
2014-11-03 21:13:01 -08:00 |
|
Andrzej Kapolka
|
e76a8c2234
|
Fix for ambient occlusion in 3DTV mode.
|
2014-11-03 17:36:10 -08:00 |
|
Andrzej Kapolka
|
38a04b53d2
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-11-03 17:00:42 -08:00 |
|
Stephen Birarda
|
96dd1eaf76
|
report restricted access state from domain-server in heartbeat
|
2014-11-03 16:57:10 -08:00 |
|
Brad Hefta-Gaub
|
bc51d13c9a
|
Merge pull request #3726 from birarda/domain-tunnel
allow for case insensitivity in domain-server allowed users
|
2014-11-03 15:52:55 -08:00 |
|
Brad Hefta-Gaub
|
a78407cac8
|
Merge pull request #3724 from birarda/network-timeout
fix for reverted HifiSockAddr IP lookup in assignment clients
|
2014-11-03 15:52:44 -08:00 |
|
Stephen Birarda
|
a86ccfd603
|
Merge pull request #3725 from ZappoMan/entityScriptsAndEvents
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:51:33 -08:00 |
|
ZappoMan
|
60182a78cb
|
CR feedback
|
2014-11-03 15:42:40 -08:00 |
|
ZappoMan
|
2dae78b82c
|
CR feedback
|
2014-11-03 15:40:09 -08:00 |
|
ZappoMan
|
bc329a6394
|
remove blank line
|
2014-11-03 15:34:30 -08:00 |
|
ZappoMan
|
e12e3b05e1
|
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:33:01 -08:00 |
|
Stephen Birarda
|
0348251cc1
|
allow case insensitivity for allowed users in domain-server
|
2014-11-03 15:32:45 -08:00 |
|
Stephen Birarda
|
09ce4abaee
|
Merge branch 'master' of https://github.com/highfidelity/hifi into network-timeout
|
2014-11-03 15:16:21 -08:00 |
|
Brad Hefta-Gaub
|
001587db27
|
Merge pull request #3723 from birarda/domain-tunnel
add number of users to domain-server heartbeat
|
2014-11-03 15:15:34 -08:00 |
|
Stephen Birarda
|
88300f06ad
|
cleanup some debug in HifiSockAddr for hostname lookup
|
2014-11-03 15:14:39 -08:00 |
|
Stephen Birarda
|
74753e5b8b
|
allow a blocking lookup of IP address in HifiSockAddr
|
2014-11-03 15:13:41 -08:00 |
|
Stephen Birarda
|
acef1b868c
|
Revert "Revert "don't allow a HifiSockAddr lookup to block application""
This reverts commit fabc3aea57.
|
2014-11-03 15:05:40 -08:00 |
|
Stephen Birarda
|
d3372537c5
|
Merge pull request #3715 from ZappoMan/entityScriptsAndEvents
Entity Scripts
|
2014-11-03 15:02:52 -08:00 |
|
Stephen Birarda
|
2250cdfcc2
|
have the domain-server unverifiably heartbeat the number of connected users
|
2014-11-03 14:50:45 -08:00 |
|
Brad Hefta-Gaub
|
00b365318b
|
Merge pull request #3719 from samcake/tot
Fix the problem of actual framerate target not being true to the value ...
|
2014-11-03 14:48:52 -08:00 |
|
Sam Gateau
|
4d1fbc1cf9
|
Fix end of line in Application.cpp
|
2014-11-03 14:39:34 -08:00 |
|
Stephen Birarda
|
22f4e8ec70
|
cleanup heartbeat method names
|
2014-11-03 14:37:56 -08:00 |
|
Sam Gateau
|
a4bd0acc91
|
Fix the syntax issue with if blocks
|
2014-11-03 14:36:03 -08:00 |
|
Andrzej Kapolka
|
ce3133b8d4
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-11-03 14:01:08 -08:00 |
|
Sam Gateau
|
eae604d77e
|
Merged with upstream master
|
2014-11-03 13:37:17 -08:00 |
|
Stephen Birarda
|
a6f358745b
|
Merge pull request #3722 from highfidelity/revert-3717-network-timeout
Revert "don't allow a HifiSockAddr lookup to block application"
|
2014-11-03 12:54:33 -08:00 |
|
Stephen Birarda
|
fabc3aea57
|
Revert "don't allow a HifiSockAddr lookup to block application"
|
2014-11-03 12:54:28 -08:00 |
|
Brad Hefta-Gaub
|
09f20b00df
|
Merge pull request #3721 from birarda/domain-tunnel
have domain-server heartbeat to data-web for offline/online status
|
2014-11-03 12:52:19 -08:00 |
|
Stephen Birarda
|
eb856095a9
|
fix the domain server heartbeat timer
|
2014-11-03 12:49:24 -08:00 |
|
Stephen Birarda
|
d50a8f6309
|
send a heartbeat to data server every 15s
|
2014-11-03 12:40:56 -08:00 |
|
Brad Hefta-Gaub
|
ee0d966abd
|
Merge pull request #3720 from AndrewMeadows/bispinor
simpler tuning system for walk velocities
|
2014-11-03 12:38:49 -08:00 |
|
Brad Hefta-Gaub
|
c52b116ab1
|
Merge pull request #3717 from birarda/network-timeout
don't allow a HifiSockAddr lookup to block application
|
2014-11-03 12:38:05 -08:00 |
|
Stephen Birarda
|
e53ad09b3f
|
rename the automatic networking update method to heartbeat
|
2014-11-03 12:24:17 -08:00 |
|