Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:57:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21898 commits 76 branches 59 tags 1.2 GiB
Commit graph

1887 commits

Author SHA1 Message Date
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
Brad Davis
0726f7cd21 Example images from text rendering test 2015-02-01 19:49:01 -08:00
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00
Brad Davis
acf0b292e9 Adding example images 2015-01-31 21:53:34 -08: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
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Philip Rosedale
117e6abb46 remove debug and PR fixes 2015-01-28 09:34:15 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -08:00
Thijs Wenker
3e4f4ecc6b addOverlay rather than cloneOverlay now that we have a TextureCache for the ImageOverlay 2015-01-28 00:39:19 +01:00
Thijs Wenker
6947436994 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-27 22:29:49 +01:00
Brad Hefta-Gaub
0c4dc4100d Merge pull request #4176 from huffman/fix-inspect 
Fix inspect + editEntities cameras from clashing
 2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub
0c53193e79 Merge pull request #4175 from cozza13/20283 
CR for Job #20283 - Clean up scripts that have recently been added.
 2015-01-27 13:05:17 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Chris Collins
283a056a43 remove VRui 
remove VRui
 2015-01-27 11:37:31 -08:00
Ryan Huffman
80002551f9 Update editEntities camera to not enable if camera is in independent mode 2015-01-27 11:28:39 -08:00
Ryan Huffman
2556b4790b Update inspect.js to not activate if camera is in independent mode 2015-01-27 11:28:20 -08:00
Chris Collins
411541b884 Tidy up some scripts. 
Tidy up scripts. Make some changes to some script references and
reorganize.
 2015-01-27 11:04:50 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886 Grab now correctly adds linear velocity so that you can grab and throw things 2015-01-26 21:09:21 -08:00
Philip Rosedale
005cd2ba53 Add block building toolset, first version 2015-01-26 20:44:47 -08:00
Philip Rosedale
bf0cde060c Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c remove 'STICKS' mode, add drop line to better tell what something you are holding is above 2015-01-26 20:19:46 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
Thijs Wenker
ffb35666e1 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-26 19:37:27 +01:00
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Ryan Huffman
4fd5f74365 Update editEntities.js to load includes in parallel 2015-01-22 14:14:49 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
David Rowe
7d1cc1f20d Make 3D "x" button work 2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6 Position and angle 3D notifications in lower part of view 2015-01-21 21:34:34 -08:00
Brad Hefta-Gaub
7d7411ceee Merge pull request #4146 from PhilipRosedale/master 
Improved Billiards, Gun
 2015-01-21 19:36:20 -08:00
David Rowe
00de7062cc Longer persist time for 3D notifications 2015-01-21 18:03:00 -08:00
David Rowe
f3147ab3e4 Move 3D notifications up as old ones are deleted 2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f Update 3D notification positions as avatar moves 2015-01-21 17:08:31 -08:00
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
David Rowe
be6c6ed8ca Add 3D notifications on a simple vertical plane 2015-01-21 16:10:33 -08:00
Thijs Wenker
724b56ed8c HMD.getHUDLookAtPosition2D -> HMD.HUDLookAtPosition2D 2015-01-22 01:09:16 +01:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00