Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 00:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46582 commits 69 branches 56 tags 1.2 GiB
Commit graph

899 commits

Author SHA1 Message Date
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12:00
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
487cb7d893 Use findInFrustum in entities list and filter results per search radius 2016-09-09 18:58:38 +12:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation 
Web Entities Virtual Keyboard + Event Bridge support
 2016-09-08 18:36:46 -07:00
Clément Brisset
4437b1b5d6 Merge pull request #8573 from Atlante45/master 
Fix toolBar.js relative path
 2016-09-08 14:22:18 -07:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d Add "in view" button 2016-09-08 12:56:41 +12:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
Anthony J. Thibault
7b4b98971e Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 12:49:13 -07:00
Anthony J. Thibault
9f0550ea7e Raised dpi of WebTablet to fit 480 width keyboard 2016-09-07 10:59:54 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
David Rowe
db30e36b3b Implement expand/collapse action to show/hide table columns 2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78 Ensure that the expand/collapse icon is always visible 2016-09-07 17:09:56 +12:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
David Rowe
dba3efd857 Add expand/collapse extra info toggle icon to entities table header 2016-09-07 15:04:27 +12:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00
Atlante45
e7ebcc0467 Fix toolBar.js relative path 2016-09-06 17:08:23 -07:00
David Rowe
156866f835 Fix "has script" entities list icon 2016-09-07 11:12:04 +12:00
David Rowe
83593087b6 Resize table headers after filter value changed 2016-09-07 11:08:06 +12:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
David Rowe
c44bd902c3 Display render info values only if provided 2016-09-03 13:07:40 +12:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html 
Include a marketplace status bar and access to "marketplace" of marketplaces
 2016-09-02 17:12:05 -07:00
David Rowe
980df19db1 Merge branch 'master' into 21040 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2016-09-03 11:38:27 +12:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Brad Hefta-Gaub
861cf468a3 Merge pull request #8547 from imgntn/save_default_scripts_settings 
Remember setting for 'debug defaultScripts.js'
 2016-09-02 13:08:19 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213 First pass of keyboard raising and lowering 2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205 avoid having auto-unequip code trigger during a teleport 2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed avoid a bootstrap 2016-09-01 17:51:02 -07:00
Seth Alves
da35281941 don't assume collides-with-dynamic during a multi-grab 2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d if a hand is disabled while holding something, release it 2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c include which hand in grab messages 2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6 don't disable grabbing when teleporting 2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128 try to fix far-trigger 2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
James B. Pollack
a8a9577866 actually remove the math.random 2016-08-31 21:14:50 -07:00
Anthony J. Thibault
823420ae0a Working web entity keyboard 
* Missing many keys
* Does not dynamically appear and disappear
 2016-08-31 17:57:13 -07:00
elisa-lj11
288ba96795 reverted default scripts to load marketplace.js 2016-08-31 17:47:16 -07:00
elisa-lj11
bebf9c5890 Added error feature when user tries to download a non fbx file 2016-08-31 17:46:35 -07:00
Seth Alves
47259ee053 find equip-points with controller position rather than hand 2016-08-31 16:52:46 -07:00
James B. Pollack
2acf316d1c fix 2016-08-31 13:45:58 -07:00
Ken Cooke
72535ce237 Fix reverbTest.js which was broken due to missing helper script 2016-08-31 13:09:06 -07:00
James B. Pollack
193065eb05 remove auto toggle 2016-08-31 12:36:28 -07:00
Seth Alves
21b4759b6d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 10:27:44 -07:00