Commit graph

1840 commits

Author SHA1 Message Date
Thijs Wenker
d270979f95 Instructions initial 2015-02-04 23:19:56 +01:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
David Rowe
ca302e305b Add progress.js to defaultScripts.js 2015-02-03 16:17:06 -08:00
David Rowe
78bcf3ddcb Update SVG URLs to use S3 files 2015-02-03 16:15:10 -08:00
David Rowe
8dd87aff16 Adjust size of 2D progress bar 2015-02-03 14:27:43 -08:00
David Rowe
46352d34ce Make 3D progress bar match up with notifications 2015-02-03 14:27:43 -08:00
David Rowe
fdf4aeaeab Display 3D progress bar 2015-02-03 14:27:42 -08:00
David Rowe
7beb5bf25f Show and hide progress bar per downloads status 2015-02-03 14:27:41 -08:00
David Rowe
9b6a81cfb0 Display 2D progress bar 2015-02-03 14:27:41 -08:00
David Rowe
1fdebf63a4 Add progress.js; calculate download percent complete value 2015-02-03 14:27:40 -08:00
Brad Hefta-Gaub
b5e62922a2 Merge pull request #4215 from huffman/edit-changes
A few improvements to editEntities.js
2015-02-03 13:55:59 -08:00
Ryan Huffman
e2b6be2a92 Fix focus behavior when selecting an item without shift 2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e Make auto-focus in editEntities always use ease-on-focus 2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086 Make the entity list always visible 2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Ryan Huffman
74dfd29708 Remove Mass from entity properties window 2015-02-03 11:44:01 -08:00
Philip Rosedale
35aeb86acc First version, dice script 2015-02-02 23:15:18 -08:00
Philip Rosedale
2ae6514c87 Merge pull request #4200 from PhilipRosedale/master
Planet simulation script
2015-02-02 21:31:47 -08:00
Philip Rosedale
aa86db202c Merge branch 'master' of https://github.com/worklist/hifi 2015-02-02 07:05:04 -08:00
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00
Ryan Huffman
a98829ed8a Fix editEntities.js automatically turning on 2015-01-30 13:12:00 -08:00
Philip Rosedale
dfb1cffbd7 Add planet simulation 2015-01-30 10:24:26 -08:00
Ryan Huffman
0d1488e44f Fix editEntities.js includes 2015-01-30 10:03:37 -08:00
Thijs Wenker
8f5f53c14b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 18:50:01 +01:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00
Ryan Huffman
018a4af9d6 Update camera tool to wrap cursor to window bounds rather than keep at center 2015-01-30 09:22:39 -08:00
Ryan Huffman
cddce8f795 Update editEntities to always be on + use right click for select 2015-01-30 09:21:27 -08:00
Ryan Huffman
5d8825f5eb Remove call to gridTool.mousePressEvent 2015-01-30 08:56:37 -08:00
Thijs Wenker
adc7ed5f72 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 02:37:00 +01:00
Ryan Huffman
d06d8b8f01 Merge branch 'master' of github.com:highfidelity/hifi into revert-grid
Conflicts:
	examples/libraries/gridTool.js
2015-01-29 17:27:58 -08:00
Ryan Huffman
7017fdbac0 Update style of grid tools 2015-01-29 16:59:58 -08:00
Ryan Huffman
0307448ec3 Fix color index for entity grid tool 2015-01-29 16:59:37 -08:00
Ryan Huffman
eb69720af4 Update when grid tool window is shown 2015-01-29 16:58:48 -08:00
Ryan Huffman
c00346e8cb Revert "Remove gridControls.html"
This reverts commit a0cb40597b.
2015-01-29 16:45:19 -08:00
Brad Hefta-Gaub
8a32bd2eed Merge pull request #4164 from ctrlaltdavid/20183
CR for 20183 Add Oculus support to notifications.js
2015-01-29 13:38:49 -08:00
Thijs Wenker
34fd44c081 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-29 22:32:26 +01:00
Brad Hefta-Gaub
f5e092c0d2 Merge pull request #4187 from huffman/parallel-script-loading
Parallel script loading
2015-01-29 13:26:37 -08:00
Brad Hefta-Gaub
07d049ef2b Merge pull request #4188 from PhilipRosedale/master
Add menu to paddleBall for hand choice
2015-01-29 10:56:57 -08:00
Philip Rosedale
0c3f4b894c Menu for handedness, that really works. 2015-01-29 10:53:50 -08:00
Brad Hefta-Gaub
838cb41646 Merge pull request #4163 from PhilipRosedale/master
Popcorn & building blocks scripts, some fixes
2015-01-29 09:28:23 -08:00
Ryan Huffman
3447fea1db Revert "Update grid tool to be an overlay"
This reverts commit 552a421f24.

Conflicts:
	examples/libraries/gridTool.js
2015-01-28 16:01:04 -08:00
Ryan Huffman
1b81ee17ab Update how orbit-by-key is appleid 2015-01-28 12:23:58 -08:00
Ryan Huffman
09af7ed10f Remove extra print statement 2015-01-28 12:21:58 -08:00
Ryan Huffman
a775476cfa Remove editEntities move-by-arrow-key completely 2015-01-28 12:21:50 -08:00
Ryan Huffman
55f41eb452 Update gridTool to not use clone 2015-01-28 12:20:08 -08:00
Ryan Huffman
135c8c1bdf Disable move entity by arrows 2015-01-28 12:19:54 -08:00
Ryan Huffman
5633be0e92 Add ability to move orbit camera using keys 2015-01-28 12:19:42 -08:00
Ryan Huffman
e1ca6d5048 Disable editentities auto-off when moving avatar 2015-01-28 12:16:28 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224
Conflicts:
	interface/src/ui/ApplicationOverlay.h
2015-01-28 19:35:17 +01:00
Philip Rosedale
a85c6aa956 fix tabs? 2015-01-28 09:49:45 -08:00