Brad Hefta-Gaub
|
aaed1d333b
|
Merge pull request #7309 from jherico/compositor_threading_fix
Handle fake mouse events properly when triggered from a script
|
2016-03-10 08:37:30 -08:00 |
|
Brad Hefta-Gaub
|
82ca78b37b
|
Merge pull request #7300 from sethalves/fix-detach-crash
fix removing attachments
|
2016-03-10 08:23:52 -08:00 |
|
Brad Davis
|
f04d1b4998
|
Handle fake mouse events properly when triggered from a script
|
2016-03-09 22:11:40 -08:00 |
|
Chris Collins
|
f98b6c3a28
|
Merge pull request #7303 from jherico/watchdog
Update the watchdog heartbeat manually during startup
|
2016-03-09 19:11:30 -08:00 |
|
Brad Davis
|
9645ed9120
|
Update the watchdog heartbeat manually during startup
|
2016-03-09 17:00:45 -08:00 |
|
Howard Stearns
|
2b576e86f0
|
Merge pull request #7259 from jherico/crashes
Crash fixes
|
2016-03-09 16:42:36 -08:00 |
|
Chris Collins
|
ddb09ec222
|
Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements
Hand controller mouse improvements
|
2016-03-09 16:34:35 -08:00 |
|
Chris Collins
|
690d877e93
|
Merge pull request #7292 from zzmp/fix/cache-loaded
Mark Resource loaded after postprocessing
|
2016-03-09 16:31:45 -08:00 |
|
Seth Alves
|
fbbc27213d
|
Merge pull request #7287 from PhilipRosedale/fireflies
Fireflies
|
2016-03-09 15:20:27 -08:00 |
|
James B. Pollack
|
7c44556234
|
Merge pull request #7301 from ericrius1/growingPlant
Remove prematurely added VRVJ folder from examples folder
|
2016-03-09 15:17:17 -08:00 |
|
ericrius1
|
05d26be300
|
delete file
|
2016-03-09 15:15:20 -08:00 |
|
ericrius1
|
7b20fdcc1a
|
add file before delete
|
2016-03-09 15:14:51 -08:00 |
|
James B. Pollack
|
7cdd3d5b3e
|
Merge pull request #7296 from imgntn/cellscience
Various Cellscience Fixes
|
2016-03-09 15:11:58 -08:00 |
|
ericrius1
|
974189b546
|
deleted cartridge spawner
|
2016-03-09 15:10:35 -08:00 |
|
Brad Davis
|
23a89a63d8
|
Set deadlock thread name
|
2016-03-09 14:51:19 -08:00 |
|
Brad Davis
|
6d090895b7
|
Don't crash on QML menu creation failure
|
2016-03-09 14:48:20 -08:00 |
|
PhilipRosedale
|
5230d3a705
|
Added header
|
2016-03-09 14:45:26 -08:00 |
|
Seth Alves
|
d95d0f59cb
|
keep removed attachment models around for one extra call to fixupModelsInScene
|
2016-03-09 14:36:50 -08:00 |
|
Brad Davis
|
3145069a10
|
Merge pull request #7295 from birarda/raleway-installer-fix
manually rename Raleway font with incorrect casing after install
|
2016-03-09 14:31:13 -08:00 |
|
Brad Davis
|
98f791a723
|
Merge pull request #7299 from zzmp/fix/deadlock-debug
Wait 10m for a deadlock when debugging
|
2016-03-09 14:10:02 -08:00 |
|
Zach Pomerantz
|
21719b3980
|
Wait 10m for DEBUG deadlocks
|
2016-03-09 14:07:36 -08:00 |
|
Brad Davis
|
d428f3b96f
|
Working on crash bugs
|
2016-03-09 14:00:05 -08:00 |
|
Brad Davis
|
cac31761c0
|
Safer shutdown code in deadlock thread
|
2016-03-09 13:45:01 -08:00 |
|
Brad Davis
|
b2be54a179
|
Ensure we don't get trapped in the QML rendering loop on shutdown
|
2016-03-09 13:45:00 -08:00 |
|
Brad Hefta-Gaub
|
975f0f049c
|
Merge pull request #7297 from jherico/upload_fix
Fix edit.js upload button
|
2016-03-09 13:14:35 -08:00 |
|
Stephen Birarda
|
0c45ed038c
|
attempt rename to change casing of Raleway font
|
2016-03-09 12:58:23 -08:00 |
|
Stephen Birarda
|
bdc2ac73f6
|
manually remove Raleway font that has incorrect casing
|
2016-03-09 12:30:09 -08:00 |
|
Howard Stearns
|
7f7ea8b672
|
Merge pull request #7289 from ZappoMan/bugfixes
fix a couple bugs
|
2016-03-09 12:21:58 -08:00 |
|
Brad Davis
|
6e24b66b38
|
Fix edit.js upload button
|
2016-03-09 12:21:31 -08:00 |
|
James B. Pollack
|
5a54bc548b
|
remove ungrabbable signal
|
2016-03-09 12:19:02 -08:00 |
|
James B. Pollack
|
dee532e84f
|
try to make loading of nav buttons more realiable, etc
|
2016-03-09 12:14:53 -08:00 |
|
James B. Pollack
|
5daacdf952
|
set offset to zeros
|
2016-03-09 12:01:22 -08:00 |
|
Brad Hefta-Gaub
|
e038c8a43c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes
|
2016-03-09 11:47:55 -08:00 |
|
Seth Alves
|
143d8a0929
|
Merge pull request #7267 from ericrius1/growingPlant
Plant that blooms flowers when it is watered by a water can
|
2016-03-09 11:28:38 -08:00 |
|
Zach Pomerantz
|
d06b99967e
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-loaded
|
2016-03-09 11:18:05 -08:00 |
|
Zach Pomerantz
|
5f5f2d22a7
|
Merge pull request #7271 from samcake/orange
Trying to consolidate the FBX reader for Blender /maya
|
2016-03-09 14:14:03 -05:00 |
|
Howard Stearns
|
ec23e760fe
|
Merge pull request #7293 from jherico/watchdog
Ensure the heartbeat has a valid value before the thread starts
|
2016-03-09 11:05:30 -08:00 |
|
Brad Davis
|
80fdef4348
|
Ensure the heartbeat has a valid value before the thread starts
|
2016-03-09 10:53:01 -08:00 |
|
samcake
|
f82bd441a9
|
IMproving th ecomment
|
2016-03-09 10:34:49 -08:00 |
|
Zach Pomerantz
|
54af58834a
|
Mark Resource loaded after postprocessing
|
2016-03-09 10:34:07 -08:00 |
|
Anthony J. Thibault
|
e1a3c5b618
|
Fix for vertical pitch offset.
Also, added hysteresis to the controller selection, to prevent flapping back and forth between controllers when they are at rest.
|
2016-03-09 10:31:58 -08:00 |
|
samcake
|
d1135c4a37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-03-09 10:20:54 -08:00 |
|
Anthony J. Thibault
|
4691ca1716
|
Merge branch 'master' into tony/hand-controller-move-improvements
|
2016-03-09 10:06:28 -08:00 |
|
Brad Hefta-Gaub
|
1c07276501
|
fix a couple bugs
|
2016-03-09 09:45:55 -08:00 |
|
Seth Alves
|
a2eb819bc2
|
Merge pull request #7282 from zzmp/fix/tex-cache
Avoid caching textures before they load
|
2016-03-09 09:25:01 -08:00 |
|
Brad Hefta-Gaub
|
5862181e70
|
Merge pull request #7288 from jherico/watchdog
Add a watchdog thread to trigger a crash on detecting a deadlock
|
2016-03-09 09:18:48 -08:00 |
|
Seth Alves
|
efdef52081
|
Merge pull request #7269 from ctrlaltdavid/20822
Restyle bookmark dialogs
|
2016-03-09 07:31:15 -08:00 |
|
Brad Davis
|
95f5d82d37
|
Add a watchdog thread to trigger a crash on detecting a deadlock
|
2016-03-09 00:32:46 -08:00 |
|
Chris Collins
|
d1401796d8
|
Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold
Fix case of RalewaySemiBold font name
|
2016-03-08 21:24:15 -08:00 |
|
PhilipRosedale
|
4728eeb862
|
less of them
|
2016-03-08 20:22:29 -08:00 |
|