Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 15:30:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27160 commits 76 branches 59 tags 1.2 GiB
Commit graph

889 commits

Author SHA1 Message Date
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Stephen Birarda
a9eccb687a fix for double store on index path lookup 2015-06-22 11:26:17 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
e9bdf7e73a add missing bools to handleViewpoint call 2015-06-16 13:39:11 -07:00
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Stephen Birarda
ef62f7e9f0 fix relative path lookup effect on history 2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Stephen Birarda
1112841586 fix indentation in AddressManager 2015-06-09 19:01:03 -07:00
Stephen Birarda
8b67710022 store an in-memory history of the last addresses 2015-06-09 18:59:58 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Stephen Birarda
33fde7c66d remove extra debug 2015-05-29 13:21:24 -07:00
Stephen Birarda
2207bfaf40 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd fix fail case for DS pings 2015-05-29 12:06:07 -07:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07:00
Stephen Birarda
e91ee7e7e3 only send add packet for nodes in interest set 2015-05-29 09:49:54 -07:00
Stephen Birarda
046828ee5d make the LNL the parent of any Nodes it adds 2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6 remove NetworkPeer dtor debug, fix ICE socket 2015-05-28 16:44:34 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Stephen Birarda
667df66963 add packet type for DS node add 2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c add ping timer tied to NetworkPeer 2015-05-27 18:22:23 -07:00
Stephen Birarda
757d02a600 fix reset on address lookup 2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d look for connection steps in LimitedNodeList 2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Stephen Birarda
4b6b34836d repair anomalies in timing table 2015-05-27 10:30:45 -07:00