Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 16:03:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40281 commits 75 branches 59 tags 1.2 GiB
Commit graph

40281 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
7cdd3d5b3e Merge pull request #7296 from imgntn/cellscience 
Various Cellscience Fixes
 2016-03-09 15:11:58 -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 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
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
samcake
d1135c4a37 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-09 10:20:54 -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
samcake
2fc359d34c Merge branch 'orange' of https://github.com/samcake/hifi into orange 2016-03-08 19:42:54 -08:00
samcake
5f80d7e53e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 19:42:26 -08:00
samcake
bb9957b7f1 using comments from review 2016-03-08 18:45:20 -08:00
Brad Hefta-Gaub
cb70c398cd Merge pull request #7233 from jherico/vive_menu 
Fix the Vive controllers to support menus
 2016-03-08 18:03:32 -08:00
samcake
bfed0304c3 Merge pull request #7218 from zzmp/fix/resort-in-octree 
Fix item key lookup on updated items in scene
 2016-03-08 17:48:51 -08:00
ericrius1
9d1217e02d aded lifetime to flowers so they die after a while 2016-03-08 17:37:56 -08:00
ericrius1
a236fceead color pallete 2016-03-08 16:58:42 -08:00
ericrius1
f7028cef6e Flowers blending more into rocks 2016-03-08 16:51:24 -08:00
ericrius1
17454fdb01 two colors 2016-03-08 16:36:59 -08:00
David Rowe
973fa28d3f Fix case of RalewaySemiBold font name 2016-03-09 13:32:37 +13:00
Brad Davis
17852e86d2 Fixing enum names 2016-03-08 16:16:44 -08:00
samcake
afbec33f36 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 16:12:21 -08:00
ericrius1
c928b9e411 starting color 2016-03-08 16:09:19 -08:00
David Rowe
155a084eaa Temporarily rename file a part of changing case of filename 2016-03-09 13:08:44 +13:00
Seth Alves
80e4864324 Merge pull request #7283 from ZappoMan/fixSceneNotStable 
Fix scene not stable bug
 2016-03-08 16:07:24 -08:00
ericrius1
41782dbd8d basic shader 2016-03-08 15:56:06 -08:00
ericrius1
bcd8d8fb30 no water sound 2016-03-08 15:46:55 -08:00
Brad Hefta-Gaub
8d4ef28411 CR feedback 2016-03-08 15:29:04 -08:00
David Rowe
269936f3ac Fix typo 2016-03-09 12:20:09 +13:00
Brad Davis
f651adbd24 Correcting vive button naming 2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06 Removing thumb mappings, using start/back for camera and menu 2016-03-08 15:09:45 -08:00
Brad Davis
ac1ab4b5b7 Map the primary thumbs to menu/camera as well as the secondary thumb 2016-03-08 15:09:44 -08:00
David Rowe
edc50f102d Fix "duplicate bookmark" dialog 2016-03-09 11:55:09 +13:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00