samcake
b37df393e2
Merging with the new GL45Backend
2016-06-29 10:40:28 -07:00
samcake
f3c5324e5c
Merge pull request #7937 from jherico/gpu_breakup3
...
Adding GL 4.5 backend and tests
2016-06-29 10:13:46 -07:00
Brad Davis
f93a91a97f
Abandon seperate vertex formats for now
2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d
Fix invalid GL 4.5 calls
2016-06-28 18:56:25 -07:00
Brad Davis
ab7fed1af8
Switch back to disable GL 4.5 by default, add support for logging when enabled
2016-06-28 18:56:25 -07:00
Brad Davis
a41de3a60d
Making GL 4.5 enabled by default, adding logging
2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde
Fix crash in GL45 buffer re-allocation
2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d
Adding GL 4.5 backend
2016-06-28 18:55:24 -07:00
samcake
7f5e22d0eb
Post tuesday review, clean up
2016-06-28 17:20:24 -07:00
Brad Hefta-Gaub
ec0ca1d173
Merge pull request #8146 from huffman/fix/launch-version
...
Add version to launch user activity
2016-06-28 17:13:10 -07:00
Brad Davis
34faf45a5d
Merge pull request #8154 from jherico/stable-merge
...
Stable merge back to master
2016-06-28 16:22:10 -07:00
Brad Davis
b45ed7f959
Merge remote-tracking branch 'upstream/stable' into stable-merge
2016-06-28 15:09:00 -07:00
Brad Davis
f0d04dcfe0
Merge pull request #8153 from jherico/RC-14-merge
...
RC-14 merge back to master
2016-06-28 14:50:14 -07:00
Brad Davis
18017f7024
Merge remote-tracking branch 'upstream/RC-14' into RC-14-merge
2016-06-28 14:48:05 -07:00
Brad Hefta-Gaub
9e8829aa81
Merge pull request #8148 from zzmp/fix/metadata-hours-migration
...
Beta Release 14.1 - fix metadata hours migrations for new users/version bumps
2016-06-28 13:55:51 -07:00
samcake
d128af48db
Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL
2016-06-28 13:47:55 -07:00
Howard Stearns
da61100b6d
Merge pull request #8150 from highfidelity/vive-ui
...
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Anthony Thibault
abf643579a
Merge pull request #8144 from howard-stearns/fix-crashing-hmd-menu-modals
...
fix crash when hmd context menu triggers a modal
2016-06-28 13:14:23 -07:00
Zach Pomerantz
c406538301
properly parse domain metadata hours
2016-06-28 12:40:25 -07:00
Zach Pomerantz
56038a97a6
add domain settings getter for descriptors, validates nested vals
2016-06-28 12:39:00 -07:00
Zach Pomerantz
c62967a57b
add secs per hour
2016-06-28 12:38:00 -07:00
Brad Hefta-Gaub
3fca0d655c
Merge pull request #8145 from ctrlaltdavid/20978
...
reduce users window flicker when restart script
2016-06-28 10:03:46 -07:00
Ryan Huffman
b36a39b2bc
Add version to launch user activity
2016-06-28 09:59:59 -07:00
Andrew Meadows
e4329cc8de
Merge pull request #8137 from AlexanderOtavka/add-entity
...
Fix bugs with Entities.addEntity
2016-06-28 09:54:09 -07:00
Andrew Meadows
b7b513a75f
Merge pull request #8132 from AlexanderOtavka/eslint
...
Add eslintrc file
2016-06-28 09:51:28 -07:00
Andrew Meadows
58e05b2e90
Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
...
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2
Merge pull request #8121 from SamGondelman/miniMirrorFix
...
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
samcake
197d49fc03
introducing the depth aware blur
2016-06-27 17:04:37 -07:00
David Rowe
79cfd2e9dc
Reduce users window flicker when restart script
2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9
Merge pull request #8135 from SamGondelman/fixEditLockHMD
...
Prevent entering independent camera mode through edit.js in HMD mode
2016-06-27 15:50:25 -07:00
Brad Hefta-Gaub
7b4fcca064
Merge pull request #8140 from highfidelity/RC-14
...
Beta Release 14 - Includes up to Developer Release 5068
2016-06-27 14:46:40 -07:00
howard-stearns
68be819ea2
fix crash when hmd context menu triggers a modal
2016-06-27 14:07:13 -07:00
Brad Hefta-Gaub
1bde849ed6
Merge pull request #8142 from ZappoMan/usersJSPatchToRC14
...
Users js patch to rc14
2016-06-27 13:15:47 -07:00
David Rowe
e62cbd8f44
Hide users list when logged out
2016-06-27 13:10:21 -07:00
David Rowe
8f2e95cde2
Fix "show me" and "visible to" in users window not being remembered
2016-06-27 13:10:21 -07:00
David Rowe
6a0c29f993
Fix users window minimized state not being remembered
2016-06-27 13:10:21 -07:00
David Rowe
35769b73a5
Fix missing users.js menu item
2016-06-27 13:10:21 -07:00
David Rowe
5aaf1f3392
Undo hide users.js when logged out
2016-06-27 13:09:34 -07:00
Zander Otavka
235ee4bd46
Refactor Camera scripting interface a little
...
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used. get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Brad Hefta-Gaub
cecd871c66
Merge pull request #8139 from ctrlaltdavid/20978
...
fix users.js display and operation
2016-06-27 12:56:10 -07:00
Howard Stearns
01ca54cac9
Merge pull request #8136 from jherico/tray_position
...
Don't reposition windows prior to selecting the initial display plugin
2016-06-27 12:31:59 -07:00
Zander Otavka
55c2466249
Move .eslintrc.js to project root
...
This way, all project scripts are in scope, and the .eslintrc doesn't
get pushed to the installer with the default scripts.
2016-06-27 10:25:53 -07:00
samcake
938bc77b1f
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-27 10:13:00 -07:00
Andrew Meadows
53af5db77b
Merge pull request #8141 from sethalves/unwedge-hydras-on-linux
...
workaround to allow models and files to be loaded on linux
2016-06-27 09:49:08 -07:00
Seth Alves
bbe9b931be
on Linux, don't mess with the menus from the hydra plugin because it makes Qt stop
2016-06-26 14:59:42 -07:00
Brad Hefta-Gaub
c92293e559
Merge pull request #8138 from marko8904/master
...
sign executables with SHA256
2016-06-25 11:06:35 -07:00
Marko Kudjerski
17ce80ed69
sign executables with SHA256
2016-06-24 19:28:31 -07:00
David Rowe
dc07368dc9
Hide users list when logged out
2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3
Fix "show me" and "visible to" in users window not being remembered
2016-06-25 13:48:43 +12:00
Howard Stearns
de7738e644
Merge pull request #8134 from highfidelity/vive-ui
...
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
