Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 00:34:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40357 commits 71 branches 56 tags 1.2 GiB
Commit graph

40357 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Clément Brisset
3f50abcd17 Merge pull request #82 from birarda/atp-rename-mapping 
add rename mapping operation for atomic rename
 2016-03-09 11:57:20 -08:00
Stephen Birarda
9587620eb1 Merge pull request #83 from Atlante45/feat/atp 
Add message boxes for rename and delete
 2016-03-09 11:42:57 -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
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
Atlante45
380480d4ee Add a couple more dialogs 2016-03-08 18:19:26 -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
Atlante45
169af80bc0 Add a couple dialogs 2016-03-08 17:11:54 -08:00
Atlante45
028c7ab6ba Add text box 2016-03-08 17:11:54 -08:00
Atlante45
254e04c4b7 UI change 2016-03-08 17:11:54 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -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
Stephen Birarda
6abd1c50b2 remove the inlined writeError in AssetServer 2016-03-08 15:45:13 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -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
Stephen Birarda
33cadb36da add server side handling for mapping rename 2016-03-08 14:57:22 -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
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00