Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10999 commits 75 branches 59 tags 1.2 GiB
Commit graph

3118 commits

Author SHA1 Message Date
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Andrzej Kapolka
6ff629dcfd Use different unused variable warning suppressor for GCC. 2014-03-04 11:23:44 -08:00
Andrzej Kapolka
13b712592f Use different unused variable warning suppressor for GCC. 2014-03-04 11:21:59 -08:00
Andrew Meadows
427cf02d03 Merge branch 'cleanup' to 'cleanup2' 2014-03-04 11:20:42 -08:00
Andrzej Kapolka
cbfc60d017 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 11:18:54 -08:00
Andrzej Kapolka
47fe928995 Workin on LOD support in streaming. 2014-03-04 11:18:31 -08:00
Andrew Meadows
1b2db1f7ab fix for warnings about signed/unsigned comparison 2014-03-04 11:07:15 -08:00
Andrew Meadows
c8149f95a3 fix warning for unused variable (we forgot to use it) 2014-03-04 11:06:23 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Andrew Meadows
78b92516d9 fix warning about signed/unsigned comparison 2014-03-04 10:43:49 -08:00
Andrew Meadows
5252f22d82 fix warning about signed/unsigned comparison 2014-03-04 10:42:10 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrew Meadows
e22e022252 Fixing warnings and out-of-range index. 2014-03-04 09:55:32 -08:00
Andrew Meadows
343998a4a8 Adding virtual destructor to Shape class 2014-03-04 09:55:08 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Atlante45
de679b20ad Removed deadlock from merge 2014-03-03 18:48:11 -08:00
Atlante45
84f8e6ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 17:55:30 -08:00
Atlante45
357d71e637 Added stuff to localVoxelsExample.js 2014-03-03 17:52:49 -08:00
Andrew Meadows
f23dda7317 Less math for the same effect. 2014-03-03 17:34:16 -08:00
Andrzej Kapolka
dd679d52f3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:33:11 -08:00
Philip Rosedale
d38df21960 Merge pull request #2181 from ZappoMan/bugfixes 
particle deadlock and crash fixes a different way
 2014-03-03 17:31:29 -08:00
Andrzej Kapolka
dae8ed6417 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:27:16 -08:00
ZappoMan
d01090afbc reversing some changes 2014-03-03 17:13:06 -08:00
ZappoMan
493648b56e reversing some changes 2014-03-03 17:06:46 -08:00
Andrzej Kapolka
71931d85d9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:03:18 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
f5eaa330d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 15:48:38 -08:00
Philip Rosedale
5c0ec0ff6b Merge pull request #2175 from ZappoMan/bugfixes 
Fixes to particle deadlock, and some other crashes
 2014-03-03 15:42:09 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Andrzej Kapolka
9759cd70c0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 14:20:21 -08:00
ZappoMan
3684359c5f removed some debug 2014-03-03 13:57:05 -08:00
ZappoMan
98bf85173a more octree locking cleanup 2014-03-03 13:54:07 -08:00
Andrzej Kapolka
85083d74bc Fix for annoying "QThreadStorage" warning. 2014-03-03 13:39:01 -08:00
Stephen Birarda
1b7d24a79c keep known nodes alive when we receive a packet from them 2014-03-03 12:49:46 -08:00
ZappoMan
fd47602945 various particle crash and deadlock fixes 2014-03-03 12:49:34 -08:00
Stephen Birarda
5c1ba4264a Merge pull request #2173 from birarda/null-checks 
fix a flipped NULL pointer check
 2014-03-03 12:47:49 -08:00
Stephen Birarda
500f678595 fix a flipped null check 2014-03-03 12:47:26 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
ZappoMan
0285fe51e8 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-03-03 12:14:11 -08:00
ZappoMan
8e553c7497 fix potential crash in setIsOptionChecked() added support for positioning separators 2014-03-03 12:03:56 -08:00
Andrzej Kapolka
7fbcd7ce0b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 11:53:44 -08:00
Andrzej Kapolka
949e40a10e Revert complicated system of "soft" pointers, instead use hard references in 
write mappings and listen for object destruction.
 2014-03-03 11:44:45 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
Andrzej Kapolka
55dca45feb Working on tests for shared objects. 2014-03-03 10:20:50 -08:00
ZappoMan
372561195a remove voxel drumming from C++ 2014-03-03 04:00:06 -08:00
ZappoMan
59eefa314c add support for Audio.startDrumSound() to allow drum sound procedural audio in JS 2014-03-03 03:17:16 -08:00
ZappoMan
2c7d9d7a06 removed unneeded class declaration 2014-03-03 00:35:46 -08:00
ZappoMan
6ddc6132fd removed unneeded class def 2014-03-02 21:53:36 -08:00
ZappoMan
bde39d9832 expose getVoxelEnclosingPoint() to JS, and clean up JS version of findRayIntersection() 2014-03-02 20:28:20 -08:00
ZappoMan
f245aa6ac5 remove more cruft from VoxelSystem, move getElementEnclosingPoint() to Octree class where it belongs 2014-03-02 20:12:52 -08:00
ZappoMan
855e351f39 remove some ray pick helper code that was only used by hover voxel, main ray pick still exists 2014-03-02 19:37:40 -08:00
Andrzej Kapolka
f910c4471b Distinguish between "hard" and "soft" references to shared objects. Sending 
bitstreams use soft references and remove their mappings when only soft
references remain.
 2014-03-02 17:40:58 -08:00
ZappoMan
176270f639 more VoxelSystem vs VoxelTree cleanup 2014-03-02 16:51:40 -08:00
ZappoMan
f0e73d2f98 removed VoxelSystem::findRayIntersection() use tree directly 2014-03-02 15:46:33 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -08:00
ZappoMan
ded7328959 clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly 2014-03-02 15:17:49 -08:00
ZappoMan
de0baddef6 remove scene utils from voxels 2014-03-02 13:42:33 -08:00
Andrzej Kapolka
7992d2796e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-02 12:48:03 -08:00
ZappoMan
5b72f01b99 more cruft removal getting rid of false color in VoxelTreeElement 2014-03-02 12:33:52 -08:00
ZappoMan
b66c346f20 more cruft removal 2014-03-02 12:19:50 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
64a3fb950b fix warning 2014-03-01 11:54:24 -08:00
Andrzej Kapolka
c1a89517a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-28 18:11:46 -08:00
Andrzej Kapolka
3ae98a81fc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-28 17:03:15 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
Andrzej Kapolka
d157428704 When we send data to the avatar mixer, send the tweaked head rotation. Closes 2014-02-28 16:58:22 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
d2faca9767 fixed some warnings 2014-02-28 16:17:30 -08:00
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Atlante45
af691e1f75 Some comments and debug messages 2014-02-28 15:14:01 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Atlante45
fb10676121 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-28 11:32:27 -08:00
Atlante45
4a9415faeb Prevent users from modifying the domain tree with the LocalVoxels interface 2014-02-28 11:31:37 -08:00
Atlante45
20b921f4f8 Fixed typo 2014-02-28 11:26:17 -08:00
Atlante45
b854c450f4 Moved LocalVoxels class 2014-02-28 11:25:07 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
5d4ed4c85e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-27 18:14:18 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Atlante45
2ee7974fa8 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 17:53:59 -08:00
Atlante45
11e80e0aaa Added getVoxelAt for LocalVoxels + handle the case of the domain tree 2014-02-27 17:52:44 -08:00
Andrew Meadows
b8c1bab4ae Using pre-computed Model shapes for collisions 
...instead of generating collision shapes on the fly
 2014-02-27 17:52:35 -08:00
Atlante45
b07081407a Made commom string name static const 2014-02-27 14:47:05 -08:00
Atlante45
b033432684 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 14:36:44 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
Andrzej Kapolka
3fefec5545 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-26 16:29:31 -08:00
Andrew Meadows
25bdfd7677 Update to comment. 2014-02-26 15:38:33 -08:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
Andrzej Kapolka
4130d0f28b Added spheres as simpler spanners for testing. 2014-02-26 15:01:01 -08:00
Andrew Meadows
07eb366138 stubbed out collision handlers for ListShape 2014-02-26 14:32:46 -08:00
ZappoMan
d361c75b50 more work on seeing voxels 2014-02-26 14:16:22 -08:00
Philip Rosedale
b27e9b03d4 removed bad include 2014-02-26 14:15:00 -08:00
Andrzej Kapolka
9d95ff16b7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-26 13:50:32 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument 
Also, adding first pass at ListShape
 2014-02-26 12:10:16 -08:00
ZappoMan
dee9d48b5f adding OctreeHeadlessViewer::queryOctree() 2014-02-26 01:55:04 -08:00
ZappoMan
a28f016de0 removing VoxelQuery 2014-02-26 01:28:08 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00
ZappoMan
5fdfee4cd5 cleaning up some stuff 2014-02-26 00:48:38 -08:00
ZappoMan
cbca298717 cruft cleanup 2014-02-26 00:31:05 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
ZappoMan
d765e250d5 removed AbstractMenuInterface.h 2014-02-25 20:42:59 -08:00
ZappoMan
42ddc82ac4 possible fix to windows assert 2014-02-25 20:23:38 -08:00
ZappoMan
4b3911c5c1 Merge pull request #2101 from birarda/authentication 
fixes to login/logout flow when jumping domains
 2014-02-25 18:25:17 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
ZappoMan
3943c49dcc rename MenuType and other CR feedback 2014-02-25 17:32:16 -08:00
Atlante45
96d4f38e42 Modified the Script engine for Local voxel handling 2014-02-25 16:29:59 -08:00
Atlante45
4130313618 Added meta object for js LocalVoxels object 2014-02-25 16:29:54 -08:00
Atlante45
80337d2409 Base classe for shared named trees 2014-02-25 16:29:48 -08:00
Stephen Birarda
d5fc1caaaf fix wording for access token change signal 2014-02-25 16:12:25 -08:00
Stephen Birarda
2496c6252f fix login/logout flow when jumping domains 2014-02-25 16:10:08 -08:00
Stephen Birarda
6d847f29fb currently support system wide auth only via hifi data-web 2014-02-25 16:05:05 -08:00
Stephen Birarda
6c27b99aba Merge pull request #2099 from birarda/authentication 
fix oauth early token expiry
 2014-02-25 14:45:02 -08:00
Stephen Birarda
d0269761b6 remove unecessary qDebug include 2014-02-25 14:39:33 -08:00
Stephen Birarda
27be157d70 fix oauth early token expiry 2014-02-25 14:38:19 -08:00
Philip Rosedale
6b128466a9 Merge pull request #2094 from birarda/authentication 
reset nodelist if domain-server stops talking to you, closes #2092
 2014-02-25 14:10:24 -08:00
Philip Rosedale
dd93eff26e Merge pull request #2096 from birarda/scripted-billboard 
add option for fake bot billboard from URL
 2014-02-25 14:07:39 -08:00
Andrzej Kapolka
5d7eadcca3 Working on better streaming for spanners. 2014-02-25 13:48:46 -08:00
Stephen Birarda
ee70c93a3e have scripted avatars send billboard, if they have one 2014-02-25 13:42:07 -08:00
Stephen Birarda
f2a70bf275 add support for billboard setting from URL 2014-02-25 13:38:20 -08:00
Philip Rosedale
70c1f8290e assume RAW audio if not processed as WAV 2014-02-25 13:21:02 -08:00
Stephen Birarda
ce3d6d2fca reset nodelist if domain-server stops talking to you, closes #2092 2014-02-25 13:07:39 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -08:00
Andrzej Kapolka
ad51016409 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-25 11:23:29 -08:00
Andrzej Kapolka
92ab3cd09a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-25 11:21:35 -08:00
Andrew Meadows
362708be60 fix another missing semicolon 2014-02-25 11:19:07 -08:00
Andrew Meadows
28d9fb9747 fix missing semicolon 2014-02-25 11:17:48 -08:00
Andrew Meadows
9a70a50bdb capsuleCapsule() collision with preliminary tests 2014-02-25 10:59:12 -08:00
Stephen Birarda
1163cfd07e if the domain-server provides no auth, assume default 2014-02-25 10:58:32 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
ZappoMan
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -08:00
ZappoMan
74d48ab239 added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement 2014-02-25 10:23:59 -08:00
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication 
groundwork for secure node communication via data-server
 2014-02-25 10:07:55 -08:00
Stephen Birarda
45429fa1e1 fix default node auth URL 2014-02-25 09:38:22 -08:00
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
ZappoMan
09fc58763f Merge pull request #2054 from gaitat/19499 
Worklist Job #19499
 2014-02-24 19:10:31 -08:00
Andrzej Kapolka
3ca6c32c66 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-24 17:33:53 -08:00
Andrzej Kapolka
718439014a Compute the mesh extents for geometry and use them to set the spanner bounds. 2014-02-24 17:28:11 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
6d56ab3a30 use toDouble instead of toInt for Qt 5.1 compatibility 2014-02-24 15:27:12 -08:00
Stephen Birarda
672c6a9ed1 fix complaint for incomplete type QStringList 2014-02-24 15:23:47 -08:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00
Stephen Birarda
f20808b47f remove option to drive from transmitter 2014-02-24 15:11:02 -08:00
Stephen Birarda
050d223b3a add domain connection reset to NodeList reset 2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Stephen Birarda
9dc460bab4 make multiple instances of scripted assignment use diff UUID 2014-02-24 11:56:14 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
Philip Rosedale
907740eb8e Merge pull request #2047 from ey6es/metavoxels 
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
 2014-02-23 21:39:44 -08:00
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Andrzej Kapolka
ba327232d5 Fixed another Window signed/unsigned mismatch. 2014-02-23 21:07:00 -08:00
Andrzej Kapolka
5cf6c43414 Fix for Windows build error. 2014-02-23 20:29:54 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
ZappoMan
766a922fb3 add work around for voxel add of larger voxel on top of smaller voxels 2014-02-23 19:02:10 -08:00
ZappoMan
24a5cbfbfd Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 
Conflicts:
	examples/editVoxels.js
 2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78 Adding mouse wheel sizing voxel 2014-02-23 17:26:09 -08:00
Philip Rosedale
b0f3ab3ccd Merge pull request #2057 from ey6es/master 
I believe this is what was intended for the voxel edit orbit behavior.  Yaw the body, pitch the head.
 2014-02-23 17:22:07 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
03d6173c90 add Voxels.getFaceVector() to JS 2014-02-23 11:38:23 -08:00
gaitat
a1e773eb2d Worklist Job #19499 
Kick of the build
 2014-02-23 11:24:45 -05:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
gaitat
edd99f93de Worklist Job #19499 Mac compile fix 
third time's the charm
 2014-02-21 21:48:44 -05:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
gaitat
e2b20d2475 Worklist Job #19499 Mac compile fix 2014-02-21 21:13:31 -05:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and 
applies the rest to the head.  Closes #2050.
 2014-02-21 17:52:20 -08:00
Stephen Birarda
6165ca658a add a logout option to the menu 2014-02-21 17:13:22 -08:00
Stephen Birarda
0686539734 default to quieter HTTP request debugging 2014-02-21 17:07:14 -08:00
Stephen Birarda
52a21d4dfd hook to request user's location from data-server 2014-02-21 16:55:20 -08:00
Andrew Meadows
8c1dc40d39 Adding basic physics shapes (unfinished) 2014-02-21 16:29:07 -08:00
gaitat
e331dc529d Worklist Job #19499 
Add WAV file support to Javascript
 2014-02-21 19:26:19 -05:00
Andrew Meadows
ef6d2a624b helper methods to rotate/translate CollisionInfo 2014-02-21 16:24:40 -08:00
Stephen Birarda
6df317e8e6 update user's domain in data-server after connection to new one 2014-02-21 16:22:17 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Stephen Birarda
a49893689e store username in local settings so it doesn't need to be reloaded 2014-02-21 15:05:57 -08:00
Stephen Birarda
76e6c9342f parse username returned from data-server 2014-02-21 14:41:43 -08:00
Stephen Birarda
9d2d9c5071 fix cross-thread calls to AccountManager, domain switch flow 2014-02-21 13:45:39 -08:00
Stephen Birarda
d56bafc9a5 default to no auth for domain-server, fix no auth flow 2014-02-21 13:16:24 -08:00
Andrzej Kapolka
8d01527d93 Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 12:16:33 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
ZappoMan
a12e1ef18f Merge pull request #2043 from birarda/metavoxel-fix 
fixes for extra characters in logging target names
 2014-02-21 10:24:29 -08:00
Andrzej Kapolka
495447fc0d Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 10:19:52 -08:00
Andrzej Kapolka
18ea1d6a85 More work on billboards. 2014-02-21 10:16:06 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
matsukaze
e800c80d61 Merge remote-tracking branch 'upstream/master' 2014-02-20 23:32:06 -05:00
matsukaze
943b0b1b15 Removed primitiveIndex 2014-02-20 23:30:29 -05:00
Philip Rosedale
df7ffb35e1 Merge pull request #2045 from josecpujol/19489 
19489
 2014-02-20 19:16:50 -08:00
Stephen Birarda
c728463410 use connection secret to verify domain-server packets 2014-02-20 17:57:58 -08:00
Andrzej Kapolka
09ad4046f8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 17:20:07 -08:00
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00
Stephen Birarda
9cb8cbff2c fix noAuth flow for domain-server 2014-02-20 16:47:00 -08:00
Stephen Birarda
a6c1e3e87f tweaks to domain-server authentication flow 2014-02-20 16:31:50 -08:00
Jose Carlos
354c9bff09 Correct text position for default and non default meshes 
Bounding box for text background is now text dependent, much nicer now
 2014-02-21 00:29:52 +01:00
Stephen Birarda
ee90c25a41 add helpers for json responses from AccountManager 2014-02-20 14:22:08 -08:00
Stephen Birarda
2408d909ba resolve conflicts on merge with upstream master 2014-02-20 12:12:29 -08:00
Philip Rosedale
7010c45b16 Merge pull request #2036 from ZappoMan/js_clipboard 
Clipboard support in JS and lots of improvements to editVoxels.js
 2014-02-20 12:08:56 -08:00
Stephen Birarda
3bace43aae Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-20 12:08:47 -08:00
Andrzej Kapolka
09677b06f2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
 2014-02-20 12:05:15 -08:00
Stephen Birarda
cfec1e583e fix logging target-name extra characters 2014-02-20 12:02:23 -08:00
Stephen Birarda
4022d9f4c4 fix metavoxel interest list, keep node alive with ping 2014-02-20 11:36:16 -08:00
Stephen Birarda
4fbe8acd1e fix face and skeleton model URL Q_PROPERTY macros 2014-02-20 11:12:53 -08:00
Andrzej Kapolka
4dab2eb694 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 10:45:19 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
Andrew Meadows
caba4f9b9b Fix for crash when CollisionList gets full. 2014-02-20 07:58:30 -08:00
matsukaze
b813438307 Consolidate primitive index with buffer index. 
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
 2014-02-20 08:48:40 -05:00
Andrzej Kapolka
f017d0472f More work on spanners. 2014-02-19 18:17:26 -08:00
Stephen Birarda
cb165902fd use existing constants for HTTP operations 2014-02-19 18:12:10 -08:00
Stephen Birarda
d3dd49a2e8 force DomainServer to wait for session UUID before setup with auth 2014-02-19 18:06:21 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
ZappoMan
91d79f65f2 fix crash on import from JS 2014-02-19 17:57:28 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -08:00
ZappoMan
f6fba54dda improved text mapping in keyboard events 2014-02-19 17:49:00 -08:00
Stephen Birarda
32ceccfeb6 have domain-server bail if username/password not provided for auth 2014-02-19 17:26:21 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Andrzej Kapolka
25ae81e2de More work on spanners. 2014-02-19 15:25:21 -08:00
Andrzej Kapolka
a8d0aa6d17 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 14:57:18 -08:00
Stephen Birarda
57538af8fd give a separate QNetworkAccessManager to the AccountManager 2014-02-19 14:19:00 -08:00
Stephen Birarda
a4cabe91f8 use UUID setter to fire signal and debug on UUID change 2014-02-19 14:17:14 -08:00
Stephen Birarda
c5b8ff181e indicate that both username or email can be passed for login 2014-02-19 14:14:17 -08:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
Jose Carlos
828508bbf1 merged from master 2014-02-19 23:01:13 +01:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Andrzej Kapolka
4e7a7892ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 12:06:55 -08:00
ZappoMan
3bec67ecfd fix right mouse click 2014-02-19 11:42:41 -08:00
Andrzej Kapolka
0138ecb3b2 Layout tweaks. 2014-02-19 11:35:45 -08:00
ZappoMan
ad8a526502 fix right mouse click 2014-02-19 11:33:43 -08:00
ZappoMan
897da67118 Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 10:54:05 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -08:00
Andrew Meadows
c24cbdadc1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-02-19 10:00:51 -08:00
Andrew Meadows
07a12c1bd4 Removing unused declaration of static method 2014-02-19 09:28:34 -08:00
ZappoMan
bf814410ac first cut at exposing clipboard support to JavaScript 2014-02-19 00:10:16 -08:00
matsukaze
8aa645b6de Merge and resolve conflicts of remote-tracking branch 'upstream/master' 2014-02-18 22:45:25 -05:00
Stephen Birarda
c302042e83 store access tokens in QSettings 2014-02-18 18:12:27 -08:00
Stephen Birarda
3199f1a3e4 store access tokens in settings so re-log not required 2014-02-18 17:42:12 -08:00
Stephen Birarda
ca6dfa58a6 client ID need not be passed for password grant type 2014-02-18 17:16:25 -08:00
Andrew Meadows
c134b8de5b Remove Avatar::_hand, use AvatarData::_handData 2014-02-18 17:08:12 -08:00
ZappoMan
866b3dbb63 scripting additions 2014-02-18 16:47:50 -08:00
Stephen Birarda
b0895ea83a store registration token in more compact form, begin parse on domain-server 2014-02-18 15:58:54 -08:00
Andrew Meadows
4565599fb3 Removing unused cruft: setHeadData() and friend 2014-02-18 15:40:38 -08:00
Stephen Birarda
949f79e945 hook up request for domain registration information for Interface 2014-02-18 15:38:43 -08:00
Jose Carlos
59f8851b50 Merge remote-tracking branch 'upstream/master' into 19489 2014-02-19 00:05:16 +01:00