Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-01 14:42:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11615 commits 70 branches 56 tags 1.2 GiB
Commit graph

1832 commits

Author SHA1 Message Date
Andrzej Kapolka
361276d133 Use a spherical estimate of the shadowed region to avoid growing and shrinking 
it as we turn around.  Also, might as well render shadows for the billboards.
 2014-03-27 16:19:21 -07:00
Philip Rosedale
c8cacf75f3 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-27 15:16:11 -07:00
Philip Rosedale
41e9017953 more audio level meter work, improved gun 2014-03-27 15:14:38 -07:00
Andrzej Kapolka
077df3906f Make sure we reset our LOD adjustments before we switch back from throttling 
the renderer.
 2014-03-27 15:02:26 -07:00
Atlante45
11f40258b3 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-27 10:12:34 -07:00
Philip Rosedale
101de1e0e5 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 23:24:44 -07:00
Andrzej Kapolka
52c8a865f1 Provide a means of tracking resource download progress. Until we have a 
user-friendly progress meter/throbber, put the download progress in the
extended stats.
 2014-03-26 15:53:19 -07:00
Atlante45
718b8f7eb9 Changed back to upload either head or skeleton 2014-03-26 15:07:19 -07:00
Philip Rosedale
d90244c01e first pass, clipping audio meter 2014-03-25 22:31:44 -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
f10d5e23f8 set firstRun so it only happens once 2014-03-25 00:57:29 -07: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
7bc0c8eff0 Missed a spot. 2014-03-24 15:07:57 -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
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
Lucas Crisman
e545c2ac65 Stats tweaks: fonts adjustments 2014-03-24 14:57:40 -03:00
ZappoMan
82d620b1d9 add support for AudioDevice scripting interface, and switching audio input/output device on the fly 2014-03-23 11:26:27 -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
ZappoMan
c70bbda10a kill local voxels on domain change 2014-03-21 18:16:28 -07:00
Lucas Crisman
5fe59acb87 Stats variable width for panels 2014-03-21 14:10:00 -03:00
Atlante45
746d109025 Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 16:10:33 -07:00
Atlante45
39a6e03476 Modified MyAvatar to support more JS 2014-03-20 12:09:33 -07:00
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the 
X/Z axes.  The default environment is flat.  Closes #2378.
 2014-03-20 12:09:20 -07: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
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
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
5f6f4b3d37 Fixes required since enabling Faceshift is now the default. 2014-03-13 16:45:27 -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
Atlante45
423f26f669 Review comments 2014-03-13 15:26:02 -07:00
Atlante45
0748682119 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-13 15:04:49 -07:00
Andrzej Kapolka
b2a29cb84f Fixes for Linux build. 2014-03-13 10:56:19 -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
5cb9ea8402 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader 2014-03-12 11:49:20 -07:00
Atlante45
b9ee60ba41 FstReader not a member anymore 2014-03-12 11:47:47 -07:00
AndrewMeadows
1f80a5a074 Merge pull request #2269 from ey6es/master 
Fix for white flashes when loading avatars, performance improvements.
 2014-03-12 11:43:13 -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
ZappoMan
a95fd55172 suppress sending of extra queries when the client's view hasn't changed 2014-03-12 01:11:21 -07: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
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