Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 13:13:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
51109 commits 71 branches 56 tags 1.2 GiB
Commit graph

51109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
ba025d44e0 Merge pull request #9642 from AndrewMeadows/beware-humbletim 
fix performance problem for invalid "avatarEntityData"
 2017-02-14 06:33:48 -08:00
Seth Alves
2e245e9cba Merge pull request #9667 from huffman/fix/entity-scripts-not-loading 
Fix entity scripts not loading in certain cases
 2017-02-14 06:20:29 -08:00
Ken Cooke
bf077e6fdb Merge pull request #9623 from zzmp/audio/should-ignore 
Optimize ignore zone checks for audio mixer
 2017-02-14 06:18:54 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
Anthony Thibault
ab09cc4339 Merge pull request #9658 from Atlante45/feat/capture-entity-clicks 
Add entity clicks capture capabilities
 2017-02-13 19:05:29 -08:00
Brad Hefta-Gaub
0dcf6ebd76 Merge pull request #9664 from howard-stearns/lastEditedBy-without-physics 
lastEditedBy is set by add/edit, but not by physics packets
 2017-02-13 17:17:50 -08:00
howard-stearns
487adc7f18 whitespace 2017-02-13 16:35:03 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
Ryan Huffman
d0cddd01d7 Fix entity scripts not loading in certain cases 
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.

Flow of events:

  Entity added
  => Entity added event emitted
  Entity edited
  => Script changing event emitted
  <= Entity added event received
  Script loaded
  <= Script changing event received
  Script stopped
  Tries to load script again, but because the script hasn't changed
    since it was last loaded, it is not loaded again.

The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
 2017-02-13 14:59:31 -08:00
Stephen Birarda
1cf25e676a Merge pull request #9662 from birarda/master 
change build guide to suggest latest available OpenSSL
 2017-02-13 14:24:48 -08:00
Howard Stearns
7853899f9f Merge pull request #9663 from davidkelly/dk/2789 
Don't allow a ban of any node on same machine as domain-server
 2017-02-13 14:23:26 -08:00
Anthony J. Thibault
adc50dd30f Added active versions of each tablet image, with black bg. 2017-02-13 13:55:33 -08:00
howard-stearns
6241889e38 lastEditedBy is set by add/edit, but not by physics packets 2017-02-13 13:47:20 -08:00
David Kelly
45cb11f38a Don't allow a ban of any node on same machine as domain-server 2017-02-13 14:38:21 -07:00
Stephen Birarda
0e9d66a3a6 change build guide to suggest latest of OpenSSL 2017-02-13 13:31:07 -08:00
Brad Hefta-Gaub
d24ed62116 Merge pull request #9660 from zzmp/audio/silent-stats 
Add silent_packets stat to audio mixer
 2017-02-13 13:07:07 -08:00
Zach Pomerantz
e1cf04e0f0 add silent_packets stat to audio mixer 2017-02-13 20:18:16 +00:00
Howard Stearns
c25f310721 Merge pull request #9657 from howard-stearns/display-lastEditedBy 
add faye's displayLastEditedBy script to script-archive
 2017-02-13 11:44:00 -08:00
howard-stearns
bd8ee7505e add faye's displayLastEditedBy script 2017-02-13 11:42:33 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
samcake
f4ff5cf746 Merge pull request #9647 from samcake/ambient 
Fix the filtering problem on color and normals
 2017-02-13 09:41:57 -08:00
Brad Hefta-Gaub
5914cbe1a1 Merge pull request #9654 from ZappoMan/binaryDataOverMessages 
allow larger sized messages
 2017-02-13 09:20:35 -08:00
Brad Hefta-Gaub
83638d3cd9 Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-12 13:33:21 -08:00
Brad Hefta-Gaub
d82edaa36e implement support for larger message payloads 2017-02-12 13:33:07 -08:00
samcake
13d1642ace Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 15:46:33 -08:00
Brad Hefta-Gaub
e6142d9719 Merge pull request #9645 from ZappoMan/binaryDataOverMessages 
implement support for binary data over messages
 2017-02-10 15:12:56 -08:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
Andrew Meadows
66a315cb9c cap number of avatar entities 2017-02-10 13:14:20 -08:00
Andrew Meadows
d2315c15a1 avoid duplicate parse of AvatarEntityData entries 2017-02-10 13:14:20 -08:00
Andrew Meadows
c551a41e0a restore exposure of setAvatarEntityData() to JS 2017-02-10 13:14:20 -08:00
Andrew Meadows
563bf65e89 fix bug: performance problem for avatarEntities 2017-02-10 13:14:20 -08:00
Andrew Meadows
ee702f945f cleanup around when to send identityPacket 2017-02-10 13:14:20 -08:00
Andrew Meadows
0e504e9ec6 make methods private: avoid sanity check logic 2017-02-10 13:14:20 -08:00
samcake
c4364e0f61 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 11:41:07 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Ken Cooke
542a668723 Merge pull request #9641 from zzmp/load/test 
log AVX2 support in audio-mixer
 2017-02-10 08:13:20 -08:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
Clément Brisset
20c8c8c278 Merge pull request #9636 from huffman/feat/stopwatch-updates 
Stopwatch updates
 2017-02-09 14:11:45 -08:00
Brad Hefta-Gaub
e329696cc8 Merge pull request #9581 from Atlante45/ess-pr 
Add log window for the EntityScriptServer in interface.
 2017-02-09 13:31:15 -08:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
35f8afe456 Handle domain reconnections 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00