Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39275 commits 76 branches 59 tags 1.2 GiB
Commit graph

2233 commits

Author SHA1 Message Date
Seth Alves
5659589ea1 Merge pull request #7088 from birarda/offline-domain 
fix STUN failover for offline machines
 2016-02-12 09:16:20 -08:00
Stephen Birarda
a6ba8dd8e5 fix null STUN server socket check in LNL 2016-02-11 14:14:16 -08:00
Atlante45
51168a8a29 Explicitely cast to float 2016-02-11 09:35:31 -08:00
Atlante45
f32562b191 Coding standard 2016-02-10 16:35:06 -08:00
Atlante45
1e3bf67fab Fix division by 0 2016-02-10 16:35:06 -08:00
Stephen Birarda
1773233af4 cleanup management of HRTF objects across connected Nodes 2016-02-09 14:30:44 -08:00
Stephen Birarda
42e9a4ebf0 fix ATP SendQueue failure to receive after re-activity 2016-02-04 13:43:50 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Stephen Birarda
c91f8c7685 add debug for DDOS AC drop 2016-01-29 14:04:45 -08:00
Stephen Birarda
5551a05261 removed debug for queued check-ins 2016-01-29 14:04:45 -08:00
Stephen Birarda
e50e75cba7 drop assignment even if DDOS locks NL thread 2016-01-29 14:04:45 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00
Stephen Birarda
9061e33a1f send path query once connected to domain 2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae use the index path as default with network address 2016-01-21 18:24:16 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Stephen Birarda
4cfe3941f4 delete the lookup timeout timer once fired 2016-01-21 11:18:53 -08:00
Stephen Birarda
e69424e155 add parentheses to old style signal 2016-01-20 09:27:47 -08:00
Stephen Birarda
e3df02e589 fix parenting of single shot timer 2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1 allow STUN to succeed started late or immediately 2016-01-19 20:41:39 -08:00
Stephen Birarda
e5d47f3379 fix for accidental filtering of stun packets 2016-01-19 17:26:41 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Andrew Meadows
0df920d9a3 Merge pull request #6718 from birarda/master 
cleanup QTimer management in ThreadedAssignment
 2016-01-07 10:53:35 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Stephen Birarda
ddb8b67267 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-01-05 09:56:05 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Stephen Birarda
1646ac55ef include application version in networking 2016-01-04 15:32:07 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Seth Alves
8eef1624cb Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 09:27:59 -08:00
Brad Hefta-Gaub
5b177404d5 Merge pull request #6749 from jherico/resource_override 
Allow a script to set a resource override.
 2016-01-04 09:17:38 -08:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2015-12-30 12:45:32 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Stephen Birarda
a0d6001fa5 actually start domain-server check in timer 2015-12-28 10:54:42 -08:00
Stephen Birarda
2799123b55 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-28 10:46:51 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00