Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 19:12:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19146 commits 25 branches 0 tags 1.1 GiB
Commit graph

1396 commits

Author SHA1 Message Date
ZappoMan
3ee6d6a6db work in making entity script mixable and inheritable 2014-11-23 20:12:52 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20 text sizing tweaks 2014-11-23 11:21:05 -08:00
ZappoMan
437af06245 switch to 3d text for description 2014-11-23 11:16:33 -08:00
ZappoMan
53bd8fd6d2 handle no description and blank panels better 2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d handle line wrapping in description 2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81 first cut at lobby tweaks 2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Philip Rosedale
983975e872 lets you grab an object and turn it near your face to better see it 2014-11-21 20:05:36 -06:00
Philip Rosedale
85419a3e2d limit max distance of movement, don't pull to 3P unless going back 2014-11-21 01:04:52 -06:00
Philip Rosedale
5d6d9ae0df cleaner version 2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d jump with number keys to preset places 2014-11-20 22:48:03 -06:00
Philip Rosedale
9a9f6bc485 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805 Merge pull request #3844 from ZappoMan/sitEntityScript 
First cut at sit entity script
 2014-11-20 19:20:39 -06:00
Stephen Birarda
64d9dc4efa fix for scaling of lobby and missing reticle 2014-11-20 17:05:37 -08:00
Philip Rosedale
ddcd39ea65 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 18:51:04 -06:00
Philip Rosedale
d8a74a4db4 add max distance at which you will auto-magically look at someone else 2014-11-20 18:34:06 -06:00
Stephen Birarda
7f795ec67c repairs for new lobby shell 2014-11-20 16:20:32 -08:00
Stephen Birarda
4f879a06a6 fix flipped URLs for models in lobby 2014-11-20 16:11:08 -08:00
ZappoMan
3761f24619 fix stand up icon 2014-11-20 16:08:36 -08:00
Stephen Birarda
c15354d935 update lobby for new orb and panel wall 2014-11-20 15:44:05 -08:00
ZappoMan
ee6516970e first cut at entity script for sitting 2014-11-20 15:37:00 -08:00
Philip Rosedale
cd2a6f0f9c merge fix 2014-11-20 17:35:50 -06:00
Stephen Birarda
0a6ffe3dbd Merge pull request #3841 from birarda/master 
fix oculus mode check for lobby
 2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c fix oculus mode check for lobby 2014-11-20 10:55:40 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create 
Entity snap on create (+ remove getEntityItemID)
 2014-11-20 09:58:54 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Stephen Birarda
f3b5102969 remove texture replace fix to avoid a crash 2014-11-20 09:38:41 -08:00
Ryan Huffman
6f0d5faa5b Update tools to snap to grid on creation 2014-11-20 09:20:22 -08:00
Philip Rosedale
5101e469dc Merge branch 'master' of https://github.com/worklist/hifi 2014-11-19 23:54:31 -06:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window 
Entity list window
 2014-11-19 17:05:48 -08:00
Ryan Huffman
4b5d67d519 Update entityList.js to check for invalid entityIDs 2014-11-19 15:33:32 -08:00
Stephen Birarda
afe4a4e432 don't show reticle if not wearing HMD, reset panel textures 2014-11-19 15:26:18 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Stephen Birarda
45450c4fe3 handle offset passed in AudioInjectorOptions for mixer injections 2014-11-19 13:42:24 -08:00
Stephen Birarda
81c5f9ba5a inject lobby music at a random starting point 2014-11-19 13:36:27 -08:00
Ryan Huffman
0242e0efcf Fix layout of entity list window 2014-11-19 13:35:08 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Stephen Birarda
03bfaa4869 handle RAW stereo audio files by using stereo.raw extension 2014-11-19 12:20:12 -08:00
Ryan Huffman
1706faf2da Fix animationIsPlaying not showing correctly in properties tool window 2014-11-19 11:20:47 -08:00
Ryan Huffman
4d56c21442 Add snapping to vertical translation 2014-11-19 10:35:42 -08:00
Philip Rosedale
9afaf8f6d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 21:58:40 -08:00
Brad Hefta-Gaub
51a2bf8226 Merge pull request #3825 from Atlante45/fix_ac_deadlock 
AC ambiance script / moved AC scripts to new directory
 2014-11-18 17:47:33 -08:00
Atlante45
44190b6fde AC ambiance script / moved AC scripts to new directory 2014-11-18 17:27:37 -08:00
Philip Rosedale
340742ec36 Merge pull request #3821 from ZappoMan/movables 
More work on the movable.js script
 2014-11-18 16:53:09 -08:00
Brad Hefta-Gaub
ee19a2d5a7 Merge pull request #3820 from huffman/grid-updates 
Grid tool updates + fixes
 2014-11-18 14:57:08 -08:00
ZappoMan
c070835681 use move sounds for turning until further research and foley work 2014-11-18 14:41:56 -08:00
ZappoMan
b53124cba7 tweaks to sound behavior 2014-11-18 14:25:12 -08:00
Ryan Huffman
16e3887cbc Set snapToGrid to default to false 2014-11-18 10:28:14 -08:00