Ryan Huffman
|
02d828443b
|
Update zoom sensitivity when using keys
|
2015-02-04 10:44:54 -08:00 |
|
Ryan Huffman
|
36238bb5df
|
Update editEntities to use left click for select
|
2015-02-04 10:43:55 -08:00 |
|
Ryan Huffman
|
09752589b8
|
Reenable on/off button
|
2015-02-04 10:43:28 -08:00 |
|
Ryan Huffman
|
4fbc7a5dcd
|
Add focus easing and auto-focus to menu and settings
|
2015-02-04 10:42:01 -08:00 |
|
Ryan Huffman
|
01a00b5127
|
Disable editEntities always-on
|
2015-02-04 10:40:50 -08:00 |
|
Brad Hefta-Gaub
|
de58c4a007
|
Merge pull request #4217 from Atlante45/master
Fix for fps bug/field of view
|
2015-02-03 19:13:52 -08:00 |
|
Brad Hefta-Gaub
|
bb8362b104
|
Merge pull request #4219 from ctrlaltdavid/20267
CR for Job #20267 - Create progress.js script as download progress indicator
|
2015-02-03 19:07:36 -08:00 |
|
Brad Hefta-Gaub
|
01f594b535
|
Merge pull request #4221 from AndrewMeadows/bispinor
proof Andrew has a working Windows build on his laptop
|
2015-02-03 19:07:01 -08:00 |
|
Atlante45
|
fc4bf0c325
|
Don't check gl errors
|
2015-02-03 18:55:52 -08:00 |
|
Brad Hefta-Gaub
|
b9ee1294fa
|
Merge pull request #4216 from ctrlaltdavid/20281
Fix orientation of non-solid rectangle3d overlays, too
|
2015-02-03 18:52:51 -08:00 |
|
Atlante45
|
7a03daa76f
|
Inline setFieldOfView
|
2015-02-03 18:51:26 -08:00 |
|
Brad Hefta-Gaub
|
79b04afaf8
|
Merge pull request #4210 from ctrlaltdavid/20280
CR for Job #20280 - Warn if Interface and Stack have incompatible build level
|
2015-02-03 18:51:17 -08:00 |
|
Andrew Meadows
|
35cbc9a41d
|
pass FBXGeometry by const reference
this fixes a bug on windows about misaligned data in function call
|
2015-02-03 18:40:55 -08:00 |
|
Andrew Meadows
|
547a416c3b
|
merge upstream/master into andrew/bispinor
|
2015-02-03 18:33:10 -08:00 |
|
Andrew Meadows
|
1e00d2199a
|
Merge pull request #4218 from samcake/temp0
Fix the lightmap not displaying when using the texcoord0
|
2015-02-03 17:23:25 -08:00 |
|
Atlante45
|
e4591e0d03
|
Work arount for QVariant not converting to QVariant
|
2015-02-03 17:11:32 -08:00 |
|
David Rowe
|
ca302e305b
|
Add progress.js to defaultScripts.js
|
2015-02-03 16:17:06 -08:00 |
|
David Rowe
|
78bcf3ddcb
|
Update SVG URLs to use S3 files
|
2015-02-03 16:15:10 -08:00 |
|
Atlante45
|
578ab1a9f2
|
Leave LOD settings as globals
|
2015-02-03 16:13:13 -08:00 |
|
Sam Gateau
|
5719e277dd
|
FIx the lightmap not displaying when using the texcoord0
|
2015-02-03 16:10:31 -08:00 |
|
Atlante45
|
875507aaaa
|
Missing return
|
2015-02-03 15:58:24 -08:00 |
|
David Rowe
|
8297bbd5e7
|
Fix orientation of non-solid rectangle3d overlays, too
|
2015-02-03 15:52:20 -08:00 |
|
Atlante45
|
375d9eed5b
|
Fix QTimer warning
|
2015-02-03 15:22:52 -08:00 |
|
David Rowe
|
d9e353e498
|
Merge branch 'master' into 20280
Conflicts:
libraries/networking/src/LimitedNodeList.h
|
2015-02-03 14:46:27 -08:00 |
|
David Rowe
|
8dd87aff16
|
Adjust size of 2D progress bar
|
2015-02-03 14:27:43 -08:00 |
|
David Rowe
|
46352d34ce
|
Make 3D progress bar match up with notifications
|
2015-02-03 14:27:43 -08:00 |
|
David Rowe
|
fdf4aeaeab
|
Display 3D progress bar
|
2015-02-03 14:27:42 -08:00 |
|
David Rowe
|
7beb5bf25f
|
Show and hide progress bar per downloads status
|
2015-02-03 14:27:41 -08:00 |
|
David Rowe
|
9b6a81cfb0
|
Display 2D progress bar
|
2015-02-03 14:27:41 -08:00 |
|
David Rowe
|
1fdebf63a4
|
Add progress.js; calculate download percent complete value
|
2015-02-03 14:27:40 -08:00 |
|
Brad Hefta-Gaub
|
b5e62922a2
|
Merge pull request #4215 from huffman/edit-changes
A few improvements to editEntities.js
|
2015-02-03 13:55:59 -08:00 |
|
Brad Hefta-Gaub
|
81871abd06
|
Merge pull request #4214 from ctrlaltdavid/20281
Fix orientation of rectangle3d overlays to match other 3D overlays
|
2015-02-03 13:54:19 -08:00 |
|
Brad Hefta-Gaub
|
fa608477b2
|
Merge pull request #4213 from sethalves/rework-bandwidth-meter
Rework bandwidth meter
|
2015-02-03 13:53:24 -08:00 |
|
Atlante45
|
78a9d002db
|
Remove settings from InboundAudioStream
|
2015-02-03 12:47:25 -08:00 |
|
Atlante45
|
27459ba861
|
Settings update
|
2015-02-03 12:27:30 -08:00 |
|
Ryan Huffman
|
e2b6be2a92
|
Fix focus behavior when selecting an item without shift
|
2015-02-03 11:58:39 -08:00 |
|
Ryan Huffman
|
7f0fdbe23e
|
Make auto-focus in editEntities always use ease-on-focus
|
2015-02-03 11:50:58 -08:00 |
|
Ryan Huffman
|
814d585086
|
Make the entity list always visible
|
2015-02-03 11:44:38 -08:00 |
|
Ryan Huffman
|
ba5a96f541
|
Add Window.setFocus
|
2015-02-03 11:44:22 -08:00 |
|
Ryan Huffman
|
74dfd29708
|
Remove Mass from entity properties window
|
2015-02-03 11:44:01 -08:00 |
|
David Rowe
|
7f7cba8a1b
|
Fix orientation of rectangle3d overlays to match other 3D overlays
|
2015-02-03 10:54:16 -08:00 |
|
Atlante45
|
aacf61609f
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-03 10:53:44 -08:00 |
|
Atlante45
|
09a9f82256
|
More settings update
|
2015-02-03 10:52:50 -08:00 |
|
Seth Alves
|
d2c70936e3
|
coding standard, remove unneeded asserts
|
2015-02-03 10:51:35 -08:00 |
|
Seth Alves
|
0fa1273cc9
|
draw background behind bandwidth overlay stats
|
2015-02-03 10:51:20 -08:00 |
|
Brad Hefta-Gaub
|
35431a0a4c
|
Merge pull request #4211 from PhilipRosedale/master
Dice.js script that lets you, well, throw dice
|
2015-02-03 10:46:32 -08:00 |
|
Atlante45
|
fdade344a3
|
Move Audio to new settings
|
2015-02-03 10:15:11 -08:00 |
|
Philip Rosedale
|
6483df69a4
|
Merge pull request #4209 from sethalves/rework-bandwidth-meter
Consolidate Network Bandwidth Metrics
|
2015-02-03 09:05:28 -08:00 |
|
Philip Rosedale
|
c234f3372f
|
Merge pull request #4212 from huffman/fix-clone-billboard
Add missing _texture to BillboardOverlay copy ctor
|
2015-02-03 09:04:30 -08:00 |
|
Ryan Huffman
|
13ea8ddb9e
|
Add missing _texture to BillboardOverlay copy ctor
|
2015-02-03 08:52:58 -08:00 |
|