samcake
ba88db1b14
Tried many different things to narrow down the issue of the corrupted memory, it seems to be linked to the grid dimendsions somehow, i m now forcing to reassign the frustum grid dimension on the 10th iteration which seems to fix the issue....
2016-10-05 18:28:19 -07:00
samcake
e6572a42e3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-05 09:31:55 -07:00
Howard Stearns
32db63e177
Merge pull request #8737 from highfidelity/domain-check
...
Domain check
2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c
Merge pull request #8715 from jherico/offscreen_fences2
...
Support external GL textures with proper fencing
2016-10-05 05:13:06 -07:00
samcake
8c561eaa44
trying to whipe these buffer cleans but doesn;t seems to make a different in release, it is working clena in debug ... keep on looking
2016-10-04 18:19:42 -07:00
samcake
3e11eb4129
Try avoiding the basd update of the buffer for the grid content
2016-10-04 13:55:53 -07:00
Howard Stearns
4974c88880
Merge pull request #8663 from howard-stearns/address-bar-text-area-changes
...
Address bar text area changes
2016-10-04 13:50:40 -07:00
samcake
1c2a672214
Adjust the grid size for mac
2016-10-04 13:29:08 -07:00
howard-stearns
fd8287dae3
Merge branch 'summon-crowd' into domain-check
2016-10-04 11:38:25 -07:00
howard-stearns
cdd658d4dd
report results
2016-10-04 11:31:49 -07:00
Anthony Thibault
60aff44f33
Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix
...
Remove frame lag and jitter from near grabbed physical objects.
2016-10-04 11:14:22 -07:00
samcake
64c2488155
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-04 11:03:31 -07:00
samcake
6aa39ec95a
Polish the debugging of the light volumes
2016-10-04 11:03:12 -07:00
Anthony J. Thibault
dcd425a165
Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls
2016-10-04 10:56:44 -07:00
howard-stearns
1c73b3c043
Merge branch 'domain-check' of https://github.com/highfidelity/hifi into summon-crowd
2016-10-04 10:40:48 -07:00
howard-stearns
5ea4d48e36
poll for ready, and include physics in definition of ready, based on #8723
2016-10-04 10:23:10 -07:00
Chris Collins
1087885380
Merge pull request #8721 from kencooke/audio-fixes2
...
Fix audio support on Windows7
2016-10-04 10:14:37 -07:00
Brad Hefta-Gaub
9554befb68
Merge pull request #8714 from Atlante45/ack2
...
Fix potential race condition on static memory
2016-10-04 10:05:53 -07:00
Ken Cooke
6838dc0247
Inverted the CMAKE logic, to make the version comparison more clear
2016-10-04 09:01:43 -07:00
Ken Cooke
40393bd8ef
remove Installer debugging code
2016-10-03 22:31:43 -07:00
Ken Cooke
541f7ebb05
Select the correct plugin in the Installer, based on Windows version
2016-10-03 21:46:55 -07:00
Ken Cooke
eb5b03d008
Don't pre-delete qtaudio_windows.dll in Installer
2016-10-03 20:52:24 -07:00
Ken Cooke
372b631448
Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer
2016-10-03 19:59:27 -07:00
samcake
a378a6eccb
separate the rendering of the light outline from the main rendering and introduce a way to support both platform
2016-10-03 18:28:44 -07:00
Ken Cooke
8491254664
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes2
2016-10-03 18:13:43 -07:00
Brad Davis
8c5028158f
Fix crash on destroying web entities and overlays
2016-10-03 18:02:21 -07:00
Ken Cooke
46526a309d
Increase audio input buffering on Windows 7
2016-10-03 17:46:09 -07:00
Brad Davis
ca3572f991
Support external GL textures with proper fencing
2016-10-03 17:09:10 -07:00
Brad Davis
b77636b5bf
Merge pull request #8719 from jherico/stable-merge
...
Stable merge
2016-10-03 17:04:46 -07:00
Brad Davis
b4f2d93d68
Merge remote-tracking branch 'upstream/stable' into stable-merge
...
Conflicts:
server-console/src/content-update.css
server-console/src/main.js
2016-10-03 17:04:25 -07:00
Chris Collins
ca1a7135eb
Merge pull request #8706 from kencooke/audio-fixes
...
Improve support for audio when input rate != output rate
2016-10-03 16:46:56 -07:00
Chris Collins
bb9b23f036
Merge pull request #8716 from huffman/feat/stats-proc-info
...
Add HMD and processor info to stats and launch events
2016-10-03 16:12:49 -07:00
Anthony J. Thibault
327fcc970b
Remove frame lag from near grabbed physical objects.
...
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.
After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
2016-10-03 16:01:54 -07:00
samcake
c72b330821
Simple change to the get cluster interface
2016-10-03 15:34:54 -07:00
Ryan Huffman
0b2def6013
Fix style error
2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814
Fix incorrect return values in getProcessorInfo
2016-10-03 15:19:03 -07:00
Ryan Huffman
b5eb943c1d
Add hmd stats to stats event
2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
howard-stearns
8388e1044a
cleanup to use script-driven cache cleaning
2016-10-03 14:09:52 -07:00
samcake
92dbba0c8c
merging with master
2016-10-03 13:58:11 -07:00
Atlante45
573d5898cc
Make static control packets class members
2016-10-03 13:46:55 -07:00
howard-stearns
e55d4f97b3
Merge branch 'davidkelly-dk/testScriptRelocation' into domain-check
2016-10-03 13:10:50 -07:00
howard-stearns
e2051fef5c
Merge branch 'howard-stearns-tribble-rez' into domain-check
2016-10-03 13:07:10 -07:00
howard-stearns
654461e97a
Merge branch 'tribble-rez' of https://github.com/howard-stearns/hifi into howard-stearns-tribble-rez
2016-10-03 13:06:50 -07:00
howard-stearns
4fcddfdf2b
Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check
2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33
Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus
2016-10-03 13:01:51 -07:00
Chris Collins
f84f98f804
Merge pull request #8708 from samcake/color
...
Fix the crash on start up if default ambient map fails to load
2016-10-03 12:36:45 -07:00
howard-stearns
43c29500bf
ac script to provide an on-demand crowd, and an interface script to summon
...
it
2016-10-03 12:03:23 -07:00
samcake
002d58d607
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-03 11:47:01 -07:00
David Kelly
70a63417cf
point to tribbles.js on aws
...
For now, anyways. Just temporary until dev is complete.
2016-10-03 11:40:50 -07:00
