Geenz
|
5efda079c9
|
Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down.
|
2013-05-27 18:48:05 -04:00 |
|
Geenz
|
94a07b92a7
|
Documentation for #19308.
|
2013-05-27 15:54:32 -04:00 |
|
Geenz
|
93eac0c0dc
|
Setup various debug options.
|
2013-05-27 12:56:41 -04:00 |
|
Geenz
|
17a5e6a700
|
First round of settings serialization. Setup an API to load and save different settings to the avatar data file.
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
|
2013-05-27 12:37:42 -04:00 |
|
Philip Rosedale
|
6b3f35ef19
|
Merge pull request #393 from ey6es/master
Put all environment data in the same packet and only send it off about once a second.
|
2013-05-22 21:11:22 -07:00 |
|
birarda
|
380b26b6b6
|
Merge pull request #402 from birarda/master
head mouse fix
|
2013-05-22 19:46:52 -07:00 |
|
Stephen Birarda
|
120c835004
|
fix head mouse
|
2013-05-22 19:46:33 -07:00 |
|
birarda
|
b6e0207264
|
Merge pull request #400 from birarda/master
correct signs for yaw and roll from invensense
|
2013-05-22 19:38:59 -07:00 |
|
Stephen Birarda
|
d7a1cc6ea8
|
correct the sign for yaw and roll for invensense serial data
|
2013-05-22 19:38:17 -07:00 |
|
birarda
|
8b95db2bd4
|
Merge pull request #399 from birarda/master
complete fix for oculus rendering
|
2013-05-22 19:16:49 -07:00 |
|
Stephen Birarda
|
3e192cda9b
|
correct rendering for first-person for oculus
|
2013-05-22 19:15:52 -07:00 |
|
birarda
|
3e16e6a36c
|
Merge pull request #398 from birarda/master
correct sign of yaw for oculus
|
2013-05-22 18:57:06 -07:00 |
|
Stephen Birarda
|
997a10c981
|
correct the sign of yaw for oculus
|
2013-05-22 18:56:38 -07:00 |
|
Jeffrey Ventrella
|
7da3b8af4e
|
Merge pull request #397 from Ventrella/master
another fix
|
2013-05-22 18:34:03 -07:00 |
|
Jeffrey Ventrella
|
83c12ae9af
|
etc
|
2013-05-22 18:31:22 -07:00 |
|
birarda
|
a8ef537fe0
|
Merge pull request #396 from Ventrella/master
working on pitch yaw roll in avatar head
|
2013-05-22 18:21:13 -07:00 |
|
Jeffrey Ventrella
|
82af516471
|
ya ya
|
2013-05-22 18:16:11 -07:00 |
|
Jeffrey Ventrella
|
b7613497eb
|
fixed pitch yaw (not roll)
|
2013-05-22 18:14:18 -07:00 |
|
Philip Rosedale
|
818201a27c
|
Merge pull request #395 from Ventrella/master
added first person transition
|
2013-05-22 17:43:32 -07:00 |
|
Jeffrey Ventrella
|
2f943b697a
|
cleanup
|
2013-05-22 17:27:48 -07:00 |
|
Jeffrey Ventrella
|
549d3a3671
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 17:25:06 -07:00 |
|
birarda
|
5a699306d2
|
Merge pull request #394 from birarda/master
remove a setter in AudioInjector
|
2013-05-22 17:24:50 -07:00 |
|
Jeffrey Ventrella
|
8b49cfbf93
|
added back transitions to first person
|
2013-05-22 17:24:46 -07:00 |
|
Stephen Birarda
|
21cdf4ada5
|
remove setter for isInjectingAudio - shouldn't be set externally
|
2013-05-22 17:23:46 -07:00 |
|
Andrzej Kapolka
|
a68c8c6389
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 17:11:03 -07:00 |
|
Andrzej Kapolka
|
629c7b0146
|
Send all environment data in the same packet and only send it about once a
second.
|
2013-05-22 17:09:35 -07:00 |
|
ZappoMan
|
da39f28211
|
Merge pull request #392 from birarda/oculus
fix broken head rotation set based on copy return
|
2013-05-22 16:51:13 -07:00 |
|
Stephen Birarda
|
9657265c24
|
remove a debug line from setHeadFromGyros
|
2013-05-22 16:50:17 -07:00 |
|
Stephen Birarda
|
a1b556d6a2
|
space out if
|
2013-05-22 16:49:26 -07:00 |
|
Stephen Birarda
|
4738fc888b
|
return Avatar Head by reference so setters actually do something
|
2013-05-22 16:43:41 -07:00 |
|
Andrzej Kapolka
|
832d7f890a
|
Merge pull request #391 from ey6es/master
Disable the righting for now, as well as the flat "floor" (to prevent sliding).
|
2013-05-22 16:30:57 -07:00 |
|
Andrzej Kapolka
|
b6e78064d8
|
Disable the righting for now, as well as the "floor" (whose presence makes us
slide, since the gravity vector isn't pointing straight down).
|
2013-05-22 16:29:13 -07:00 |
|
Andrzej Kapolka
|
e48aebdd9e
|
Merge pull request #390 from ey6es/master
Fix for OS X structure initialization.
|
2013-05-22 16:13:55 -07:00 |
|
Andrzej Kapolka
|
96fdc015c5
|
Fix for OS X; the structure wasn't being zero-initialized as I expected.
|
2013-05-22 16:12:14 -07:00 |
|
ZappoMan
|
5a9d3a8436
|
Merge pull request #387 from Ventrella/master
fixes and cleanups in avatar lookat feature
|
2013-05-22 15:54:16 -07:00 |
|
Jeffrey Ventrella
|
f866f39ac4
|
cleanups
|
2013-05-22 15:51:25 -07:00 |
|
Jeffrey Ventrella
|
4940a6ae9a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 15:51:03 -07:00 |
|
Jeffrey Ventrella
|
0b014c5635
|
cleaned up some stuff
|
2013-05-22 15:50:36 -07:00 |
|
ZappoMan
|
a713b97dce
|
Merge pull request #389 from ey6es/master
Fixed threading issue with Environment, some progress on orienting based on gravity (still a work in progress).
|
2013-05-22 15:24:06 -07:00 |
|
Andrzej Kapolka
|
c97b4f5e1d
|
Fix the spacing, and while we're at it, change tabs to spaces.
|
2013-05-22 15:22:05 -07:00 |
|
Andrzej Kapolka
|
d89939e0bd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 15:17:13 -07:00 |
|
ZappoMan
|
f3855e54f9
|
Merge pull request #388 from birarda/master
DRY up the resource copying
|
2013-05-22 15:04:45 -07:00 |
|
Andrzej Kapolka
|
7a8aa7c04f
|
Restore "floor."
|
2013-05-22 14:50:11 -07:00 |
|
Andrzej Kapolka
|
53ae8235f3
|
Fixed threading issue with Environment, more work on avatar righting.
|
2013-05-22 14:43:25 -07:00 |
|
Jeffrey Ventrella
|
7cae808d29
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 14:42:25 -07:00 |
|
Jeffrey Ventrella
|
83e2bf2534
|
added menu option for setting display of lookat vectors
|
2013-05-22 14:42:03 -07:00 |
|
Stephen Birarda
|
200d81e0eb
|
DRY up resource subdir copying for OS X bundle
|
2013-05-22 14:40:01 -07:00 |
|
Andrzej Kapolka
|
dd101b393d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 14:33:31 -07:00 |
|
birarda
|
9ec04855f8
|
Merge pull request #386 from ZappoMan/voxel_animation
Fix some crashing issues on delete
|
2013-05-22 14:27:29 -07:00 |
|
ZappoMan
|
ccd4f5e002
|
CR feedback
|
2013-05-22 14:25:25 -07:00 |
|