Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-25 14:30:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51176 commits 25 branches 0 tags 1.1 GiB
Commit graph

196 commits

Author SHA1 Message Date
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
Faye Li
c24b6e5e5e missing words 2017-02-01 15:13:52 -08:00
Faye Li
c16a9a955e display correct username 2017-02-01 14:53:03 -08:00
Faye Li
9a22055c27 initialise the toggle button with correct info 2017-02-01 14:30:16 -08:00
Faye Li
3c3ff908b4 handling the visibility toggle event 2017-02-01 14:22:13 -08:00
Faye Li
6d55b3c82d visibility toggle drop down 2017-02-01 13:45:17 -08:00
Faye Li
378fdaec8b the missing commit - fix typo and added user info 2017-02-01 11:27:48 -08:00
Faye Li
3f84e5778c jump to the selected user 2017-02-01 10:45:18 -08:00
Faye Li
fc1e588588 sending and recieving jump to event 2017-02-01 10:34:54 -08:00
Faye Li
59aea60be0 fill confirmation modal with data of the selected user 2017-01-31 16:16:40 -08:00
Faye Li
fda20694b3 jump to user confimation modal 2017-01-31 15:47:51 -08:00
Faye Li
06d797bb3b load bootstrao 2017-01-31 14:27:17 -08:00
Faye Li
8e64de26a9 Merge branch 'tablet-ui' into new-users-js 2017-01-30 11:25:58 -08:00
Faye Li
ff1c4995af removed unused code 2017-01-27 15:44:07 -08:00
Faye Li
8091b0ced4 button style 2017-01-27 13:33:07 -08:00
Faye Li
bf51ba7195 button brings up add/remove friends page 2017-01-27 11:34:38 -08:00
Faye Li
bfbee20f43 display friends 2017-01-27 10:19:20 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Faye Li
6a4a9bcb32 end of day commit 2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e polling users and displaying user count 2017-01-25 17:36:50 -08:00
Faye Li
b5b781f4a5 tab content switching 2017-01-25 16:59:16 -08:00
Faye Li
5ad522668a tabs header for everyone and friends 2017-01-25 16:29:25 -08:00
Faye Li
ce0ee610ea a test on polling friends 2017-01-25 14:32:36 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Faye Li
f02b2ef40a auto poll users when page loads 2017-01-25 11:59:31 -08:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Ryan Downe Karpf
3f151cb3d7 Merge pull request #9483 from Atlante45/fix/rescale 
Fix Edit.js rescale for decimal values
 2017-01-23 15:44:10 -08:00
Faye Li Si Fi
f8162970ec filter out yourself from user list 2017-01-23 15:24:33 -08:00
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a Fix width of edit.js dropdown to accomodate collision options 2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b Update the name of the collision shapes used in edit.js properties 
Update the names to be consistent with what is shown on the add model
dialog.
 2017-01-23 13:56:48 -08:00
Faye Li Si Fi
afc85a3afe Don't display users who aren't in a domain 2017-01-20 13:53:09 -08:00
Faye Li
763028dad4 refresh icon 2017-01-19 15:46:02 -08:00
Faye Li
5bc0030c8f hook up event bridge 2017-01-19 15:24:56 -08:00
Ryan Huffman
7cd19192d9 Remove dead code in entityProperties.js 2017-01-19 15:00:30 -08:00
Faye Li
bbed26c8fa display all online users 2017-01-19 14:34:28 -08:00
Faye Li
23269c2efb move refresh button to top bar 2017-01-19 13:41:36 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Faye Li
193251eb8d background 2017-01-19 13:11:35 -08:00
Faye Li
450b94f641 load font 2017-01-19 12:55:06 -08:00
Faye Li
53404caccf top bar css 2017-01-19 12:15:27 -08:00
Faye Li
10f512306e successfully polling all online users 2017-01-19 10:58:29 -08:00
Faye Li Si Fi
5ad1cc6f4d end of day commit 2017-01-18 18:03:16 -08:00
Faye Li Si Fi
75b1eba84e initial commit for users.html 2017-01-18 16:10:42 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00