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

23466 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
cbf2012bf5 Add menu items that set visibility 
And synchronize visibility settings between Interface and users.js.
 2015-03-29 18:35:56 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
David Rowe
418ff5929e Make friends add/remove button open WebWindow dialog 2015-03-27 15:38:20 -07:00
David Rowe
4e6dcf0d8e Add friends add/remove button 2015-03-27 15:38:20 -07:00
Stephen Birarda
80ecbed02b Merge pull request #4524 from ctrlaltdavid/fix-xmlhttprequest-auth 
Fix authorization of API calls in XMLHttpRequest
 2015-03-27 15:35:14 -07:00
David Rowe
c456760419 Extract API URL into a const 2015-03-27 15:24:55 -07:00
Philip Rosedale
53970cb530 Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix 
fix bug in default avatars
 2015-03-27 14:54:35 -07:00
Philip Rosedale
d908b7fdc6 Merge pull request #4523 from AndrewMeadows/inertia 
enable avatar physics by default
 2015-03-27 14:53:40 -07:00
ZappoMan
1821683453 fix bug in default avatars 2015-03-27 14:44:35 -07:00
Grayson Stebbins
0fd17b3303 editEntities.js --> edit.js 2015-03-27 14:40:16 -07:00
David Rowe
1ee797efa4 Fix authorization of API calls in XMLHttpRequest 2015-03-27 13:59:52 -07:00
Andrew Meadows
5b85a2aa44 merge upstream/master into andrew/inertia 2015-03-27 13:56:54 -07:00
Andrew Meadows
bee8c0e237 "hover" if the "jump" key is held down long enough 2015-03-27 13:56:03 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Philip Rosedale
6550b4e311 Merge pull request #4509 from AndrewMeadows/inertia 
character transitions into "hover" when stepping over abyss
 2015-03-27 13:16:36 -07:00
Brad Hefta-Gaub
2255c30d58 Merge pull request #4512 from Atlante45/ordered_fst 
Hint order for FST files
 2015-03-27 09:41:50 -07:00
Ryan Huffman
36c79ccc03 Merge pull request #4520 from cozza13/20426 
CR for Job #20426 - Remove references to models out of edit.js
 2015-03-27 09:39:36 -07:00
Philip Rosedale
0874683727 Merge pull request #4519 from huffman/change-default-light-color 
Update default light color to (150,150,150)
 2015-03-27 09:38:19 -07:00
Chris Collins
83af2feded Remove reference to FBX files 
Remove reference to FBX files
 2015-03-27 09:33:19 -07:00
Ryan Huffman
c9f4f4626b Update default light color to (150,150,150) 2015-03-27 09:21:32 -07:00
Andrew Meadows
b9b2c30bba use QObject::deleteLater() not explicit delete 2015-03-27 09:01:44 -07:00
Andrew Meadows
e75bb3cd9c merge upstream/master into andrew/inertia 2015-03-27 08:14:36 -07:00
Atlante45
e16c8852fb extra ; 2015-03-27 14:43:09 +01:00
Atlante45
daaba330d5 Turn lambda into helper function 2015-03-27 14:41:32 +01:00
Stephen Birarda
647e2d7829 Merge pull request #4517 from ZappoMan/menuCleanup 
menu and display tweaks at Philip's request
 2015-03-26 20:06:16 -07:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
Brad Hefta-Gaub
57f87b9b42 Merge pull request #4518 from birarda/master 
add user heartbeat if they choose not to send a location
 2015-03-26 17:08:00 -07:00
Stephen Birarda
ba82436d95 add user heartbeat if they choose not to send location 2015-03-26 16:50:40 -07:00
Brad Hefta-Gaub
7f74bd1ae9 Merge pull request #4513 from ctrlaltdavid/20421 
CR for Job #20421 - Add scrollbar to Users Online window
 2015-03-26 16:50:30 -07:00
Brad Hefta-Gaub
0cee3892ff Merge pull request #4516 from huffman/fix-edit-buttons 
Fix marketplace showing for all edit properties buttons
 2015-03-26 16:38:47 -07:00
ZappoMan
6cff99f9d6 menu and display tweaks 2015-03-26 16:36:46 -07:00
Ryan Huffman
28e2e65da9 Fix marketplace showing for all edit properties buttons 2015-03-26 16:23:36 -07:00
Stephen Birarda
050f0144d0 Merge pull request #4515 from ZappoMan/entityScriptsLocking 
fix locking issue in enter/leave entity scripts
 2015-03-26 16:23:08 -07:00
Brad Hefta-Gaub
3b5d48acd1 Merge pull request #4514 from birarda/master 
prefer tbb release libraries for debug on OS X
 2015-03-26 16:06:53 -07:00
ZappoMan
8e7ead2ead fix locking issue in enter/leave entity scripts 2015-03-26 16:05:31 -07:00
Andrew Meadows
599e6aa83e merge upstream/master into andrew/inertia 2015-03-26 15:17:53 -07:00
Andrew Meadows
0035e8df88 merge 2015-03-26 15:17:14 -07:00
Andrew Meadows
8a951e0dd3 minor cleanup 2015-03-26 15:16:57 -07:00
Andrew Meadows
0ef4022e94 tweak gravity and step heights of controller 2015-03-26 15:14:46 -07:00
Stephen Birarda
42a0f719d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-26 14:10:41 -07:00
Stephen Birarda
eea4c56547 use TBB release libraries for apple external project 2015-03-26 14:03:25 -07:00
Leonardo Murillo
f3c9e8cd26 Merge pull request #4494 from birarda/master 
update version of TBB external project
 2015-03-26 14:32:36 -06:00
Andrew Meadows
858dbeb674 remove one line of cruft 2015-03-26 13:23:15 -07:00
Andrew Meadows
9c6ea7380f merge 2015-03-26 13:20:51 -07:00
David Rowe
ef9d665146 Highlight scrollbar when it is being moved 2015-03-26 12:22:27 -07:00
David Rowe
876f3e8a23 Scroll when click above or below bar 2015-03-26 12:22:26 -07:00
David Rowe
c7fe7aa157 Update users displayed per scrollbar position 2015-03-26 12:22:26 -07:00
David Rowe
14e92eecad Click and drag scrollbar 2015-03-26 12:22:25 -07:00
David Rowe
1e1a277065 Scrollbar bar height varies with percentage of users displayed 2015-03-26 12:22:24 -07:00
David Rowe
98c88aab04 Handle no users able to be displayed, insufficient screen height 2015-03-26 12:22:23 -07:00