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

5954 commits

Author SHA1 Message Date
Seth Alves
460fdc0761 Merge pull request #7536 from samcake/orange 
First pass at using compressed format when uploading textures
 2016-04-12 11:59:10 -07:00
samcake
ef70d41cf4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-08 09:41:35 -07:00
James B. Pollack
b407e20e4b remove regexp 2016-04-08 00:52:09 -07:00
James B. Pollack
fba6a74cf6 remove refresh for now 2016-04-08 00:50:15 -07:00
Seth Alves
723af9bcbd host voxel icons on s3 rather than hungry.com 2016-04-07 20:34:34 -07:00
Brad Hefta-Gaub
d79d66c34e Merge pull request #7601 from ctrlaltdavid/20871 
Entities editor fixes
 2016-04-07 17:14:00 -07:00
David Rowe
86d314f31a Clarify code comment 2016-04-08 10:47:45 +12:00
Brad Hefta-Gaub
e7d75cb22e Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children 
Update collision hulls of avatar children
 2016-04-07 14:47:44 -07:00
Seth Alves
45733478da make auto-unequip code smarter -- equipping a long thing by the end is now possible 2016-04-07 13:15:39 -07:00
Brad Hefta-Gaub
dc4751a95b Merge pull request #7595 from ZappoMan/depthReticleWork 
Fix a random case of the depth reticle hiding when it shouldn't
 2016-04-07 12:06:20 -07:00
David Rowe
fd7a6ed042 Fix checkbox being clickable outside of checkbox and label extents 2016-04-07 17:20:40 +12:00
Brad Hefta-Gaub
89a7b5f731 Merge pull request #7548 from ericrius1/roomAudio 
Add examples for entity scripts that set up audio reverb zones
 2016-04-06 19:09:09 -07:00
David Rowe
9119b82718 Fix right margin of entities list 2016-04-07 08:19:16 +12:00
David Rowe
b6a511ac80 Fix spin box buttons not appearing on OSX 2016-04-07 08:15:25 +12:00
David Rowe
dfa7416acb Fix horizontal scrollbar appearing in entity properties tab on OSX 2016-04-07 08:10:24 +12:00
David Rowe
079e4080c1 Fix entities editor fonts on OSX 2016-04-07 08:04:52 +12:00
ericrius1
0e08b15db7 spacing fix attempt 2016-04-06 11:30:29 -07:00
Brad Hefta-Gaub
0f4e1e79fd Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-04-06 11:01:00 -07:00
Brad Hefta-Gaub
8c15116190 fix auto-hide logic in depthReticle 2016-04-06 11:00:43 -07:00
ericrius1
2be2f940ea remove panel 2016-04-06 10:59:18 -07:00
ericrius1
21f6d7bee3 fixed largeroom illegal characters 2016-04-06 10:50:58 -07:00
ericrius1
ce290a1993 got rid of illegal character 2016-04-06 10:38:59 -07:00
ericrius1
9cac249122 f1 2016-04-06 10:36:38 -07:00
samcake
e28e85a29c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-06 09:30:53 -07:00
Brad Hefta-Gaub
52497b1dfc Merge pull request #7560 from sethalves/remove-handcontroller-touch 
remove code that sends entity 'touch' events
 2016-04-05 17:50:07 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12:00
samcake
710c4a1b8f TRying to merge and expose counters for in flights transfers 2016-04-05 12:18:30 -07:00
Seth Alves
ace4546dec make handGrabController search ray follow controller rather than IK driven hand 2016-04-04 12:49:03 -07:00
samcake
f3e6c490a4 merging with master, moving the TexelFOrmat function to a cpp 2016-04-04 12:03:37 -07:00
Seth Alves
0bd747fa06 remove code that sends entity 'touch' events 2016-04-04 11:00:27 -07:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Zach Pomerantz
d78338330c Rm unused trigger from renderStats 2016-04-01 20:06:10 -07:00
Zach Pomerantz
b0185dc355 Add cacheStats.js 2016-04-01 20:06:10 -07:00
Zach Pomerantz
41cdb29bd2 Use a timer in plotperf 2016-04-01 20:06:09 -07:00
Zach Pomerantz
36e04f4434 Mv PlotPerf to shared dir 2016-04-01 19:52:44 -07:00
Seth Alves
3f3efc4250 remove debug prints 2016-04-01 17:55:12 -07:00
ericrius1
048d745af9 update 2016-04-01 17:53:02 -07:00
ericrius1
f7f7c18d72 added new audio room examples 2016-04-01 17:45:15 -07:00
ericrius1
5bbca785b3 added new audio room examples 2016-04-01 17:43:10 -07:00
Seth Alves
9942a5edd4 don't reset local offset during a hold 2016-04-01 17:22:20 -07:00
Seth Alves
d9f5a0ccaf experiment 2016-04-01 17:17:21 -07:00
Seth Alves
f05f283b04 disable setting of angular velocity upon release of a parenting grab 2016-04-01 16:58:17 -07:00
Seth Alves
bfa2d8f405 set angular velocity on parenting-grab release 2016-04-01 15:11:01 -07:00
Seth Alves
eb22b5e4a7 velocity is now set when a parenting grab ends, though not angular velocity 2016-04-01 14:50:42 -07:00
Seth Alves
7c8050790b set velocity when something is un-parent-grabbed 2016-04-01 14:20:36 -07:00
Stephen Birarda
eaa0ba9e32 rename marketplace.js to examples.js 2016-04-01 14:16:44 -07:00
Seth Alves
0006ba281f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-04-01 13:46:31 -07:00
Brad Hefta-Gaub
7db22ee8c2 Merge pull request #7477 from ericrius1/cowTipper 
Adds a cow which untips itself and moos when it collides with an entity
 2016-04-01 13:08:41 -07:00
Brad Hefta-Gaub
95e0682012 Merge pull request #7446 from ctrlaltdavid/20855 
Restyle entities editor
 2016-04-01 13:07:58 -07:00