Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 07:07:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12451 commits 25 branches 0 tags 1.1 GiB
Commit graph

672 commits

Author SHA1 Message Date
James Brotchie
19b8f101d8 Improved hifi:// style URL scheme handling. 
First steps towards implementing #1463.

 - Moved url parsing code from Application::event to
   Menu::goTo(QString).
 - Handle destination component of URL as either a @username,
   #place, or x-xx,y-yy,z-zz style coordinate.
 - Added support for entering hifi:// style URL into @ invoked
   goto menu option.
 2014-04-01 11:31:43 +10:00
Philip Rosedale
81d1eb7ed2 removed unused procedural movement code 2014-03-31 18:24:58 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
Philip Rosedale
3babb5e0bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 07:25:46 -07:00
James Brotchie
6880160bc0 Remember most recently opened script location. 
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
 2014-03-31 22:08:38 +10:00
Philip Rosedale
27f0214032 first pass audio VU scope 2014-03-28 23:09:51 -07:00
Atlante45
718b8f7eb9 Changed back to upload either head or skeleton 2014-03-26 15:07:19 -07:00
Lucas Crisman
8ed30d9da2 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-03-25 14:43:40 -03:00
ZappoMan
571ecf0964 add first cut at firstrun support 2014-03-25 00:45:31 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
Andrzej Kapolka
f1fd8175d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 14:53:00 -07:00
Andrzej Kapolka
210af25396 When rendering avatar shadows, check bounds against shadow frustum. Closes 2014-03-24 14:52:02 -07:00
ZappoMan
938959a9f6 expose application settings to JS 2014-03-22 21:20:35 -07:00
ZappoMan
b7243b0bfe more cleanup 2014-03-22 20:42:34 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
Lucas Crisman
5fe59acb87 Stats variable width for panels 2014-03-21 14:10:00 -03:00
Andrzej Kapolka
f92f45df63 Keep track of keys pressed, synthesize release events when focus is lost. 
Closes #2375.
 2014-03-20 11:17:36 -07:00
Brad Hefta-Gaub
2a03cf1bab make throttle rendering not adjust LOD 2014-03-14 17:17:38 -07:00
Atlante45
51585acd25 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 10:53:24 -07:00
Atlante45
424afaa36b Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-12 15:59:17 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing 
Voxel/Particle Server Scaling Work
 2014-03-12 15:24:29 -07:00
Atlante45
a2acdc01ab Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 
Conflicts:
	interface/interface_en.ts
 2014-03-12 12:21:56 -07:00
Atlante45
9402a5852c Fixed review comments 2014-03-12 12:20:43 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Atlante45
b9ee60ba41 FstReader not a member anymore 2014-03-12 11:47:47 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
Atlante45
8faaa28bc1 FST ploader base 2014-03-07 11:55:02 -08:00
Stephen Birarda
4a1cb63d7b remove an blank line in Application headers 2014-03-06 15:09:35 -08:00
Stephen Birarda
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Andrzej Kapolka
64c4e58160 Tie the avatar LOD distance multiplier to the LOD parameter calculated for 
voxels.
 2014-03-03 16:34:28 -08:00
ZappoMan
9d5e33d75d removed unused highlight voxel 2014-03-03 04:09:33 -08:00
ZappoMan
cb4219b775 remove HoverVoxel 2014-03-02 19:23:00 -08:00
ZappoMan
9bd29bdd92 removed findSpherePenetration() and findCapsulePenetration() from VoxelSystem, use VoxelTree 2014-03-02 15:34:36 -08:00
ZappoMan
f09521f67c oops 2014-03-02 13:50:46 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
1cc6288899 add back in entry point for import voxels 2014-02-27 15:41:36 -08:00
ZappoMan
5b1037cc63 switching to OctreeQuery instead of VoxelQuery 2014-02-26 01:22:53 -08:00
Philip Rosedale
46469612c7 Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing 
Remove cpp voxel editing
 2014-02-25 22:07:54 -08:00
ZappoMan
5fdf114ff0 removed more cruft 2014-02-25 21:53:20 -08:00
ZappoMan
d61ba02a38 removed more cruft 2014-02-25 21:44:38 -08:00
ZappoMan
869b35a7aa remove old c++ implementation of voxel tools 2014-02-25 21:38:10 -08:00
ZappoMan
42ddc82ac4 possible fix to windows assert 2014-02-25 20:23:38 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -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
ZappoMan
03f8885cad first cut at menus JS 2014-02-24 19:09:22 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
e40fe85c36 Updating the camera mode every frame screws with the scripts, so revert to 
updating it when the menu changes.
 2014-02-24 11:42:47 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -08:00
Philip Rosedale
246bb1fd2d Physics test ‘buckyballs’ moved to application.cpp 2014-02-24 00:06:50 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -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
Andrzej Kapolka
18ea1d6a85 More work on billboards. 2014-02-21 10:16:06 -08:00
Andrzej Kapolka
6b90a3994d Working on avatar billboards. 2014-02-20 19:22:59 -08:00
Andrzej Kapolka
09ad4046f8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 17:20:07 -08:00
Stephen Birarda
2408d909ba resolve conflicts on merge with upstream master 2014-02-20 12:12:29 -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
ZappoMan
0e8cab7349 added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs 2014-02-19 20:09:35 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -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
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
ZappoMan
bf814410ac first cut at exposing clipboard support to JavaScript 2014-02-19 00:10:16 -08:00
Andrzej Kapolka
f83254882a Attempting to get the head rotation from Visage. 2014-02-18 16:07:08 -08:00
Jose Carlos
59f8851b50 Merge remote-tracking branch 'upstream/master' into 19489 2014-02-19 00:05:16 +01:00
Jose Carlos
46ed506196 Display names are shown when distance is below a threshold 
Used polygon offset to render display names
Saved model view and projection matrices in order to save glGetDoublev calls
 2014-02-19 00:04:00 +01:00
Andrzej Kapolka
036230ec8d Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-18 13:59:31 -08:00
Stephen Birarda
c762b92e5a replace DataServerClient and Profile with AccountManager 2014-02-18 11:27:37 -08:00
Andrzej Kapolka
5513524705 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-17 21:48:37 -08:00
Andrzej Kapolka
1d7f1afa5b Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-17 21:48:21 -08:00
Andrzej Kapolka
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
stojce
13485065a5 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 18:59:44 +01:00
ZappoMan
dd0909659a Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-16 19:20:06 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
ZappoMan
8e284a55b1 Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-14 10:50:35 -08:00
stojce
0ddc475928 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-14 18:30:54 +01:00
stojce
d5b87fbe8a Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-14 18:28:34 +01:00
ZappoMan
9d841ce918 add Stop All Scripts and Reload All Scripts 2014-02-13 18:19:20 -08:00
Andrzej Kapolka
1fba28d45e Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-13 16:51:44 -08:00
stojce
08c8f47cd4 added SNAPSHOT_EXTENSION constant 2014-02-13 20:05:59 +01:00
ZappoMan
156fa6dc5a more tweaks, removed old clouds 2014-02-13 11:03:35 -08:00
ZappoMan
8e3e7c1537 first experimental cut at overlay image 2014-02-11 17:18:24 -08:00
stojce
68584c654b Allow drag-and-drop of snapshots into Interface 2014-02-12 02:12:52 +01:00
Andrzej Kapolka
25066f8b4f Starting on Visage integration. 2014-02-11 16:44:25 -08:00
stojce
1ac583edca Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-10 22:57:55 +01:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
stojce
b05967a514 Custom URL handler 2014-02-09 17:47:46 +01:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
Philip Rosedale
9655e93432 Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior 2014-02-08 19:13:43 -08:00
Stephen Birarda
455442088c Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer 2014-02-07 13:45:14 -08:00