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
