Commit graph

50436 commits

Author SHA1 Message Date
Stephen Birarda
1e25b5012f use a static_cast to get EntityNodeData 2017-01-20 14:05:55 -08:00
Zach Fox
d535d816f4 Merge pull request #9463 from zfox23/PAL_FixScrollingVisibility
PAL: Fix card visibility when selecting out-of-table users
2017-01-20 14:01:04 -08:00
Stephen Birarda
67951517b4 don't grab the JSON filters for each entity checked 2017-01-20 13:59:48 -08:00
Clément Brisset
2571be6edb Merge pull request #28 from birarda/entity-script-server
fix usesFrustum check in OctreeQueryNode
2017-01-20 13:55:50 -08:00
Atlante45
8740481579 Remove unnecessary const from const bool 2017-01-20 13:54:49 -08:00
Stephen Birarda
6376068021 fix usesFrustum check in OctreeQueryNode 2017-01-20 13:54:46 -08:00
Zach Fox
11a57efafb Fix it! 2017-01-20 13:44:29 -08:00
Seth Alves
dfa949f2d8 switch to new click sound 2017-01-20 13:35:41 -08:00
Seth Alves
2f08972578 Merge pull request #9460 from druiz17/touchUp
Tablet button clickable in desktop mode && correct icons for switch
2017-01-20 12:58:41 -08:00
Seth Alves
503723a269 Merge pull request #9459 from hyperlogic/tablet-ui
Updated tablet dimensions to better reflect mockup and 3d model
2017-01-20 12:40:47 -08:00
Anthony J. Thibault
3ebf2ebc9b Updated tablet dimensions to better reflect mockup and 3d model 2017-01-20 12:27:44 -08:00
Ken Cooke
176531e395 Merge pull request #9450 from zzmp/fix/audio-pool-comp
fix warnings for signed comp in AudioMixerSlavePool
2017-01-20 12:17:40 -08:00
Stephen Birarda
73248c3562 Merge pull request #25 from huffman/feat/entity-server-script-property
Fixes
2017-01-20 11:45:07 -08:00
Ryan Huffman
8a691e8340 Remove AvatarHashMap from EntityServer 2017-01-20 11:44:32 -08:00
Dante Ruiz
58e04f8e35 home button works in desktop mode 2017-01-20 19:43:13 +00:00
Clément Brisset
8b311acf44 Merge pull request #27 from birarda/entity-script-server
update AC monitor to launch 7 ACs
2017-01-20 11:34:32 -08:00
Zach Fox
9fa80567a6 Merge pull request #9455 from zfox23/PAL_LastEditorBug
PAL: Fix "Last Editor" popup bug; Fix log spam
2017-01-20 11:28:41 -08:00
Stephen Birarda
d55eba9440 update AC monitor to launch 7 ACs 2017-01-20 11:26:04 -08:00
Clément Brisset
6046573394 Merge pull request #26 from birarda/entity-script-server
fix LogHandler attempting to create children on wrong thread
2017-01-20 11:24:56 -08:00
Stephen Birarda
5c5c69fff3 setup the repeated message flusher on LogHandler thread 2017-01-20 11:20:48 -08:00
Ryan Huffman
2ca50153b3 Allow all node types to receive messages from Messages server 2017-01-20 11:17:41 -08:00
Ryan Huffman
89e6e10c1d Add AvatarHashMap to EntityScriptServer 2017-01-20 11:17:10 -08:00
Clément Brisset
ba813025d2 Merge pull request #24 from birarda/entity-script-server
fix for segfault on entity-script-server forced stop
2017-01-20 11:11:42 -08:00
Seth Alves
d449c6ca78 Merge pull request #9456 from sethalves/tablet-ui
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:07:59 -08:00
Seth Alves
7f25135633 try again on haptics from touching tablet overlay with stylus 2017-01-20 11:06:35 -08:00
Stephen Birarda
9c485dc610 don't restart script engine on shutting down with nodeKilled 2017-01-20 10:59:55 -08:00
Stephen Birarda
d8a6a8775d Merge pull request #23 from Atlante45/ess-pr
Fix interface build
2017-01-20 10:55:34 -08:00
Atlante45
04e81c5db7 Fix interface build 2017-01-20 10:53:57 -08:00
Clément Brisset
4914ad9014 Merge pull request #22 from birarda/entity-script-server
fix for RecordingScriptingInterface, default scripts, local audio injector
2017-01-20 10:49:13 -08:00
Stephen Birarda
1b778a3ee0 fail quietly if local injection cannot happen 2017-01-20 10:42:07 -08:00
Stephen Birarda
eb033c797a fallback if local URL empty when loading default scripts 2017-01-20 10:36:57 -08:00
Dante Ruiz
672deb903c correct switch icons 2017-01-20 10:34:09 -08:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Seth Alves
7b2bc3a3ed Merge pull request #9453 from sethalves/tablet-ui
unmangle merge
2017-01-20 10:29:48 -08:00
Seth Alves
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Stephen Birarda
25bd6fa2c1 move recording interface to Agent/Application only 2017-01-20 10:27:08 -08:00
Zach Fox
8f3c4794c6 Comments 2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0 Prevent logspam 2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Seth Alves
e96b646f66 Merge pull request #9452 from sethalves/tablet-ui
Tablet ui
2017-01-20 10:14:44 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
Seth Alves
5a316d639a Merge pull request #9451 from sethalves/tablet-ui
re-enable haptic pulse when stylus touches tablet overlay
2017-01-20 10:12:45 -08:00
Seth Alves
caae804318 re-enable haptic pulse when stylus touches tablet overlay 2017-01-20 10:12:15 -08:00
Zach Pomerantz
eba96c45d7 fix warnings for signed comp in AudioMixerSlavePool 2017-01-20 12:25:22 -05:00
Seth Alves
eb169abdd7 Merge pull request #9449 from hyperlogic/tablet-ui
Can now use mouse to move tablet in 2D desktop mode.
2017-01-20 09:18:02 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
Anthony J. Thibault
4e4545ac00 Updated orientation of tablet when no hand controllers are present. 2017-01-19 20:27:06 -08:00
Stephen Birarda
fae94b5500 Merge pull request #21 from Atlante45/ess-pr
Clear the tree when losing entity server
2017-01-19 18:07:15 -08:00
Anthony J. Thibault
8304aa7b19 Added ability to mouse move the tablet in 2d desktop mode. 2017-01-19 18:04:08 -08:00
Atlante45
f807dee51e Clear the tree when losing entity server 2017-01-19 17:29:10 -08:00