Brad Hefta-Gaub
|
298e4d0f83
|
Merge pull request #6726 from jherico/legacy_oculus
Legacy oculus work
|
2015-12-22 11:02:37 -08:00 |
|
Brad Hefta-Gaub
|
22bc6f861a
|
Merge pull request #6722 from jherico/server_only_build
Add CMake flag for building only server components
|
2015-12-22 10:53:26 -08:00 |
|
Bradley Austin Davis
|
79d8b20637
|
Simulating Oculus interaction on legacy platforms
|
2015-12-22 10:09:45 -08:00 |
|
Brad Davis
|
7fdeb66cf4
|
Merge pull request #6723 from ZappoMan/macHydraCrash
fix crash on mac when sixense DLL can't be loaded
|
2015-12-22 09:32:23 -08:00 |
|
Bradley Austin Davis
|
e0e1ae43f5
|
Fixing legacy oculus plugin
|
2015-12-22 09:28:38 -08:00 |
|
Brad Davis
|
243fba461d
|
Add CMake flag for building only server components
|
2015-12-22 09:19:07 -08:00 |
|
Brad Hefta-Gaub
|
eff830ad4b
|
fix crash on mac when sixense DLL can't be loaded
|
2015-12-22 01:03:23 -08:00 |
|
Brad Hefta-Gaub
|
3dfc48e205
|
Merge pull request #6687 from jherico/marketplace
Support the marketplace in QML
|
2015-12-21 17:55:55 -08:00 |
|
Brad Davis
|
fc4ece5671
|
Merge pull request #6719 from ZappoMan/rightClickMenu
fix reticle drive
|
2015-12-21 17:11:48 -08:00 |
|
Brad Hefta-Gaub
|
da86686533
|
fix reticle drive
|
2015-12-21 17:10:01 -08:00 |
|
samcake
|
757e94ed98
|
Merge pull request #6715 from zzmp/refactor/scene-render-js
Clean up interfaces for JS Scene/Render
|
2015-12-21 16:50:41 -08:00 |
|
Brad Hefta-Gaub
|
ce426f0144
|
Merge pull request #6695 from birarda/qxmpp-deletion
remove an unused qxmpp external
|
2015-12-21 16:49:04 -08:00 |
|
Brad Davis
|
95c524fba1
|
Fixing authentication token for followed links
|
2015-12-21 15:44:35 -08:00 |
|
Zach Pomerantz
|
4df8fa4ac3
|
Create Render/Scene unique_ptr without C++14 make_unique
|
2015-12-21 15:39:49 -08:00 |
|
Zach Pomerantz
|
f146b207c4
|
Update JS debug scripts to use nested props
|
2015-12-21 15:27:37 -08:00 |
|
Brad Hefta-Gaub
|
e527bfd645
|
Merge pull request #6717 from birarda/collision-verbose-debug
remove extra audio injector debug
|
2015-12-21 15:26:59 -08:00 |
|
Stephen Birarda
|
ba89c8a97a
|
remove some extra debug that isn't needed
|
2015-12-21 16:23:23 -07:00 |
|
Ryan Huffman
|
f5f0829216
|
Merge pull request #6716 from birarda/master
fix for stop of a nullptr QTimer
|
2015-12-21 15:21:42 -08:00 |
|
Stephen Birarda
|
8c6449a886
|
fix for stopping a nullptr QTimer
|
2015-12-21 16:20:06 -07:00 |
|
Zach Pomerantz
|
d8022aa5b0
|
Add back deferred debugging and combine context init
|
2015-12-21 14:32:06 -08:00 |
|
Zach Pomerantz
|
c6a2f5b20d
|
Nest JS props in RenderScriptingInterface
|
2015-12-21 14:32:06 -08:00 |
|
Zach Pomerantz
|
5a86f0c23f
|
Nest JS props in SceneScriptingInterface
|
2015-12-21 14:32:06 -08:00 |
|
Brad Hefta-Gaub
|
111a8caa3c
|
Merge pull request #6701 from highfidelity/graphics
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
|
2015-12-21 13:54:50 -08:00 |
|
Brad Davis
|
491d2fe95e
|
Merge pull request #6713 from ZappoMan/rightClickMenu
add absolute rotation based hand reticle movement
|
2015-12-21 12:45:50 -08:00 |
|
Brad Davis
|
e3ab230638
|
Merge pull request #6711 from samcake/hdr
Graphics : Fix procedural Shader Gamma and Adding color linear getters in Particle system
|
2015-12-21 12:22:14 -08:00 |
|
Brad Hefta-Gaub
|
b69892eb9b
|
Merge pull request #6714 from jherico/qml_dep_fix
Remove script -> qt::webchannel dependency
|
2015-12-21 12:10:38 -08:00 |
|
samcake
|
4f54b85c92
|
Remove warnings
|
2015-12-21 12:05:19 -08:00 |
|
samcake
|
ae124ebede
|
Tuning the proedural shader support to work with the current default: gamma corrected emissive
|
2015-12-21 12:00:30 -08:00 |
|
Brad Davis
|
6ef77bc46a
|
Support the marketplace in QML
|
2015-12-21 11:34:03 -08:00 |
|
samcake
|
492572df45
|
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
|
2015-12-21 11:26:15 -08:00 |
|
samcake
|
1f6466f107
|
Merge pull request #6712 from samcake/graphicsMaster
Graphics: Merge upstream master into upstream graphics
|
2015-12-21 11:24:07 -08:00 |
|
Brad Davis
|
05b7fcc957
|
Remove script -> qt::webchannel dependency
|
2015-12-21 11:19:05 -08:00 |
|
Brad Hefta-Gaub
|
248b3d09ac
|
add absolute rotation based hand reticle movement
|
2015-12-21 10:49:49 -08:00 |
|
samcake
|
6bbc94badc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-21 10:48:55 -08:00 |
|
samcake
|
4c2d5c54c4
|
Merge branch 'hdr' of https://github.com/samcake/hifi into hdr
|
2015-12-21 10:43:41 -08:00 |
|
samcake
|
aef748b894
|
Adding linear color in Particule system
|
2015-12-21 10:40:29 -08:00 |
|
Brad Davis
|
46a4a469e9
|
Merge pull request #6689 from ZappoMan/rightClickMenu
Some early work to support hand driven reticle
|
2015-12-20 17:49:50 -08:00 |
|
Seth Alves
|
d71cecbc61
|
Merge pull request #6675 from AndrewMeadows/crash-fix
fix crash when visiting new domain with gun in hand
|
2015-12-20 06:24:44 -08:00 |
|
Brad Hefta-Gaub
|
ae04556f45
|
Merge pull request #6708 from sethalves/fix-entity-server-crash
fix entity-server crash
|
2015-12-19 16:13:24 -08:00 |
|
samcake
|
8f63a7ae11
|
Merge pull request #6710 from samcake/graphicsMaster
Graphics: merge upstream master to upstream graphics
|
2015-12-19 11:40:22 -08:00 |
|
samcake
|
1e8e3fec87
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-19 11:38:20 -08:00 |
|
Seth Alves
|
9271209d89
|
another
|
2015-12-19 08:13:53 -08:00 |
|
Seth Alves
|
8b9de716f1
|
fix bad pointer juju
|
2015-12-19 08:08:10 -08:00 |
|
Brad Hefta-Gaub
|
e929e3f789
|
more work on angular velocity tests
|
2015-12-18 19:20:32 -08:00 |
|
Brad Hefta-Gaub
|
f55445bb88
|
Merge pull request #6707 from jherico/webengine
Fixing QML based web view crash.
|
2015-12-18 18:19:36 -08:00 |
|
Brad Davis
|
ae6cf131f5
|
Fixing crash bug
|
2015-12-18 17:19:06 -08:00 |
|
Brad Davis
|
6098c4a1d6
|
Revert "Revert "Migrate QML based web views to Qt WebEngine""
This reverts commit 1f3adeb666.
|
2015-12-18 17:18:46 -08:00 |
|
samcake
|
4e1a812ff3
|
Merge pull request #6706 from samcake/graphicsMaster
Graphics: apply upstream master revert
|
2015-12-18 17:15:54 -08:00 |
|
samcake
|
7e66515beb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-18 17:13:48 -08:00 |
|
Brad Davis
|
baf2d5acb7
|
Merge pull request #6705 from highfidelity/revert-6651-webengine
Revert "Migrate QML based web views to Qt WebEngine"
|
2015-12-18 17:09:44 -08:00 |
|