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

2661 commits

Author SHA1 Message Date
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
David Rowe
170e328f5a Fix similar problem for HMD third person view 
getUprightHeadPosition() changes with avatar lean.
 2014-10-31 12:40:16 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
David Rowe
ccc5e0d6ca Increase Interface's disk cache from default 50MB to 10GB 2014-10-31 10:06:43 -07:00
ZappoMan
e78ac4c1d4 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 16:36:19 -07:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8 Merge pull request #3706 from huffman/entity-tool-help 
Add edit entities help window
 2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Stephen Birarda
45763a96d7 Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays 
Shadows to3 d overlays
 2014-10-30 09:21:25 -07:00
ZappoMan
2570caca40 move 3D overlay rendering into the render portion that supports lighting and shadows 2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub
e314fa1fc3 Merge pull request #3652 from ctrlaltdavid/19976 
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
 2014-10-29 20:46:12 -07:00
Stephen Birarda
5b3897f1cf Merge pull request #3690 from ZappoMan/rayPickSubMeshes 
Ray pick sub meshes
 2014-10-29 12:10:29 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Sam Gateau
dbdd5293fa Merged with master 2014-10-28 18:31:02 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Sam Gateau
0dab1c2bc5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-28 14:50:39 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Sam Gateau
88eaeaee7d Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api 2014-10-28 14:42:22 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Stojce
1229f0e8fa Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 21:39:36 +01:00
Stephen Birarda
477b5096e8 don't start/end action/back events on auto-repeat 2014-10-28 11:34:31 -07:00
David Rowe
adf168b7ea Remove ATL build dependency for Windows speech recognizer 2014-10-28 11:14:45 -07:00
Stojce
1debad3969 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 17:22:00 +01:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby 
initial groundwork for lobby interface
 2014-10-28 08:48:33 -07:00
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07:00
Stojce
9be107c9c1 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-28 08:24:23 +01:00
Brad Hefta-Gaub
b506a99200 Merge pull request #3671 from ctrlaltdavid/20107 
CR for Job #20107 - Keys p and h and some control keys wont override
 2014-10-27 20:30:15 -07:00
Brad Hefta-Gaub
cfe26ead6e Merge pull request #3669 from lycanthus/20074 
Worklist #20074
 2014-10-27 20:29:23 -07:00
Stephen Birarda
80d9014726 have spacebar fire an action event at center of screen 2014-10-27 16:54:28 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
04e7e979aa bubble up HFCancelEvent from ESC key 2014-10-27 15:42:40 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
0ddf665b86 add an HFMetaEvent class as super class for meta events 2014-10-27 12:56:48 -07:00
Stephen Birarda
6626787ae5 have mouse press/release fire HFActionEvent 2014-10-27 11:40:33 -07:00
Pete
8d97a20bd9 Worklist #20074 
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
 2014-10-26 21:14:20 -07:00
Stojce
61c80183ad fix for mirror size on different scale resloutions 2014-10-26 08:12:07 +01:00
David Rowe
c6463abfb8 Prevent keys captured by script from being used as menu shortcuts 2014-10-25 09:22:30 -07:00
David Rowe
5f91f583e8 Merge branch 'master' into 19976 
Conflicts:
	interface/CMakeLists.txt
 2014-10-24 20:34:45 -07:00
David Rowe
f373719f02 Don't include speech recognition if building with Visual Studio Express 2014-10-24 20:12:23 -07:00
Philip Rosedale
2dff75dac1 Merge pull request #3665 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-24 19:45:26 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
David Rowe
38524b3349 Merge branch 'master' into 19976 2014-10-24 15:43:55 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
ac269e16c0 start working on the target framerate control 2014-10-23 13:19:34 -07:00
stojce
4e75837a64 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-23 14:26:13 +02:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
stojce
a3707a09ae fix mirror ratio on retina 2014-10-22 09:42:55 +02:00
David Rowe
524c413681 Enable SpeechRecognizer menu item and JavaScript object for Windows 2014-10-20 13:52:37 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Brad Hefta-Gaub
c9c3ab985a Merge pull request #3565 from PhilipRosedale/master 
Simplify camera class to have no interpolation, simpler structure
 2014-10-08 17:06:21 -07:00
Philip Rosedale
cdd60dead2 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-08 15:28:56 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b Fix full screen mirror keyboard controls 2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb Fix third person camera distance 2014-10-08 10:23:45 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
David Rowe
32399d8620 Delete calibration message if exit VR display while calibrating 2014-10-04 20:07:37 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Stephen Birarda
5203113b41 separate ICE ID and domain ID for reconnections to moved domains 2014-10-03 17:01:33 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
David Rowe
d3b37684cd Add VR display auto-calibration logic 2014-10-03 13:46:41 -07:00
Stephen Birarda
52ec949aac Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6 don't store domain hostname, leverage AddressManager only 2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab load Address from settings to get back to domain and path 2014-10-03 10:42:15 -07:00
Stephen Birarda
f27105100a have AddressManager know its current domain and current path 2014-10-03 10:29:02 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
Stephen Birarda
262054d0eb handle ICE requirement in address manager response 2014-10-02 14:18:17 -07:00
Philip Rosedale
8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048 
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
 2014-09-30 21:06:45 -07:00
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -07:00
Stephen Birarda
3c236cc60a resolve conflicts on merge with upstream master 2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d Reference camera object rather than copy it 2014-09-29 15:46:22 -07:00
Stephen Birarda
a847c2d80d move url handling to after settings load debug 2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686 handle avatar location changes after avatar position has been reloaded 2014-09-29 13:14:25 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Stephen Birarda
eb7ee36168 use two dashes for url as command line option 2014-09-29 10:29:40 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -07:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
stojce
92cb17cbbe Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 
Conflicts:
	interface/src/Menu.h
 2014-09-24 09:25:04 +02:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
stojce
8031454f61 use backslash to activate chat 2014-09-24 00:22:51 +02:00
Philip Rosedale
729d3cf9bc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054 
Code Review for Job #20054
 2014-09-23 09:57:31 -07:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00