Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-20 16:39:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11715 commits 25 branches 0 tags 1.1 GiB
Commit graph

489 commits

Author SHA1 Message Date
stojce
22a8693b89 Overlay behaviour 2014-03-26 00:05:11 +01:00
stojce
547f33f4d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-25 22:15:52 +01:00
AndrewMeadows
5551396a7b Merge pull request #2480 from ZappoMan/scripting_improvements 
Scripting improvements
 2014-03-25 10:49:14 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
Andrzej Kapolka
81ae18a3bf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-24 17:25:34 -07:00
Andrzej Kapolka
47f0af818a Adjust avatar LOD more aggressively: raise detail slowly when above our target 
window, lower it in proportion to the ratio between desired and actual rates.
 2014-03-24 16:45:44 -07:00
ZappoMan
778209ffe4 fix bug in Menu.removeMenu() for trees of menus 2014-03-24 16:28:07 -07:00
ZappoMan
938959a9f6 expose application settings to JS 2014-03-22 21:20:35 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
stojce
9077a05f9d - Layout fix 
- Model browsers
- merge
 2014-03-21 22:34:10 +01:00
Atlante45
e68500e11f Made models line edit editable 2014-03-20 12:49:51 -07:00
Atlante45
c658b1dded Modified menu upload categories 2014-03-20 12:45:19 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing 
Model browsing
 2014-03-20 11:15:35 -07:00
stojce
a0a6e537f0 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-19 14:21:48 +01:00
Atlante45
a80f81c246 typo 2014-03-18 17:48:17 -07:00
Atlante45
76c2a9fdad Modified Browser to be able to dowload all the fst file when there are more than 1000 2014-03-18 17:36:05 -07:00
Ryan
07497ea4f7 removing fly to voxel option 2014-03-18 15:35:25 -07:00
Atlante45
0a80f8fcd6 Added browse buttons in the menu 2014-03-18 13:59:08 -07:00
stojce
913783c0f1 resizing 
- fixed layout
 2014-03-16 22:47:03 +01:00
stojce
21b54fd07a Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
 2014-03-16 09:25:31 +01:00
stojce
19e60a1fc0 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
stojce
716979071c Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-15 19:35:34 +01:00
stojce
4e2d3c9549 styling QSlider 2014-03-14 23:24:32 +01:00
stojce
6d15fb548c Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-14 21:05:30 +01:00
stojce
576b8acef3 CR fixes 2014-03-14 20:09:03 +01:00
Andrzej Kapolka
5f7e41b79b More dock widget tweaks. 2014-03-14 10:55:27 -07:00
Andrzej Kapolka
b721533f0b Make chat a dock widget, since that's the behavior it's emulating anyway 
(and for some reason, the current strategy causes a problem on at least Ryan's
and my machine).
 2014-03-14 10:43:12 -07:00
stojce
4b182bb3e2 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-14 18:22:03 +01:00
stojce
72a92a16e6 Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	interface/interface_en.ts
 2014-03-14 01:52:53 +01:00
stojce
a29025a739 New layout 2014-03-14 01:51:22 +01:00
Andrzej Kapolka
95e59d7004 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
 2014-03-13 16:56:06 -07:00
Andrzej Kapolka
9d1278b663 Wait until we know that Faceshift didn't connect before we attempt to 
initialize Visage.
 2014-03-13 16:18:47 -07:00
Dimitar Dobrev
85a15a2284 Moved the chat from a window to a built-in panel. 2014-03-14 01:12:25 +02:00
Andrzej Kapolka
fc32d9581d Visage toggle bits. 2014-03-13 15:17:16 -07:00
Atlante45
51585acd25 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 10:53:24 -07:00
stojce
939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/src/Menu.h
 2014-03-13 18:41:58 +01:00
Dimitar Dobrev
442ca145da Hid the chat window rather than close it in order to preserve sent 
messages.
 2014-03-13 14:07:21 +02:00
stojce
e231c8486b Using singleton for location manager 2014-03-13 07:47:33 +01:00
stojce
cd1ec97d28 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-13 07:42:31 +01:00
Dimitar Dobrev
727903b216 Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02: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
stojce
004e8e02d5 Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	interface/interface_en.ts
 2014-03-12 23:03:26 +01:00
stojce
fd201c450b Multiple destinations implementation 2014-03-12 23:02:21 +01:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Atlante45
855f6fcf59 Moved Avatar upload to file Menu 2014-03-12 11:46:41 -07:00
ZappoMan
4b60c549e7 add LOD to overlay display 2014-03-12 11:10:52 -07:00
Dimitar Dobrev
4c26f025ac Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry. 2014-03-12 20:04:22 +02:00
stojce
7afd6c3d0c Merge branch 'master' of https://github.com/worklist/hifi into 19495 
Conflicts:
	libraries/shared/src/AccountManager.h
 2014-03-12 18:54:59 +01:00
stojce
95d0128c74 Using new API client 2014-03-12 18:53:25 +01: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
Dimitar Dobrev
52c8ccb698 Added a define to ensure the build works without qxmpp. 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
437cadf360 Added a basic version of the chat window. 2014-03-12 01:24:30 +02:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
stojce
8decf55e3f Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-08 13:19:45 +01:00
Atlante45
8faaa28bc1 FST ploader base 2014-03-07 11:55:02 -08:00
ZappoMan
13985f8149 fix crash in Menu.removeSeparator() if the menu item doesn't exist or isn't a separator 2014-03-05 21:17:25 -08:00
ZappoMan
8e553c7497 fix potential crash in setIsOptionChecked() added support for positioning separators 2014-03-03 12:03:56 -08:00
ZappoMan
85b40f2d13 fix crash in Menu.isOptionChecked() if menu item doesn't exist 2014-03-03 04:05:44 -08:00
ZappoMan
372561195a remove voxel drumming from C++ 2014-03-03 04:00:06 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
stojce
e2f95de8c1 merge 2014-03-02 13:50:15 +01:00
Philip Rosedale
7a2279bda8 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 23:31:45 -08:00
Philip Rosedale
d5e106b30d collision submenu only under edit (I don’t think you can make same one twice) 2014-02-27 23:29:29 -08:00
ZappoMan
19b7189269 switch AUTO LOD to use moving avarage of FPS, and also tweak the min and max behavior 2014-02-27 18:00:58 -08:00
Philip Rosedale
fb97abf128 reset audio connection on prefs changes 2014-02-27 17:35:23 -08:00
ZappoMan
b7f62eabf0 clean up more menu items 2014-02-27 15:25:39 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
stojce
b619eb7de0 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-02-26 23:09:49 +01:00
Stephen Birarda
7067cf2ab3 fix go to user and address update for new API 2014-02-26 13:40:49 -08:00
stojce
4bb77c5de7 merge upstream 2014-02-26 22:24:08 +01:00
stojce
6383457e4e styling 
bad merge fix
 2014-02-26 22:15:12 +01:00
ZappoMan
7a2419a5bd removed old menu items for voxel protocol options 2014-02-26 01:54:32 -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
869b35a7aa remove old c++ implementation of voxel tools 2014-02-25 21:38:10 -08:00
ZappoMan
d3594808d9 some cruft cleanup 2014-02-25 20:45:49 -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
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
ZappoMan
e03c7be5ef moved MenuScriptingInterface to own files 2014-02-25 14:33:37 -08:00
ZappoMan
e12d791097 remove dead code 2014-02-25 12:37:49 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
stojce
303fddd93b Bad merge fix 2014-02-25 21:19:43 +01:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -08:00
stojce
3ced4c9bef Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-02-25 20:58:07 +01:00
Stephen Birarda
1163cfd07e if the domain-server provides no auth, assume default 2014-02-25 10:58:32 -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
ZappoMan
cb01c1ee10 add separator support 2014-02-24 23:53:26 -08:00
ZappoMan
374b12980b added checkable menus and sub menus 2014-02-24 23:42:05 -08:00
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
ZappoMan
03f8885cad first cut at menus JS 2014-02-24 19:09:22 -08:00
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
Stephen Birarda
f20808b47f remove option to drive from transmitter 2014-02-24 15:11:02 -08:00
Stephen Birarda
4a4001a049 remove pairing logic from interface 2014-02-24 15:03:10 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00