Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41659 commits 2 branches 0 tags 1.1 GiB
Commit graph

41659 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
e8d58483aa fix typo 2016-03-31 16:37:08 -07:00
Seth Alves
0e643a1555 debugging prints 2016-03-31 16:26:54 -07:00
Brad Hefta-Gaub
bbca1ba6db only do depth reticle depth check when the reticle is visible 2016-03-31 15:58:37 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
David Rowe
a2953595a5 Tweak spinbox fields for large values 2016-04-01 10:23:39 +13:00
Ryan Huffman
1c1158b761 Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
David Rowe
048865fb09 Style spin buttons 2016-04-01 09:55:27 +13:00
Seth Alves
a8b4d1a379 ray follows controller 2016-03-31 13:46:00 -07:00
Seth Alves
a89735cb76 integrate Philip's changes to distance grabbing 2016-03-31 13:29:31 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Seth Alves
6dec015b85 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-31 13:18:47 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00
David Rowe
dbd6b9e90b Use monospace font for textarea fields 2016-04-01 08:50:11 +13:00
Seth Alves
aea06914b4 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 11:45:48 -07:00
howard-stearns
1df9a57e58 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:56:55 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Brad Davis
b53968fd64 Add automatic switching the Oculus headphones and mic when activating the plugin 2016-03-31 10:33:11 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones 
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
 2016-03-31 10:14:32 -07:00
howard-stearns
258ffbc8ac Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:08:01 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Seth Alves
8299041997 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 09:44:56 -07:00
Brad Hefta-Gaub
2e129a398f add example script for testing 2016-03-31 09:37:03 -07:00
Brad Hefta-Gaub
03f9a2b46f more optimization in find best zone 2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -07:00
David Rowe
2ac9f282c7 Merge branch 'master' into 20855 2016-03-31 17:00:09 +13:00
Seth Alves
ae971c0f30 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 20:58:44 -07:00
David Rowe
31b96c75ca Tidying 2016-03-31 16:53:03 +13:00
David Rowe
f584d4d00c Style parent joint index property as a number 2016-03-31 16:49:11 +13:00
David Rowe
751a37a1ff Arrange more properties in rows 2016-03-31 16:48:40 +13:00
Brad Hefta-Gaub
30cb62f1aa Merge pull request #7517 from zzmp/fix/qml-renderer 
Check for valid qml gl context creation
 2016-03-30 19:52:03 -07:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
32a90b4709 Merge pull request #7521 from sethalves/fix-load-from-disk 
fix script load from disk on windows
 2016-03-30 19:29:11 -07:00
Seth Alves
c3b95e8284 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-30 19:12:31 -07:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release 
Update to latest Oculus SDK, add input device support
 2016-03-30 17:42:32 -07:00
Seth Alves
7c4c6413ed Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-30 17:35:14 -07:00
Seth Alves
e44e3df6d5 Merge branch 'fix-load-from-disk' of github.com:sethalves/hifi into equip-via-thumb 2016-03-30 17:35:01 -07:00
Brad Hefta-Gaub
89d41c55ea Merge pull request #7520 from hyperlogic/tony/octree-tests 
OctreeTests: added unit tests for EntityTreeElement child accessors
 2016-03-30 17:30:12 -07:00
Clément Brisset
be07426d5a Merge pull request #7515 from birarda/console-to-sandbox 
rename the Server Console to Sandbox
 2016-03-30 17:29:15 -07:00
Seth Alves
651d2c8954 fix script load from disk on windows 2016-03-30 17:27:36 -07:00
Seth Alves
40f30b9141 get rid of distance equip 2016-03-30 17:25:53 -07:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
Clément Brisset
14934678fc Merge pull request #7513 from birarda/ice-server-lockup 
use NetworkAccessManager in IceServer for single QNAM instance
 2016-03-30 17:05:13 -07:00
Stephen Birarda
d8b0dbf3bf fix indentation for last inactive check timestamp 2016-03-30 16:58:35 -07:00
howard-stearns
51a4154ae7 Check results of qUncompress, and catch fbx reader throws in utility 
programs.
 2016-03-30 16:56:39 -07:00