Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-23 00:02:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18422 commits 23 branches 0 tags 1.2 GiB
Commit graph

18422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Ryan Huffman
bd61eba664 Remove unused include 2014-11-11 10:00:28 -08:00
Ryan Huffman
f577cdd2f4 Add Grid3DOverlay to Overlays 2014-11-11 09:56:47 -08:00
Ryan Huffman
d537c5efdb Add grid tool menu option 2014-11-11 09:56:02 -08:00
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00
Ryan Huffman
2ebca0a659 Add Grid3DOverlay 2014-11-11 09:50:25 -08:00
Ryan Huffman
feaf5678bb Add grid tools to entity edit tools 2014-11-06 15:00:39 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -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
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
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
Stephen Birarda
9e1da64895 use different include style for QHostInfo 2014-11-03 12:03:10 -08:00
ZappoMan
252d05282b added example entity script that teleports your avatar to the entity when you click on it 2014-11-03 12:03:08 -08:00
ZappoMan
30c5451b87 added example of playing a sound on click 2014-11-03 11:52:16 -08:00
Stephen Birarda
e976942515 fix includes for HifiSockAddr 2014-11-03 11:44:15 -08:00
ZappoMan
f9bd954fbe typo 2014-11-03 11:43:30 -08:00
Brad Hefta-Gaub
e66a96b020 Merge pull request #3718 from ctrlaltdavid/hmd-leap-offset 
Better estimate of HMD offset for Leap-on-HMD
 2014-11-03 11:40:48 -08:00
ZappoMan
948f3a4c1f added an example entity script that makes the avatar do crazy legs when you click on an entity 2014-11-03 11:38:49 -08:00
Andrew Meadows
92a6609ac0 simpler tuning system for walk velocities 2014-11-03 11:31:04 -08:00