Zach Fox
|
8d89ea75f5
|
Initial commit
|
2017-06-30 10:12:46 -07:00 |
|
Zach Fox
|
e66b4f1761
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-30 10:12:24 -07:00 |
|
Zach Fox
|
0f9c917965
|
Merge pull request #10853 from samcake/brown
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
|
2017-06-30 10:05:54 -07:00 |
|
anshuman64
|
b22daa9a6f
|
Merge pull request #10838 from druiz17/avatar-recording-roomscale
Fix loading of incorrect joint data for the avatar recording
|
2017-06-29 12:24:37 -07:00 |
|
utkarshgautamnyu
|
7353014968
|
Merge pull request #10857 from highfidelity/agent_bug
Update DomainMetadata.cpp
|
2017-06-29 11:30:43 -07:00 |
|
utkarshgautamnyu
|
5f123018a4
|
Update DomainMetadata.cpp
|
2017-06-29 10:38:33 -07:00 |
|
Seth Alves
|
c4667aa1a7
|
Merge pull request #10839 from vladest/file_dialog_crash_qt59
File dialog crash qt59
|
2017-06-29 10:34:26 -07:00 |
|
Zach Fox
|
00966966df
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-29 10:13:11 -07:00 |
|
Zach Fox
|
3170bdd08c
|
Merge pull request #10837 from samcake/flash
Fix projection & lighting issues identified with 2nd rendering pipeline
|
2017-06-29 10:12:03 -07:00 |
|
Sam Gateau
|
b766c256db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-06-29 10:29:05 +02:00 |
|
Chris Collins
|
3a096381ce
|
Merge pull request #10851 from Atlante45/master
Stable => Master
|
2017-06-28 17:28:54 -07:00 |
|
Atlante45
|
fbe1518d1f
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-06-28 17:26:16 -07:00 |
|
Thijs Wenker
|
e781f97ddc
|
Merge pull request #10846 from sethalves/fix-server-scripts-more
make ResourceManager be owned by DependencyManager
|
2017-06-28 17:05:30 -07:00 |
|
Zach Fox
|
36e350cf1b
|
Merge pull request #10842 from zfox23/spectatorCamera_setInterval
Use setInterval() for cam position; Update model/registration; SPECTATOR button protections
|
2017-06-28 16:20:02 -07:00 |
|
Howard Stearns
|
3606418a22
|
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
minor fix for --scripts switch
|
2017-06-28 16:11:18 -07:00 |
|
Thijs Wenker
|
d5289d357b
|
I need to setup my code-editor, spaces.
|
2017-06-29 01:01:59 +02:00 |
|
Thijs Wenker
|
93679f7c3b
|
move the ResourceManager init back to where it was, to prevent problems
|
2017-06-29 00:52:51 +02:00 |
|
Zach Fox
|
218b32e9fb
|
Fix cameraUpdateInterval
|
2017-06-28 15:12:57 -07:00 |
|
Zach Fox
|
9f8a6c63cc
|
Fixup after merge
|
2017-06-28 14:44:26 -07:00 |
|
Zach Fox
|
fc5da7b4f0
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval
|
2017-06-28 14:18:58 -07:00 |
|
Seth Alves
|
794495c197
|
make ResourceManager be owned by DependencyManager
|
2017-06-28 14:18:14 -07:00 |
|
Andrew Meadows
|
e9edf01a34
|
Merge pull request #10831 from kencooke/audio-hrtf-optimize
More HRTF optimizations
|
2017-06-28 14:17:00 -07:00 |
|
David Kelly
|
48de8011b2
|
cr feedback
|
2017-06-28 14:15:29 -07:00 |
|
Zach Fox
|
604bb58987
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval
|
2017-06-28 14:12:25 -07:00 |
|
Howard Stearns
|
4fd4865f96
|
Merge pull request #10844 from howard-stearns/merge-from-master-6-28-2pm
Merge from master 6 28 2pm
|
2017-06-28 14:07:36 -07:00 |
|
howard-stearns
|
3293b4c898
|
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
|
2017-06-28 13:53:32 -07:00 |
|
Zach Fox
|
1bebe8aede
|
Whoops! Missed an if()
|
2017-06-28 13:49:05 -07:00 |
|
howard-stearns
|
e48eb55be1
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-28 13:28:21 -07:00 |
|
Zach Fox
|
39ae28bfcf
|
CR feedback
|
2017-06-28 12:54:40 -07:00 |
|
Howard Stearns
|
955fe6be80
|
Merge pull request #10834 from manapa01/spectator-camera_clean-up
Spectator camera clean up
|
2017-06-28 12:45:17 -07:00 |
|
Zach Fox
|
3e7b1b5696
|
Slightly update registration point
|
2017-06-28 12:44:34 -07:00 |
|
Patrick Manalich
|
cb52122726
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up
|
2017-06-28 12:40:36 -07:00 |
|
Zach Fox
|
c54a7a713c
|
New registration point; attempt to fix button interactions
|
2017-06-28 12:19:10 -07:00 |
|
Zach Fox
|
99ebd743e6
|
First steps
|
2017-06-28 12:16:03 -07:00 |
|
Patrick Manalich
|
9bcaa6d256
|
Revert "Messing around, howard please refer the commit before this one"
This reverts commit 1392297da9.
|
2017-06-28 12:10:16 -07:00 |
|
Howard Stearns
|
064a7cbb9b
|
Merge pull request #10840 from manapa01/spectator-camera_resize-fix
Spectator camera resize fix
|
2017-06-28 12:02:40 -07:00 |
|
Seth Alves
|
5617860fe4
|
Merge pull request #10841 from sethalves/fix-server-scripts
fix server scripts AC
|
2017-06-28 11:56:32 -07:00 |
|
Ken Cooke
|
a7a049434d
|
CR fix: comments instead of ref code
|
2017-06-28 11:32:41 -07:00 |
|
Ken Cooke
|
0dbb7a71f3
|
CR fix: comments instead of ref code
|
2017-06-28 11:32:24 -07:00 |
|
Patrick Manalich
|
252d100a5e
|
Function updateOverlay() made so we don't repeat code
|
2017-06-28 11:31:40 -07:00 |
|
Seth Alves
|
2f3109e4be
|
move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it
|
2017-06-28 11:00:05 -07:00 |
|
Clément Brisset
|
a2c15c9794
|
Merge pull request #10770 from jherico/fix_deps_1
Cleanup entity dependencies
|
2017-06-28 10:48:58 -07:00 |
|
Patrick Manalich
|
fedbc28da4
|
Rotation quaternion fix
|
2017-06-28 10:47:34 -07:00 |
|
Ken Cooke
|
0acbdc7755
|
CR fix: use predefined PI
|
2017-06-28 10:18:54 -07:00 |
|
Chris Collins
|
f76ec439be
|
Merge pull request #10810 from highfidelity/RC-45
Beta Release 45 - Includes up to Developer Release 6767
|
2017-06-28 09:25:15 -07:00 |
|
Andrew Meadows
|
1e23fa7baa
|
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
Eliminated toe wiggle while pucks are enabled.
|
2017-06-28 08:30:27 -07:00 |
|
Dante Ruiz
|
96ae39989e
|
Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale
|
2017-06-28 16:22:41 +01:00 |
|
Dante Ruiz
|
f6ba264de6
|
avatar recording fix
|
2017-06-28 16:22:28 +01:00 |
|
Vladyslav Stelmakhovskyi
|
51b44d9021
|
Implement same for HMD mode
|
2017-06-28 16:36:25 +02:00 |
|
Vladyslav Stelmakhovskyi
|
6acf426b1e
|
Merge branch 'master' into file_dialog_crash_qt59
|
2017-06-28 16:01:18 +02:00 |
|