ZappoMan
b2c342c5c7
add support for unload method
2014-11-20 15:36:28 -08:00
Atlante45
4d5451fafe
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/SkeletonModel.cpp
2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
dev
fc54ad93b8
refining the avatar display name rendering with different behavior if in HMD mode or not
2014-11-19 11:46:59 -08:00
dev
ce50152863
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-11-19 01:06:33 -08:00
dev
4028e66c08
trying to fix the lighting issue in stereo and fix the display name size and orientation
2014-11-18 18:59:54 -08:00
Stephen Birarda
2274b35d08
connect to sandbox domain by default
2014-11-18 15:35:11 -08:00
David Rowe
bb15fc138c
Fix Bandwidth Details dialog opening if click meter's pos when UI hidden
2014-11-15 09:28:40 -08:00
Sam Gateau
0973d197cf
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-11-14 12:25:00 -08:00
Brad Hefta-Gaub
1d14f94cb0
Merge pull request #3797 from huffman/entity-tool-properties
...
Entity Tools - Properties window, Tool window, Various fixes
2014-11-14 11:48:57 -08:00
Sam Gateau
cc78000641
introduce the concept of side thorugh out the rendering traversal
2014-11-14 11:22:11 -08:00
Ryan Huffman
28eebd3fa5
Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties
2014-11-14 10:53:18 -08:00
Ryan Huffman
604b1b620b
Move dock window to ToolWindow
2014-11-14 10:52:08 -08:00
Stephen Birarda
903cd05ff8
put newlines back in interface log
2014-11-14 10:39:45 -08:00
Sam Gateau
f09b58c255
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba
first draft of factorizing the rendering traversal for both sides in stereo
2014-11-14 09:56:36 -08:00
Brad Hefta-Gaub
27c37f3a4e
Merge pull request #3784 from ctrlaltdavid/20157
...
CR for Job #20157 - Enable "Get Overlay properties" from javascript
2014-11-13 20:43:38 -08:00
Ryan Huffman
6b2a497810
Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes
2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8
Add tool window
2014-11-13 17:47:02 -08:00
David Rowe
8076bfea72
Merge branch 'master' into 20157
...
Conflicts:
interface/src/ui/overlays/Text3DOverlay.cpp
2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75
avoid Qt QTimer thread bug by putting SoundCache on same thread
2014-11-13 14:47:28 -08:00
Sam Gateau
7e2c4c0561
SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint
2014-11-13 10:57:32 -08:00
ZappoMan
13f08e65d1
Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering
...
Conflicts:
interface/src/renderer/Model.h
2014-11-12 19:31:27 -08:00
Sam Gateau
c0496fd466
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-11-12 16:52:34 -08:00
Sam Gateau
d3a7b011bf
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp
2014-11-12 16:52:11 -08:00
Sam Gateau
8fb04af59d
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design
2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub
70c463695a
Merge pull request #3779 from PhilipRosedale/master
...
Remove buckyBalls and faceshift lean-to-drive
2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub
331e9d6558
Merge pull request #3775 from birarda/lobby
...
repairs to local audio injection
2014-11-12 16:26:38 -08:00
David Rowe
8c3bedae9d
Add position vector and color object script value examples
...
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
2014-11-12 14:33:52 -08:00
Philip Rosedale
6af2b7aadf
remove buckyballs and face shift lean driving (should be a script if desired)
2014-11-12 07:33:59 -08:00
Sam Gateau
5f0fdeccb2
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-11-12 00:27:12 -08:00
Sam Gateau
b716a512c6
Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level
2014-11-12 00:26:44 -08:00
Stephen Birarda
b7b371ba61
resolve conflicts on merge with upstream master
2014-11-11 20:53:24 -08:00
Stephen Birarda
9bd870f4b0
fix hifi url handling after update to 5.3.2
2014-11-11 20:45:04 -08:00
Sam Gateau
7a9f45d34f
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-11-11 16:40:11 -08:00
Sam Gateau
668c5e298d
clean up the Transform class and the rendering path in Model.cpp
2014-11-11 16:39:00 -08:00
Stephen Birarda
0e30c65e60
handle cleanup of local injection, volume
2014-11-11 15:12:11 -08:00
Stephen Birarda
d0e8c294da
handle passing of local audio interface to AudioInjector
2014-11-11 11:22:16 -08:00
Ryan Huffman
bedd9c76f2
Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool
...
Conflicts:
examples/newEditEntities.js
2014-11-11 10:48:49 -08:00
Ryan Huffman
a1d771a0be
Rename WebWindow to WebWindowClass
2014-11-11 10:03:14 -08:00
Sam Gateau
ad51416c28
move the transform class files to the Shared library, still problem with negative scale composition
2014-11-11 09:54:35 -08:00
Andrzej Kapolka
5f89b6e00e
The spec actually says that the 'L' (should have been 'LL' anyway) isn't
...
necessary; the compiler will know to read the constant as a long long.
2014-11-10 11:58:52 -08:00
Sam Gateau
7ccb7495c7
Merge and resolve conflict on APplication.cpp
2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78
let's start reusing the Batch per model from frame to frame
2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub
fc89f92097
Revert "Revert "Fix build warning""
2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub
09490b58b4
Revert "Fix build warning"
2014-11-07 21:47:28 -08:00
David Rowe
94d82455a0
Fix build warning
2014-11-07 19:56:54 -08:00
Andrzej Kapolka
cd110d6048
Fix for invalid projection matrix on startup.
2014-11-07 14:35:01 -08:00
Andrzej Kapolka
7008012492
Trigger fixes.
2014-11-07 14:20:31 -08:00
Andrzej Kapolka
a4db244182
Mirror/warning fixes.
2014-11-07 13:57:20 -08:00
Stephen Birarda
beb7c339f3
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
2014-11-07 11:18:04 -08:00
Stephen Birarda
f1a238a6c2
piping for local UI sounds
2014-11-07 10:08:09 -08:00
Stephen Birarda
0f32346324
resolve conflicts on merge with upstream master
2014-11-07 09:10:12 -08:00
ZappoMan
55576e7f9d
fix crash in mouse messages while quitting
2014-11-06 17:53:22 -08:00
ZappoMan
bceab4ead9
clear all octree related state when disconnecting from a domain
2014-11-06 17:25:49 -08:00
Stephen Birarda
455cbac8a5
repairs to node hash iterations in Application
2014-11-06 15:16:45 -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
8a72cdd59d
leverage new libcuckoo hash outside LimitedNodeList
2014-11-05 15:09: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
