Philip Rosedale
|
293a88b3d4
|
Merge pull request #5158 from ctrlaltdavid/20545
DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast
|
2015-06-22 10:31:10 -07:00 |
|
Philip Rosedale
|
30b08af7e2
|
Merge pull request #5125 from jherico/overlay
Overlay overhaul and tooltip refactor
|
2015-06-22 10:06:26 -07:00 |
|
Brad Davis
|
3231bbba5a
|
Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
interface/src/Application.cpp
|
2015-06-22 09:44:16 -07:00 |
|
Brad Davis
|
1b44c220a7
|
Prep work for procedural stars & stuff
|
2015-06-22 09:43:12 -07:00 |
|
Howard Stearns
|
f5b0b304d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
|
2015-06-22 09:20:57 -07:00 |
|
samcake
|
be8ae9580d
|
Merge pull request #5177 from bwent/doubleClickEvent
Expose mouseDoublePressEvents to js
|
2015-06-22 11:13:05 +02:00 |
|
Bradley Austin Davis
|
02510790c3
|
Fixing projection during star rendering
|
2015-06-21 17:16:30 -07:00 |
|
Bradley Austin Davis
|
4ccdc78866
|
Fixing frustum perspective bug
|
2015-06-21 15:53:24 -07:00 |
|
Brad Davis
|
012b0973b9
|
removing cruft
|
2015-06-21 14:26:19 -07:00 |
|
Bradley Austin Davis
|
5bbfb97c37
|
Fixing blurry UI on retina displays
|
2015-06-21 13:31:18 -07:00 |
|
Brad Davis
|
e66b2d4141
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-20 22:54:45 -07:00 |
|
Brad Hefta-Gaub
|
13c5c830d7
|
Merge pull request #5173 from huffman/fix-line-bounds
Add correct line3doverlay bounds
|
2015-06-20 11:39:08 -07:00 |
|
Bradley Austin Davis
|
577962cb67
|
Merge branch 'master' into overlay
|
2015-06-20 10:37:55 -07:00 |
|
Philip Rosedale
|
51a2363707
|
Merge pull request #5174 from huffman/remove-pointer
Remove pointer.js from defaultScripts because it causes crashes (temporary)
|
2015-06-19 21:57:46 -07:00 |
|
ericrius1
|
8fcff2d648
|
changed indent spacing to 4 spaces
|
2015-06-19 19:03:47 -07:00 |
|
ericrius1
|
18014e968d
|
removed horizontal "line break" style comment blocks
|
2015-06-19 19:00:42 -07:00 |
|
ericrius1
|
8bc9fc2e1f
|
simplified paint.js script to allow for faster iteration and more thorough testing
|
2015-06-19 18:58:09 -07:00 |
|
ericrius1
|
dbec1aad0c
|
line entity points are now local to entity position. Changed paint script to reflect this
|
2015-06-19 18:54:28 -07:00 |
|
David Rowe
|
0b13accf94
|
Merge branch 'master' into addressbar-tidy
Conflicts:
interface/resources/qml/AddressBarDialog.qml
|
2015-06-19 17:42:27 -07:00 |
|
Brad Davis
|
cc45693f55
|
Merge pull request #5163 from venkatn93/master
Address bar polish
|
2015-06-19 16:59:08 -07:00 |
|
Ryan Huffman
|
1371f775ee
|
Add mutex lock around access to Model::_calculatedMeshPartOffset
|
2015-06-19 16:51:13 -07:00 |
|
Ryan Huffman
|
a7f291154b
|
Add lock around recalculateMeshPartOffsets call
|
2015-06-19 16:28:58 -07:00 |
|
David Rowe
|
bdcf87a3c6
|
Improve legibility of entities editor
Increased font sizes.
Improved contrast between values and backgrounds.
|
2015-06-19 16:28:45 -07:00 |
|
Brad Davis
|
3ab8025b82
|
Responding to Sam's comments
|
2015-06-19 16:14:05 -07:00 |
|
Sam Gondelman
|
a0d4b7ec7c
|
without script, doesn't limit you to constant degree turns
|
2015-06-19 16:11:43 -07:00 |
|
Niraj Venkat
|
482f12be8c
|
Returning ref to stack to view controller
|
2015-06-19 16:05:45 -07:00 |
|
bwent
|
c315bcec24
|
Expose mouseDoublePressEvents to js
|
2015-06-19 15:52:27 -07:00 |
|
Ryan Huffman
|
1734d5e584
|
Fix recalculateMeshBoxes being called outside of mutex
|
2015-06-19 15:05:55 -07:00 |
|
Brad Davis
|
cc6b589ae5
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-19 14:48:38 -07:00 |
|
Brad Davis
|
99c217184b
|
Fixing the mic/camera buttons and the mirror UI buttons
|
2015-06-19 14:46:39 -07:00 |
|
Howard Stearns
|
7cf7f0df1a
|
Remove #include that was introduced in version 1 that is not needed in final.
|
2015-06-19 14:38:43 -07:00 |
|
Niraj Venkat
|
03c10d15e6
|
Adding lambdas and removing dead code
|
2015-06-19 14:37:21 -07:00 |
|
Howard Stearns
|
b506fe0f1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
|
2015-06-19 14:22:04 -07:00 |
|
Howard Stearns
|
dc10e15e96
|
Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.
|
2015-06-19 14:20:00 -07:00 |
|
Niraj Venkat
|
054e12a315
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-19 11:22:50 -07:00 |
|
Niraj Venkat
|
1494aa4faa
|
Adding new icon and getters
|
2015-06-19 11:18:16 -07:00 |
|
Niraj Venkat
|
b15e7cec21
|
Back and forward are red if not possible
|
2015-06-19 11:17:56 -07:00 |
|
Sam Gondelman
|
e78ce8055a
|
hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G
|
2015-06-19 11:17:36 -07:00 |
|
Ryan Huffman
|
1e69e647bb
|
Remove pointer.js from defaultScripts because it causes crashes
|
2015-06-19 11:02:00 -07:00 |
|
Ryan Huffman
|
ff66eb584d
|
Add correct line3doverlay bounds
|
2015-06-19 10:48:07 -07:00 |
|
Ryan Huffman
|
35f9d49c06
|
Fix DrawOverlay3D::getOpaquePipeline invalid signature
|
2015-06-19 10:47:25 -07:00 |
|
ericrius1
|
1eaf5ae82a
|
fixed utilities file to be able to be referenced by other files
|
2015-06-19 10:37:57 -07:00 |
|
Ryan Huffman
|
665baff665
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
|
2015-06-19 10:07:57 -07:00 |
|
Ryan Huffman
|
b9ecff02f9
|
Disable edit.js rotation text overlay temporarily
|
2015-06-19 09:45:33 -07:00 |
|
Ryan Huffman
|
690e2e38f2
|
Move circle3d and text overlays to batches
|
2015-06-19 09:45:13 -07:00 |
|
Brad Hefta-Gaub
|
587bf78826
|
Merge pull request #5170 from samcake/punk
Fix the cookie cutter issue in stereo
|
2015-06-19 09:19:00 -07:00 |
|
Sam Gateau
|
873955b17e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-06-19 18:02:56 +02:00 |
|
Clément Brisset
|
5192796851
|
Merge pull request #5168 from samcake/daft
Improving the rendering job architecture
|
2015-06-19 18:00:39 +02:00 |
|
Sam Gateau
|
2920197e88
|
Merge branch 'daft' of https://github.com/samcake/hifi into punk
|
2015-06-19 17:48:07 +02:00 |
|
Sam Gateau
|
598d0a5375
|
Just remove these changes on SkeletonModel.cpp
|
2015-06-19 17:44:56 +02:00 |
|