Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 14:17:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50738 commits 74 branches 59 tags 1.2 GiB
Commit graph

50738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
d02ef9fb86 Merge pull request #9415 from hyperlogic/tablet-ui2 
Adjusted tablet spawn position and orientation to be more natural
 2017-01-18 06:36:18 -08:00
Seth Alves
3fe9505f18 Merge pull request #9414 from fayeli/menu-scrolling 
Fix tablet menu scrolling issue
 2017-01-18 06:35:06 -08:00
Brad Hefta-Gaub
5036781b81 Merge pull request #9406 from jherico/atp_core_usage 
Consume fewer cpu cores in AssetServer when interface is running locally
 2017-01-18 06:50:48 -06:00
humbletim
6320d872b4 remove commented code 2017-01-18 02:57:13 -05:00
humbletim
f88b39918f switch to messaging for toggle notifications; cleanup 2017-01-18 02:54:42 -05:00
humbletim
1048c2a3bf apply default userData values; add error checking; throttle toggle clicks 2017-01-18 01:40:28 -05:00
Anthony J. Thibault
03f8a310fc Fix for exception on script ending 2017-01-17 18:17:41 -08:00
Anthony J. Thibault
c6f3eb138a Adjusted tablet spawn position and orientation to be more natural 2017-01-17 18:16:40 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
David Kelly
f5300d3862 Removing some PAL-related interface log spam 
Probably more, but these _seem_ to be the worst
 2017-01-17 17:06:18 -08:00
Faye Li Si Fi
d7209ef7f7 syntax 2017-01-17 16:56:54 -08:00
Faye Li Si Fi
42a96a94b4 fix 2017-01-17 16:54:40 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
Faye Li Si Fi
126bfba512 fix tablet menu scrolling issue 2017-01-17 16:40:12 -08:00
Zach Fox
7a568ed8a7 Merge pull request #9401 from zfox23/PAL_DisplayName 
PAL: Editable Display Names & Immediate Update
 2017-01-17 16:00:41 -08:00
Atlante45
97e9bfff36 Remove Viewer API for entity server scripts 2017-01-17 15:40:05 -08:00
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Anthony J. Thibault
56fc42a2bd clara.io marketplace works on tablet 2017-01-17 15:38:44 -08:00
Clément Brisset
57d324a9e9 Merge pull request #8 from huffman/feat/entity-server-script-property 
Add serverScripts entity property
 2017-01-17 15:37:07 -08:00
Ryan Huffman
340eeb94fa Add return type to lambdas in EntityTreeRenderer 2017-01-17 15:24:14 -08:00
samcake
246dcbd0c0 Removing the warning 2017-01-17 15:01:27 -08:00
Zach Fox
59ff970d5b CR feedback 2017-01-17 15:01:02 -08:00
Seth Alves
c8382e6853 Merge pull request #9412 from fayeli/menu-fix 
Fixes for Tablet Menu Issues
 2017-01-17 14:58:47 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 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
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
David Kelly
341ac685e9 Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists 
remove ignored avatars from PAL when they disconnect
 2017-01-17 14:21:36 -08:00
Atlante45
1212fefa61 Check for avatar collision in assignment as well 2017-01-17 13:47:45 -08:00
Atlante45
8d199ded15 Check collision against the right owner 2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95 More entity script server work 2017-01-17 13:47:45 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Seth Alves
016d247fc8 Merge pull request #9411 from sethalves/tablet-ui-fix-other-camera-index 
Tablet ui fix other camera index
 2017-01-17 13:34:36 -08:00
Seth Alves
be165b567e remove XXX comments 2017-01-17 13:32:58 -08:00
Seth Alves
e76f1c5937 if another avatar has something hung from their camera, don't act like their camera is my camera 2017-01-17 13:28:13 -08:00
Seth Alves
89d7b8bfc6 call releaseEquip when an equipped entity is dropped with a secondary press 2017-01-17 13:27:01 -08:00
Ryan Huffman
d9e7c423f6 Merge pull request #9409 from birarda/granular-stats 
add 1s heartbeat interval command line switch
 2017-01-17 13:21:42 -08:00
Faye Li Si Fi
20ac96a7f9 fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page 2017-01-17 12:29:38 -08:00
samcake
5ed3b48f9d adding the checkbox to show the meta bounds from the debugDeferredLighting.js 2017-01-17 12:15:09 -08:00
David Kelly
9b1aaf3bfe CR feedback 2017-01-17 12:09:47 -08:00
Faye Li Si Fi
965f9ab0a7 fix tapping menu when already at the top-level menu blanks the tablet 2017-01-17 11:58:48 -08:00
Zach Fox
246f5fb7f5 Add log; fix whitespace 2017-01-17 11:51:09 -08:00
Stephen Birarda
1e04aebb8d add --fast-hearbeat command line switch for 1s stats 2017-01-17 11:25:40 -08:00
samcake
69f9053e61 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-17 10:55:10 -08:00
samcake
305e308575 avoiding the exclusive filtering behavior 2017-01-17 10:54:45 -08:00
Seth Alves
0cc317d13b Merge pull request #9408 from sethalves/tablet-ui-fix-unhook-loop 
avoid an unhook loop if two different hands have passed something bac…
 2017-01-17 10:25:32 -08:00
Seth Alves
5c205f5800 avoid an unhook loop if two different hands have passed something back and forth more than once 2017-01-17 10:24:30 -08:00
Seth Alves
3d8b504ace Merge pull request #9407 from sethalves/tablet-ui-upstream-merge 
Tablet ui upstream merge
 2017-01-17 10:21:28 -08:00