Stephen Birarda
27f7cdb2d4
handle location set/get in AddressManager, handle set to address map
2014-10-28 10:35:56 -07:00
Stephen Birarda
cb7a6cb93c
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
2014-10-28 08:40:20 -07: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
Andrzej Kapolka
fc3f27b70a
Merge pull request #3670 from samcake/temp0
...
Add NSIGHT profiling information to the Build
2014-10-27 17:03:19 -07:00
Andrzej Kapolka
2db893c23c
Merge pull request #3668 from AndrewMeadows/experimental
...
Experimental feature: skeleton offset
2014-10-27 17:02:01 -07:00
Stephen Birarda
e2536dd3f8
remove a debug line
2014-10-27 16:55:24 -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
209c12cb1c
repairs for texture replacement by name
2014-10-27 16:52:22 -07:00
Stephen Birarda
bb652c0784
rename signal in AbstractControllerScriptingInterface from cancel to back
2014-10-27 16:01:39 -07:00
Stephen Birarda
8e6b6d5294
have controller A button fire action at center of screen
2014-10-27 15:58:42 -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
7b5115c35f
add a new meta event, HFCancelEvent
2014-10-27 15:37:31 -07:00
Stephen Birarda
c3fe7c7497
send global HFActionEvent from ControllerScriptingInterface
2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c
Avoid killing the updater twice.
2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5
Fix for crash on exit.
2014-10-27 15:01:06 -07:00
Sam Gateau
6101c3b758
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-10-27 14:55:42 -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
Sam Gateau
89f9e5b01b
try to get more coherent names
2014-10-27 11:49:51 -07:00
Sam Gateau
ff44a460d6
Add NSIGHT Profiliing capability
2014-10-27 11:40:52 -07:00
Stephen Birarda
6626787ae5
have mouse press/release fire HFActionEvent
2014-10-27 11:40:33 -07:00
Stephen Birarda
55735a3f0d
add start and end to HFActionEvent
2014-10-27 11:11:23 -07:00
Stephen Birarda
d09c9233d8
add position to HFActionEvent
2014-10-27 10:55:16 -07:00
AndrewMeadows
9d93ec5a5a
Merge pull request #3656 from huffman/separate-camera-tool
...
Add camera move tool for editing
2014-10-27 10:54:02 -07:00
Stephen Birarda
b7ebc9e902
add a class for custom HFActionEvent
2014-10-27 10:51:48 -07:00
Andrew Meadows
f25cfc0c7f
remove debug code
2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296
Merge upstream/master into andrew/experimental
2014-10-27 10:08:48 -07:00
Stephen Birarda
d5a3ea77ff
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
2014-10-27 09:28:50 -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
David Rowe
0fdcf381fa
Code tidy
2014-10-25 09:23:37 -07:00
David Rowe
c6463abfb8
Prevent keys captured by script from being used as menu shortcuts
2014-10-25 09:22:30 -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
334e032c17
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-10-24 17:58:54 -07:00
Sam Gateau
80a87b3b44
framerate is as fast as the display can go
2014-10-24 17:50:31 -07:00
Stephen Birarda
57e7fa233f
Merge pull request #3664 from PhilipRosedale/master
...
Tour Guide script to let you follow people, better hair
2014-10-24 17:10:57 -07:00
Philip Rosedale
33204b0d27
Merge pull request #3660 from birarda/xbox-controller
...
add a guard in case SDL misreports number of axes
2014-10-24 17:06:51 -07:00
Andrzej Kapolka
8684384316
Disconnect metavoxel LOD from avatar LOD.
2014-10-24 16:38:57 -07:00
Philip Rosedale
d5d0fbd9d8
Hair gravity always the same
2014-10-24 16:08:01 -07:00
Stephen Birarda
fa174029fd
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-24 15:26:39 -07:00
Stephen Birarda
c57fc314f0
just resize axis vector is sdl decides to lie about the number of axes
2014-10-24 15:13:54 -07:00
Stephen Birarda
9289249df5
add a guard in case SDL somehow forgets about axes
2014-10-24 15:06:18 -07:00
Philip Rosedale
ab557447f2
fix uninitialized mouth blending variables
2014-10-24 12:51:54 -07:00
Stephen Birarda
3b436e04ae
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-24 09:43:04 -07:00
Sam Gateau
5b0fd99115
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-10-24 09:28:13 -07:00
AndrewMeadows
31a1b8bb06
Merge pull request #3651 from PhilipRosedale/master
...
Better animation for audio-only mouth movement
2014-10-24 08:46:32 -07:00
Philip Rosedale
e5d64a0d5d
Merge pull request #3644 from birarda/data-web-page
...
fix for DataWeb hifi link handling
2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d
Merge pull request #3657 from ey6es/metavoxels
...
Further incremental improvements to heightfield voxelization.
2014-10-23 21:10:21 -07:00
Andrzej Kapolka
003d2f031a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-23 16:15:11 -07:00
