Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-03 06:39:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11615 commits 70 branches 57 tags 1.2 GiB
Commit graph

1832 commits

Author SHA1 Message Date
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
bf9929e64d Since the bucky balls are showing up in the hot spots list when profiling, 
don't simulate them if they're disabled.
 2014-03-11 17:16:49 -07:00
Clement
dcaef45f2e More work on editVoxel.js 2014-03-11 16:01:21 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -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
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Stephen Birarda
8cbdf5d94a Merge branch 'master' of https://github.com/highfidelity/hifi into resources 2014-03-06 15:49:45 -08:00
Stephen Birarda
ac66f09157 Merge pull request #2194 from AndrewMeadows/cleanup 
g++ warnings
 2014-03-06 15:49:22 -08:00
Stephen Birarda
87d908a3bc resolve conflicts on merge with upstream master 2014-03-06 15:03:03 -08:00
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Stephen Birarda
27d486c0a1 resolve conflicts on merge with upstream master 2014-03-06 14:47:58 -08:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Stephen Birarda
ede32b5f1a resolve conflicts on merge with upstream master 2014-03-05 15:31:00 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
Stephen Birarda
395263ff3d add time to the interface logs - closes #2205 2014-03-05 09:55:06 -08:00
ZappoMan
c031359a54 fix infinite reloading of missing script files 2014-03-04 16:20:17 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Atlante45
f90062b38c Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix 2014-03-04 13:18:22 -08:00
Atlante45
3c99cf162d Fix was at the wrong spot 2014-03-04 13:17:19 -08:00
Andrew Meadows
16a5af1a8e fix warning about signed/unsigned comparison 2014-03-04 11:53:08 -08:00
ZappoMan
d5e7e98b5e Merge pull request #2192 from Atlante45/freeglut_fix 
fix for windows
 2014-03-04 11:51:14 -08:00
Atlante45
9767846c91 fix for windows 2014-03-04 11:06:23 -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
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
Andrzej Kapolka
64c4e58160 Tie the avatar LOD distance multiplier to the LOD parameter calculated for 
voxels.
 2014-03-03 16:34:28 -08:00
Andrzej Kapolka
85083d74bc Fix for annoying "QThreadStorage" warning. 2014-03-03 13:39:01 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -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
5f6a60e786 removed more VoxelSystem wrappers, call VoxelTree directly 2014-03-02 16:40:27 -08:00
ZappoMan
f0e73d2f98 removed VoxelSystem::findRayIntersection() use tree directly 2014-03-02 15:46:33 -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
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
ZappoMan
7d45cc857b fix warning 2014-03-01 12:53:01 -08:00
Atlante45
af691e1f75 Some comments and debug messages 2014-02-28 15:14:01 -08:00
Atlante45
fb10676121 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-28 11:32:27 -08:00
Philip Rosedale
bae16e24e8 new audio buffer display text, cleanup drawText() 2014-02-27 23:17:39 -08:00
Philip Rosedale
5f8c5d36da Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 20:29:35 -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
Philip Rosedale
7ce380a333 relocate mute button, audio scope 2014-02-27 18:02:53 -08:00
Atlante45
2ee7974fa8 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 17:53:59 -08:00
Philip Rosedale
f06b30e024 remove audio barograph latency display 2014-02-27 17:45:47 -08:00
ZappoMan
1cc6288899 add back in entry point for import voxels 2014-02-27 15:41:36 -08:00
ZappoMan
b7f62eabf0 clean up more menu items 2014-02-27 15:25:39 -08:00
Atlante45
b07081407a Made commom string name static const 2014-02-27 14:47:05 -08:00
Atlante45
0026002ecb Added domain and clipboard to the local trees 2014-02-27 14:38:18 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
Stephen Birarda
7067cf2ab3 fix go to user and address update for new API 2014-02-26 13:40:49 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Andrzej Kapolka
1265f83f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-26 12:12:18 -08:00
Andrzej Kapolka
8644280eb5 Make sure our mode is fully established before we use the mirror camera to 
render the billboard.  Closes #2103.
 2014-02-26 12:11:03 -08:00
ZappoMan
7a2419a5bd removed old menu items for voxel protocol options 2014-02-26 01:54:32 -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
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
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
Andrzej Kapolka
8554c1dfbf Force a minimum convergence distance on the eyes. Closes #2100. 2014-02-25 16:50:59 -08:00
ZappoMan
81bff60645 change singleton approach to not require delete 2014-02-25 14:53:57 -08:00
ZappoMan
e03c7be5ef moved MenuScriptingInterface to own files 2014-02-25 14:33:37 -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
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -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
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -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
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
8efc4d52ba Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 11:34:12 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
ZappoMan
6ea2c81e68 fix reload of scripts 2014-02-24 10:10:00 -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
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
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
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49: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
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
7f9794d52b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-20 10:14:47 -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
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Atlante45
b69bdccc8f Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 16:11:31 -08:00
Stephen Birarda
57538af8fd give a separate QNetworkAccessManager to the AccountManager 2014-02-19 14:19:00 -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
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
Atlante45
406768bf12 Code style fixes 2014-02-19 13:13:17 -08:00
Stephen Birarda
78c246f1ba repair to saveSnapshot call from interface 2014-02-19 13:08:57 -08:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Atlante45
919891d73c Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 12:38:08 -08:00
Atlante45
f24cd0ceba Added switch to pasteMode after successful import. 2014-02-19 12:34:38 -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
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
ZappoMan
bf814410ac first cut at exposing clipboard support to JavaScript 2014-02-19 00:10:16 -08:00
Andrew Meadows
4010f3ab3f Remove Avatar::_head, use AvatarData::_headData 2014-02-18 17:41:46 -08:00
Andrzej Kapolka
9c4143e1be Working on gaze deflection. 2014-02-18 17:03:43 -08:00
Andrzej Kapolka
ada2594ad1 Working on getting the head translation, too. 2014-02-18 16:36:54 -08:00
Andrzej Kapolka
f83254882a Attempting to get the head rotation from Visage. 2014-02-18 16:07:08 -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
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
Andrew Meadows
4b58d04c17 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 2014-02-18 15:00:39 -08:00
Stephen Birarda
b57a5cea6a complete access token request flow after login window presentation 2014-02-18 14:27:52 -08:00
Stephen Birarda
8a0136efe1 more work on authentication, show login window when domain asks 2014-02-18 13:21:32 -08:00
Stephen Birarda
c762b92e5a replace DataServerClient and Profile with AccountManager 2014-02-18 11:27:37 -08:00
Stephen Birarda
37f1f7ba4f add a DomainInfo class to hold domain information 2014-02-18 09:59:22 -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
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
Andrew Meadows
48f28ecee7 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 
Conflicts:
	interface/src/Menu.h
	interface/src/avatar/Avatar.cpp
 2014-02-17 12:12:47 -08:00
Andrew Meadows
6ce028bbab Simplifiy API for camera mode transitions 
Specify the "period" for the transition rather than the "rate".
 2014-02-17 10:27:33 -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
Philip Rosedale
37e1c00828 Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop 
Automatically Adjust LOD
 2014-02-16 18:14:24 -08:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36: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
cd137b2b12 tweak to reload scripts 2014-02-13 21:00:20 -08:00
ZappoMan
9d841ce918 add Stop All Scripts and Reload All Scripts 2014-02-13 18:19:20 -08:00