Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 11:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40424 commits 29 branches 28 tags 1.2 GiB
Commit graph

40424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
4022474b48 Constrain procedural updates to render thread 2016-03-09 19:39:38 -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
Anthony Thibault
42d27557a1 OpenVR: remove 180 y rotation for UI bounds. 
Turns out the room I was using was misconfigured.
 2016-03-09 18:42:58 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
James B. Pollack
a8ac556103 merge 2016-03-09 17:41:14 -08:00
Anthony J. Thibault
5f1b8805cf Removed unnecessary include 2016-03-09 17:37:51 -08:00
James B. Pollack
f35ab59044 adjust bubbles and add a treasure chest 2016-03-09 17:36:45 -08:00
Zach Pomerantz
40fbe2d1e5 Reuse procedurals on entities 2016-03-09 17:34:03 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120 Update the watchdog heartbeat manually during startup 2016-03-09 17:00:45 -08:00
Anthony J. Thibault
886457939d Merge branch 'master' into tony/wrong-way-overlay 2016-03-09 16:50:18 -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
Anthony Thibault
5df616be37 OpenVR: More usable UI Sphere overlay location 
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
 2016-03-09 16:24:08 -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
Anthony J. Thibault
4af3766804 Don't reset sensors when initializing or changing display plugins. 
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
 2016-03-09 14:28:26 -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
Andrew Meadows
4ae94c0611 fine tuning for when to make simulation bid 2016-03-09 13:06:34 -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
Andrew Meadows
9157ff6eda more correct notion of desired simulation priority 2016-03-09 11:02:50 -08:00
Brad Davis
80fdef4348 Ensure the heartbeat has a valid value before the thread starts 2016-03-09 10:53:01 -08:00