Geenz
|
8dea00052d
|
Merge branch 'master' of https://github.com/worklist/hifi into 19361
|
2013-06-09 02:08:29 -04:00 |
|
ZappoMan
|
b60df9ce89
|
Merge pull request #512 from ey6es/gyroquat
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
|
2013-06-08 21:36:07 -07:00 |
|
ZappoMan
|
6fa8c23cca
|
Merge branch 'master' of https://github.com/worklist/hifi into keyhole_frustum
|
2013-06-08 17:28:27 -07:00 |
|
ZappoMan
|
b69cfd4e06
|
fixed CR spacing issue
|
2013-06-08 17:27:48 -07:00 |
|
Philip Rosedale
|
55a5531eb7
|
Merge pull request #514 from ZappoMan/keyhole_frustum
Keyhole frustum
|
2013-06-08 14:22:06 -07:00 |
|
ZappoMan
|
46c66c39e5
|
implement keyhole frustum
|
2013-06-07 17:23:23 -07:00 |
|
Andrzej Kapolka
|
ac2b7d7f48
|
Fix for initial camera transition.
|
2013-06-07 15:20:26 -07:00 |
|
Andrzej Kapolka
|
096dcd089a
|
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
|
2013-06-07 14:28:22 -07:00 |
|
Philip Rosedale
|
202c293a77
|
Merge pull request #513 from Atlante45/19366
19366 - Smaller log display
|
2013-06-07 14:13:49 -07:00 |
|
atlante45
|
b0d02ab7d8
|
19366 - Smaller log display
|
2013-06-07 23:02:00 +02:00 |
|
Andrzej Kapolka
|
5515fc02e4
|
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
|
2013-06-07 13:46:27 -07:00 |
|
Andrzej Kapolka
|
75c89f2c22
|
OK, I found the problem: duplication of state for the "autosave" option.
Let's just use the QAction, as does everything else.
|
2013-06-07 13:42:49 -07:00 |
|
Geenz
|
89ef026ce8
|
Remove seemingly unnecessary coordinate space conversion.
|
2013-06-07 16:42:22 -04:00 |
|
Geenz
|
65ec02044e
|
Add a distance check for selected voxels.
|
2013-06-07 16:34:10 -04:00 |
|
Geenz
|
1c8d4f7717
|
Get the average velocity of the avatar.
|
2013-06-07 16:20:51 -04:00 |
|
Andrzej Kapolka
|
9da10df9f2
|
We need to set these before initMenu, as that's where we create the QSettings.
|
2013-06-07 13:12:59 -07:00 |
|
Geenz
|
82db388552
|
Real max velocity stuff.
|
2013-06-07 16:08:27 -04:00 |
|
Geenz
|
c79bd71fe7
|
Merge branch 'master' of https://github.com/worklist/hifi into 19361
|
2013-06-07 16:00:33 -04:00 |
|
Geenz
|
86316bc674
|
Don't render the voxel selection when we're moving over a maximum velocity.
|
2013-06-07 16:00:13 -04:00 |
|
Andrzej Kapolka
|
953aec35e6
|
Use the default QSettings constructor and let it get the application info
from the QCoreApplication properties.
|
2013-06-07 11:48:29 -07:00 |
|
Stephen Birarda
|
c3915ed078
|
use system flag for external library includes
|
2013-06-07 11:34:01 -07:00 |
|
Andrzej Kapolka
|
a5c24b5333
|
OK, we don't need this sync. Clearly the problem I was seeing on OS X lies
elsewhere.
|
2013-06-07 11:32:26 -07:00 |
|
Andrzej Kapolka
|
dc8a6c2725
|
Store the avatar voxel URL along with the rest of the avatar settings.
|
2013-06-07 11:30:41 -07:00 |
|
Stephen Birarda
|
222a596754
|
remove unnecessary OctalCode include in main
|
2013-06-07 10:59:40 -07:00 |
|
ZappoMan
|
ba7863605c
|
fix several delete/delete[] mismatches
|
2013-06-07 10:49:43 -07:00 |
|
ZappoMan
|
479e8c7811
|
add shortcut key for Kill Local Voxels to help debugging of LOD
|
2013-06-07 10:29:05 -07:00 |
|
ZappoMan
|
887e3428c2
|
cleaned up menus slightly
|
2013-06-07 09:39:24 -07:00 |
|
Philip Rosedale
|
dd0fa021a0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-07 09:19:54 -07:00 |
|
Philip Rosedale
|
f0c9bd45bb
|
Fixed merge
|
2013-06-07 09:19:49 -07:00 |
|
ZappoMan
|
ece117e0b0
|
Merge pull request #502 from ey6es/gyroquat
Increase YAW_DECAY, remove roll from head camera, provide option for pitch/yaw scale (zero by default).
|
2013-06-07 09:17:11 -07:00 |
|
ZappoMan
|
27c3627e02
|
Merge pull request #500 from birarda/master
indentation and NULL comparison repairs in Avatar
|
2013-06-07 09:15:09 -07:00 |
|
atlante45
|
2a1730af72
|
#19365 - Frustum menu moved inside the Debug menu
|
2013-06-07 16:35:43 +02:00 |
|
Andrzej Kapolka
|
26de3028fa
|
We need to sync in order to ensure that the settings are saved.
|
2013-06-06 18:25:16 -07:00 |
|
Andrzej Kapolka
|
acc8efa026
|
One more "one more try."
|
2013-06-06 18:10:21 -07:00 |
|
Andrzej Kapolka
|
1b698b24e2
|
OK, one more try.
|
2013-06-06 18:05:39 -07:00 |
|
Andrzej Kapolka
|
ce68c1a6a4
|
Think this needs to be a double.
|
2013-06-06 18:03:38 -07:00 |
|
Andrzej Kapolka
|
e0e94481c9
|
Add pitch/yaw scale preference to control degree of view rotation.
|
2013-06-06 17:53:00 -07:00 |
|
Philip Rosedale
|
b5e63fb446
|
Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp
|
2013-06-06 17:52:19 -07:00 |
|
Andrzej Kapolka
|
ffc1c33455
|
Removed double negation for coordinates, world aligned orientation -> camera
orientation, removed roll.
|
2013-06-06 17:25:52 -07:00 |
|
Geenz
|
7cefa3fe7b
|
Check if our main window is our application window within Application's event handling functions.
|
2013-06-06 19:58:33 -04:00 |
|
Geenz
|
51340452df
|
Use _mouseX and _mouseY for mouse look instead of the global mouse position when idle (prevents mouse look from accidentally triggering when the window is inactive).
|
2013-06-06 19:47:01 -04:00 |
|
Geenz
|
151a6edfb4
|
Check if our canvas has focus. If not, then ignore events passed to it.
|
2013-06-06 19:31:55 -04:00 |
|
Stephen Birarda
|
bd553ef061
|
repair indentation and NULL comparisons in Avatar class
|
2013-06-06 16:01:36 -07:00 |
|
Andrzej Kapolka
|
a5abfbe1cd
|
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
|
2013-06-06 15:52:54 -07:00 |
|
Andrzej Kapolka
|
0dbb5375db
|
Approach the "down" direction more rapidly.
|
2013-06-06 15:50:14 -07:00 |
|
Andrzej Kapolka
|
a7c265d017
|
More compiley.
|
2013-06-06 15:44:38 -07:00 |
|
Andrzej Kapolka
|
ba6f2307ba
|
Coordinate fix.
|
2013-06-06 15:43:26 -07:00 |
|
Andrzej Kapolka
|
081f193db8
|
Add back yaw decay the quaternion way.
|
2013-06-06 14:34:28 -07:00 |
|
Andrzej Kapolka
|
d87e165b06
|
Acceleration is presumably relative to the current orientation.
|
2013-06-06 14:08:53 -07:00 |
|
Andrzej Kapolka
|
650981abfa
|
Remove the bounce term; it causes fluctuations in velocity.
|
2013-06-06 13:41:22 -07:00 |
|