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

3795 commits

Author SHA1 Message Date
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
0477706cb9 Add ScriptEngine::getEngine() to get internal QScriptEngine 2014-04-30 09:40:32 -07:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
f993f984c9 first cut at modelserver 2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
Andrew Meadows
4e34d0339d set position in ctor that takes endpoints 
and some cleanup
 2014-04-29 15:15:53 -07:00
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Atlante45
49eadac024 Bumped octree stats packet version 2014-04-29 13:52:07 -07:00
Atlante45
85d007adfd Merge branch 'master' of https://github.com/highfidelity/hifi into clockSkew_win_bug 2014-04-29 12:49:02 -07:00
Atlante45
f74bd491d6 CR 2014-04-29 12:48:50 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Clément Brisset
4c42a403e7 Merge pull request #2738 from huffman/19598 
Login window
 2014-04-28 19:28:50 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Atlante45
8686fecdad Switch OctreeSceneStats to quintX 2014-04-28 16:08:26 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Ryan Huffman
45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 
Conflicts:
	interface/src/ui/FramelessDialog.h
 2014-04-28 09:13:00 -07:00
Ryan Huffman
cbd5fbe9b3 Add loginFailed signal to AccountManager 2014-04-28 08:59:44 -07:00
Stephen Birarda
e50e4d33be Merge branch 'master' of https://github.com/highfidelity/hifi into oauth-ds 2014-04-25 16:10:55 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Brad Hefta-Gaub
b0a561198b Merge pull request #2721 from Atlante45/improved_undo 
Handle subtrees with undo
 2014-04-25 14:32:49 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Andrew Meadows
357aac833e expose AVATAR_MOTION_OBEY_GRAVITY const to JS 2014-04-25 14:15:40 -07:00
Andrew Meadows
2d5bfc81cd add Vec3.distance(Vec3, Vec3) for JS 2014-04-25 14:14:34 -07:00
Clément Brisset
c2a91b4ee9 Merge pull request #2732 from ZappoMan/fixtimestamps 
improved guards against extremely unlikely packets
 2014-04-25 13:55:13 -07:00
Clément Brisset
f0a87c1072 Merge pull request #2733 from birarda/master 
pass the owner scope for oauth token requests
 2014-04-25 13:42:00 -07:00
Atlante45
3143e10bd8 CR 2014-04-25 13:33:59 -07:00
Stephen Birarda
8e12c0d8e5 pass the owner scope to auth requests 2014-04-25 13:22:18 -07:00
ZappoMan
7c1b5ba092 Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
 2014-04-25 13:14:52 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
ZappoMan
6acdf9cd6c fix issues with bad timestamps 2014-04-25 11:21:02 -07:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Andrew Meadows
f91c098589 merge 2014-04-24 19:13:22 -07:00
Stephen Birarda
4a68c2e9c4 allow DS to handle incoming HTTPS requests 2014-04-24 14:58:08 -07:00
Stephen Birarda
0bc17b0852 hand certificate and private key to QSslSocket instances 2014-04-24 14:35:18 -07:00
Andrew Meadows
0a7a5031ee expose COLLISION_GOUP_* constants to JS 2014-04-24 14:17:10 -07:00
Stephen Birarda
96de0c1af1 setup the domain-server HTTPS server 2014-04-24 14:13:17 -07:00
Stephen Birarda
260966915a add HTTPS versions of webserver classes 2014-04-24 14:06:24 -07:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Atlante45
1844eb2c9e Pre CR tweaks 2014-04-24 11:12:01 -07:00
Atlante45
37fbbb0297 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-24 11:01:34 -07:00
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Atlante45
2494e589a9 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 17:36:01 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Atlante45
a24f092efe Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 13:47:12 -07:00
Andrew Meadows
c5f1a8abd6 formatting 2014-04-23 13:37:13 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Atlante45
378afdf117 More undo work 2014-04-23 10:35:24 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrew Meadows
a7771bc142 repair header comments for AABox.* 2014-04-23 09:05:11 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00
Andrew Meadows
1986ac6be3 collisions with cube get rounded normals at edges 2014-04-22 20:53:12 -07:00
Atlante45
448e3a0947 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-22 14:42:58 -07:00
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07:00
Atlante45
fea0a262a6 Put back missing windows header 2014-04-22 12:35:50 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -07:00
Andrew Meadows
f033990fae merge upstream/master into andrew/inertia 2014-04-22 10:49:44 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
Andrew Meadows
a45bc6c110 remove const from CollisionList subscript operator 2014-04-22 10:48:05 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
Thijs Wenker
59cc930556 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-22 13:12:38 +02:00
Andrew Meadows
63c02f2b04 add subscript operator for CollisionList 2014-04-21 18:22:34 -07:00
Andrew Meadows
1782e803c9 remove include StreamUtils.h 2014-04-21 18:21:39 -07:00
Andrew Meadows
8d6fa8f904 fix sphere-vs-axis-aligned-cube logic 2014-04-21 18:19:59 -07:00
ZappoMan
91d8e11393 return the bytes sent in writeDatagram() and writeUnverifiedDatagram() 2014-04-21 17:34:01 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
be2db49e08 Last touch to removing gettimeofday 2014-04-21 16:44:21 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507 properly unhook delete notifications 2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f unhook node bag from element notifications on shutdown to speed up cleanup 2014-04-21 15:45:12 -07:00
ZappoMan
779b5a6827 debug 2014-04-21 15:32:44 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Andrew Meadows
06784aa960 move AABox back to octree lib 
Fleshing out ShapeCollider::collideShapeWithAACube()
 2014-04-21 14:07:40 -07:00
Thijs Wenker
70ac93c20d Style 2014-04-21 21:44:50 +02:00
Atlante45
ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 
Conflicts:
	interface/src/Audio.cpp
 2014-04-21 12:19:19 -07:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -07:00
Andrew Meadows
241df7a767 Move AABox from octree lib to shared lib 
Stubbed out Shape vs Octree collisions
 2014-04-21 10:27:20 -07:00
ZappoMan
25a859f95e Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-21 10:12:34 -07:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
ZappoMan
59cbda20c6 added some threading and event debugging 2014-04-20 19:48:17 -07:00
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in 
[-pi/2, pi/2].
 2014-04-18 17:16:20 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
61981b9470 Added getter for tree scale in js 2014-04-18 16:00:44 -07:00
ZappoMan
c2bcb32804 add support for sending unverified datagrams to nodes 2014-04-18 15:33:27 -07:00
ZappoMan
334f688e4e add support for sending unverified datagrams to nodes 2014-04-18 15:30:45 -07:00
ZappoMan
0e124eca3c Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-18 15:05:54 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
Stephen Birarda
21672bbdc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 15:01:23 -07:00
Stephen Birarda
72fe9b94b1 fix property in sound 2014-04-18 14:48:26 -07:00
Stephen Birarda
c1e54d370c change Sound property to hasDownloaded 2014-04-18 14:46:56 -07:00
AndrewMeadows
b356e3903d Merge pull request #2695 from birarda/master 
changes to smooth JS dynamic bot demo
 2014-04-18 14:36:00 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
92f2794ea8 add a property to Sound to tell if empty 2014-04-18 14:26:56 -07:00
Stephen Birarda
1a895b9342 add property for display name to JS 2014-04-18 14:24:50 -07:00
Stephen Birarda
aa5d7aa0b1 fix incorrectly named slot in Sound 2014-04-18 13:58:33 -07:00
Stephen Birarda
3b8cf8c172 fix mixed signal and slot 2014-04-18 13:55:22 -07:00
Stephen Birarda
6ef4e145c5 add better Sound error handling 2014-04-18 13:51:58 -07:00
Andrew Meadows
54153a70a3 merge upstream/master into andrew/inertia 2014-04-18 11:30:26 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Stephen Birarda
3e4369f2ff kill avatars in hash map after a timeout threshold 2014-04-17 16:57:00 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrzej Kapolka
15d4f59ceb Moved AnimationObject to separate source files. 2014-04-17 15:52:32 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -07:00
Andrzej Kapolka
197ce036c4 Remove debugging line. 2014-04-17 11:06:28 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
Stephen Birarda
49e7842d25 push packet version to force an update 2014-04-16 13:37:41 -07:00
Atlante45
9d372bfe3c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-16 12:44:27 -07:00
Stephen Birarda
505145f693 add a missing bracket to IP_DONTFRAG 2014-04-16 12:02:02 -07:00
Atlante45
d34e6ff864 Removed gettimeofday in AudioInjector 2014-04-16 12:01:41 -07:00
Stephen Birarda
afcb542bbe fix a debug line in LimitedNodeList 2014-04-16 11:28:34 -07:00
Stephen Birarda
06a976041b take pointer of optValue and not actual optValue 2014-04-16 11:27:30 -07:00
Stephen Birarda
a25ef58247 move DTLS socket changes to LimitedNodeList 2014-04-16 11:25:35 -07:00
Stephen Birarda
57567becc8 fix unexpected null parameter to disconnect, closes, #2663 2014-04-16 11:02:08 -07:00
Stephen Birarda
97e45e8fe5 re-instate connect behavior in DS so killed nodes re-connect, amend #2675 2014-04-16 10:56:33 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
Atlante45
dd02bae5b3 First cut at improved undo 2014-04-15 16:11:00 -07:00
ZappoMan
579710e4bd some cleanup 2014-04-15 13:36:20 -07:00
ZappoMan
60c6b27ab2 cleanup code a bit, add support for diffusions even with no ray intersection 2014-04-15 11:38:11 -07:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
Andrzej Kapolka
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5 move isNaN() to shared utils 2014-04-13 19:09:07 -07:00
Andrew Meadows
508d4f216d fix #2656 avatar jumps very far away 
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule.  The
penetration against such a shape could be arbitrarily large.
 2014-04-11 15:55:18 -07:00
Stephen Birarda
1cd5fec71c push packet version for assignments 2014-04-11 11:42:33 -07:00
Stephen Birarda
6431d35f86 add a missing newline to DomainHandler 2014-04-11 10:19:31 -07:00
Andrzej Kapolka
806bcc8e6f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 18:49:52 -07:00
Clément Brisset
5f6dee6c64 Merge pull request #2635 from thoys/windows-script-path-fix 
Fixed loading local stored scripts on Windows machines
 2014-04-10 16:40:47 -07:00
Stephen Birarda
86b0b78692 add a missing semi-colon for windows build 2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7 just call free instead of gnutls_free on windows 2014-04-10 12:24:41 -07:00
Stephen Birarda
38867a2f09 fix for re-declarations of xgnutls_free 2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c put gnutls_free fix in DTLSSession header 2014-04-10 12:11:41 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00
Stephen Birarda
2c96ce08ae add stackoverflow fix for lnk2001 error in gnutls_free 2014-04-10 11:50:26 -07:00
Stephen Birarda
cfc2431a59 don't be a dummy and include Systime header from implementation 2014-04-10 11:37:09 -07:00
Stephen Birarda
00a826330e use GetSystemTimeAsFileTime with previous gettimeofday setup 2014-04-10 11:34:43 -07:00
Stephen Birarda
ea8f0df17d use extern C in Systime header 2014-04-10 11:30:20 -07:00
Stephen Birarda
885cee28c5 guard Systime against being included on UNIX/OS X 2014-04-10 11:28:22 -07:00
Stephen Birarda
1daaf561de don't include missing sys/time, declare gettimeofday in Systime header 2014-04-10 11:26:47 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab define WIN32_LEAN_AND_MEAN before include windows.h in Systime 2014-04-10 11:17:03 -07:00
Stephen Birarda
53aafd6897 rely on winsock2 for timeval declaration 2014-04-10 11:06:22 -07:00
Stephen Birarda
7d4399da35 don't use reserved word causing issues on windows 2014-04-10 11:01:17 -07:00
Stephen Birarda
52203bd36e another attempt to repair QNetworkInterface call on windows 2014-04-10 10:58:20 -07:00
Stephen Birarda
ad0776be4e repair QNetworkConfigurationManager include 2014-04-10 10:55:02 -07:00
Stephen Birarda
714db42f87 include QNetworkConfigManager to fix HifiSockAddr error on windows 2014-04-10 10:51:20 -07:00
Stephen Birarda
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -07:00
Stephen Birarda
da24483d7c include WS2tcpip for socklen_t on windows 2014-04-10 10:45:43 -07:00
Stephen Birarda
b87c04444e include winsock2 from HifiSockAddr 2014-04-10 10:41:01 -07:00
Stephen Birarda
8b19982e61 commit missing Syssocket removals to Node and Logging 2014-04-10 10:36:30 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d fix GnuTLS include dir variable name 2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e link to GnuTLS library from script-engine 2014-04-10 10:12:09 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
ba6f861ad8 fix unmatched #ifdef in Syssocket 2014-04-10 09:54:37 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
1d5644a85f link GnuTLS to octree library 2014-04-10 09:45:57 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Stephen Birarda
7e2b73906c remove Syssocket include from SharedUtil 2014-04-10 09:35:25 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Thijs Wenker
825acbbd9c Update ScriptEngine.cpp 
DWORD is not defined in UNIX based systems. int should be fine
 2014-04-10 10:47:21 +02:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3fe5af1505 update boilerplate and include guards for other new files 2014-04-09 15:08:56 -07:00
Stephen Birarda
5a79079c09 fix boilerplates in new DTLS files 2014-04-09 15:03:56 -07:00
Thijs Wenker
5d812c8cb2 Fixed loading local stored scripts on Windows machines 2014-04-09 23:44:40 +02:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Andrew Meadows
5fa1fd6b81 merge 2014-04-09 14:36:22 -07:00
Atlante45
b05b5a1c7b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 14:11:22 -07:00
Andrew Meadows
698e3783e0 fixing formatting 2014-04-09 13:06:29 -07:00
Andrew Meadows
f8e66b4e0d remove cruft 2014-04-09 13:05:26 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes() 
Also add collideShapesCoarse()
 2014-04-09 13:04:17 -07:00
Andrew Meadows
7304049f83 update boiler plate to abide by new standard 2014-04-09 12:55:29 -07:00
Stephen Birarda
29f8ed3c09 manually fix Plane include guard since regex did not catch 2014-04-09 12:03:57 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00
Stephen Birarda
ced5e72d39 add date to capsule shape 2014-04-09 10:46:36 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
11c235a29e fixes to source files for code remove in regex replace 2014-04-09 10:16:56 -07:00
Stephen Birarda
a65f8faea9 fix Plane header that was not caught 2014-04-09 09:36:13 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Andrew Meadows
229d6cefa2 merge upstream/master into andrew/scripting 2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
e417e7670b cleanup DomainServer debug during config parsing 2014-04-08 14:07:31 -07:00
Atlante45
8ad7c3b239 Moved ModelUploader to interface + New error messages 2014-04-08 14:03:27 -07:00
Stephen Birarda
c2ff438182 add a CL + JSON settings reader 2014-04-08 13:37:07 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82 Merge pull request #2613 from Atlante45/more_upload_work 
More upload work
 2014-04-08 08:16:07 -10:00
Atlante45
22cab29d25 Code review 2014-04-08 11:06:48 -07:00
Atlante45
eaca699a6d Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work 2014-04-08 10:35:23 -07:00
Atlante45
e1a1ff3988 Code review 2014-04-08 10:32:49 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Atlante45
ee5ebae89e Code review 2014-04-08 10:22:50 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Atlante45
174f37f531 Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -07:00
Brad Hefta-Gaub
881383a5f2 Merge pull request #2609 from AndrewMeadows/avatar-interaction 
More details in JS collision events
 2014-04-08 06:52:04 -10:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Atlante45
46f0e78039 Erased deprecated code 2014-04-07 17:28:03 -07:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Atlante45
3be2319081 Removed all the temporaryDir junk 2014-04-07 16:18:23 -07:00
Andrzej Kapolka
2a58a863fd Fix for rotation placement. 2014-04-07 15:48:34 -07:00
Andrzej Kapolka
15e9d45dc3 Switched from storing Euler angles to using quaternions along with a 
quaternion editor.  Also, use a default step of 0.01 for floats/doubles.
 2014-04-07 15:41:42 -07:00
Andrew Meadows
79670563d4 AvatarData stores its sessionID 2014-04-07 14:42:49 -07:00
Atlante45
262c6d3206 Fixed double JSON callback when http error occurs 2014-04-07 14:35:13 -07:00
Andrew Meadows
23c6873d99 Add Uuid object to ScriptEngine 2014-04-07 14:12:29 -07:00
Atlante45
e85703d25b Added feedback and a better success check 2014-04-07 13:48:28 -07:00
Atlante45
cec99caa47 Added upload progress tracking to AccountManager via JSON 2014-04-07 13:45:30 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
86a0b715f3 verify DTLS certificate to ensure trust before handshaking 2014-04-07 11:36:32 -07:00
Stephen Birarda
0f92e02da7 add the hifi root CA trusted cert to source 2014-04-07 11:19:06 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
45d796e8f3 allow re-handshake in NodeList after domain refresh 2014-04-04 15:56:02 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00