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

128 commits

Author SHA1 Message Date
elisa-lj11
f2e61aa504 added status bar to marketplace 2016-08-29 18:43:32 -07:00
James B. Pollack
2b2b2ecbac caps 2016-08-29 17:44:33 -07:00
James B. Pollack
d3aad53e0e cleanup 2016-08-29 17:43:32 -07:00
James B. Pollack
2a12f2feae marketplaces html 2016-08-29 17:27:39 -07:00
James B. Pollack
95c627aa71 dev 2016-08-29 14:24:36 -07:00
David Rowe
06f0e76647 Merge branch 'master' into 21040 2016-08-27 14:31:28 +12:00
James B. Pollack
264176dac6 css 2016-08-26 14:21:32 -07:00
James B. Pollack
382cbd0a73 start 2016-08-26 14:16:37 -07:00
David Rowe
a0691a581c Fix sense of column sort order indicators 2016-08-26 18:18:52 +12:00
David Rowe
f55d1f7ce7 Make new columns sortable 2016-08-26 17:56:23 +12:00
David Rowe
6de335e1b1 Column heading text and glyphs 2016-08-26 17:24:25 +12:00
David Rowe
1147adae78 Add columns in entity list for render performance information 2016-08-26 15:16:23 +12:00
James B. Pollack
ee190db5eb some comments 2016-08-25 16:27:58 -07:00
James B. Pollack
9be073cc12 handle some more cases 2016-08-25 16:03:12 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
Ryan Huffman
4897d721c3 Merge pull request #8505 from imgntn/json_editor 
New Editor for UserData JSON
 2016-08-24 15:49:32 -07:00
James B. Pollack
af2fb5d7ed beautify more html 2016-08-24 14:54:00 -07:00
James B. Pollack
5305ec7feb html beautify 2016-08-24 14:51:15 -07:00
James B. Pollack
384c3dd543 cleanup and handle a bug when changing from normal text userdata to another field 2016-08-24 14:49:41 -07:00
James B. Pollack
2f4617cd5e quiet some prints 2016-08-23 18:20:33 -07:00
James B. Pollack
a5054487ba save on no selections, select another entity, etc 2016-08-23 18:18:43 -07:00
James B. Pollack
3abbc98857 save when focus on inputs 2016-08-23 15:48:04 -07:00
James B. Pollack
477ed88284 remove autosave, disable save button until change 2016-08-23 14:34:28 -07:00
James B. Pollack
5166a33370 autosave after 1.5 s no changes 2016-08-23 11:53:20 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js 
Also, cap the maximum webEntity texture size to 4096
 2016-08-23 10:10:27 -07:00
James B. Pollack
6ec429fa0b remove unused event listeners 2016-08-23 00:19:03 -07:00
James B. Pollack
d9a39553bd style edits and saved message 2016-08-23 00:14:53 -07:00
James B. Pollack
d0a25e7783 fix switching entities 2016-08-22 23:51:35 -07:00
James B. Pollack
e2a6c08f19 cleanup prints 2016-08-22 17:44:22 -07:00
James B. Pollack
4b61cc9f5f new user data editor 2016-08-22 17:30:08 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
howard-stearns
fc906df5f6 separate into three files 2016-08-22 15:04:38 -07:00
howard-stearns
989974738a dead code removal 2016-08-22 12:50:51 -07:00
David Rowe
80ee864143 Add icon to "Share in Feed" button 2016-08-20 18:17:49 +12:00
David Rowe
8d88726dba Fix spacing above image when single column 2016-08-20 13:57:00 +12:00
David Rowe
a94c24e6df Text and controls 2016-08-20 13:44:47 +12:00
David Rowe
6a9f221a9e Snapshot image border 2016-08-20 11:36:53 +12:00
David Rowe
3d2afaac77 Size and position snapshot dialog content blocks 2016-08-20 11:19:30 +12:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
5e8722ccf5 persist "open feed after" checkbox setting 2016-08-18 12:58:00 -07:00
howard-stearns
8823f48666 new snapshot review behavior 2016-08-17 10:00:20 -07:00
howard-stearns
afe376a0a2 fix breakage I made to snapshot uploading 2016-08-12 14:08:50 -07:00
howard-stearns
1b62332058 don't show checkboxes on confirmation dialog when there's only one picture 2016-08-12 11:50:11 -07:00
howard-stearns
ae9af88db2 Spacing and better size for HMD pictures. 2016-08-12 11:28:35 -07:00
David Kelly
3408ad6f54 Wording change 2016-08-12 10:23:33 -07:00
David Kelly
e23e9014c6 Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares 2016-08-12 10:16:27 -07:00
howard-stearns
e3aae0e93f Fix up layout, and adapt to recent changes in file structure 2016-08-11 16:23:01 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
David Kelly
c1edd008a4 PR feedback 2016-08-11 11:47:55 -07:00
David Kelly
47dea0ea2b Hide sharing if not logged in, or in an accessible place 
The grand future will have option to login, and so on...
 2016-08-10 17:09:43 -07:00
howard-stearns
5715fd00f3 proper share dialog 2016-08-09 16:42:41 -07:00
Zach Pomerantz
d5b822ddbe remove missing camera selectors 2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520 refactor system html to split js/css 2016-08-09 15:23:31 -07:00
James B. Pollack
bde46adee8 update description 2016-08-08 11:31:43 -07:00
James B. Pollack
f8c1d8f123 change property order and cleanup 2016-08-08 11:01:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Andrew Meadows
76cb80112e support new shape types in edit.js 2016-07-06 10:51:43 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText 
Add face camera option to edit.js text entity properties
 2016-06-17 14:14:06 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
James B. Pollack
3b2e0842b0 add face camera to text properties 2016-06-13 23:27:08 -07:00
James B. Pollack
188590a891 cleanup 2016-06-13 13:08:22 -07:00
James B. Pollack
567118f4a9 cleanup 2016-06-13 13:08:12 -07:00
James B. Pollack
342fc07d29 select active element in edit.js after change 2016-06-13 13:06:56 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df Merge pull request #7873 from ctrlaltdavid/20917 
restyle file browser
 2016-05-24 08:40:38 -07:00
David Rowe
3391430f0a Tidy zone flying and ghosting entities editor options 
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
 2016-05-24 20:28:49 +12:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Atlante45
0353e562e4 entityProperties.html handles non object userData 2016-05-20 10:18:32 -07:00
David Rowe
e1d885004f Fix carat in drop-down boxes 2016-05-18 13:59:13 +12:00
David Rowe
17d41dd7b9 HiFi glyphs font file update with fixed up/down carats 
Update QML and HTML spinboxes accordingly.
 2016-05-18 13:25:11 +12:00
Seth Alves
0fe4e42511 added zone properties to allow flying/ghosting or not 2016-05-01 13:53:44 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00