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

17201 commits

Author SHA1 Message Date
Andrew Meadows
92495d9622 delete in proper order on shutdown 2017-04-07 11:10:48 -07:00
Andrew Meadows
8773497f7e remvoe commented out cruft 2017-04-07 11:08:06 -07:00
Andrew Meadows
1fb88a0315 add a helpful comment 2017-04-07 11:08:06 -07:00
Andrew Meadows
6d627aa9bc don't remove other avatars on sign-out 2017-04-07 11:08:06 -07:00
Andrew Meadows
2f18e51f6b lock mutex around fading avatar list 2017-04-07 11:08:06 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Andrew Meadows
40e223cb82 cleanup unused return values and redundant variables 2017-04-07 09:58:04 -07:00
Andrew Meadows
2775b17a65 unravel one loop of spaghetti 2017-04-07 09:56:26 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
samcake
1a9005ed8b Avoid unexpected changes 2017-04-05 13:57:40 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
howard-stearns
6f79b2eaeb send initial path in location update (e.g., on login) 2017-04-04 12:05:43 -07:00
Vladyslav Stelmakhovskyi
072e024d9a Fixed warning in JSConsole 2017-04-04 16:10:37 +02:00
Thijs Wenker
2b85563413 Merge pull request #10115 from sethalves/fix-fast-talking 
Fix fast talking
 2017-04-04 02:13:09 +02:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto 
Put current address to location instead of inputfield
 2017-04-03 16:09:58 -07:00
Seth Alves
55c2d36752 math fixes, cleanups 2017-04-03 15:30:06 -07:00
Seth Alves
2a43c41954 Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking 2017-04-03 14:44:13 -07:00
Seth Alves
7ac09398be include deltaTime in audioAttack running average 2017-04-03 14:44:05 -07:00
Andrew Meadows
66ff551a7c Merge pull request #10080 from ZappoMan/footActions 
add foot IK targets as actions, map Kinect feet to foot targets
 2017-04-03 12:06:14 -07:00
Seth Alves
7f1095c590 use deltaTime rather than calling usecTimestampNow 2017-04-03 11:55:08 -07:00
Seth Alves
9e08925d7e involve clock time in _mouthTime calculation 2017-04-03 11:34:29 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
c45514a557 Merge pull request #10066 from vladest/tablet-ui-connection-dialog 
Implemented no connection dialog for Tablet UI
 2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119 Merge pull request #10101 from ctrlaltdavid/21252 
Fix tablet scrolling getting stuck to mouse pointer
 2017-04-03 09:52:45 -07:00
Seth Alves
0f936f7511 Merge pull request #10078 from hyperlogic/feature/avatar-skeleton 
Expose Avatar Skeleton to JavaScript
 2017-04-03 09:39:35 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987 Fix tablet window getting stuck to pointer if release mouse off tablet 2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00
Chris Collins
cc8b52fff4 Merge pull request #10095 from druiz17/tablet-webView2.0 
Tablet webview now uses mobile format
 2017-04-01 08:33:09 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Dante Ruiz
b10f491c6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0 2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2 fixed webview mobile view 2017-04-01 00:58:09 +01:00
Andrew Meadows
0181783290 Merge pull request #10064 from samcake/ambient 
Fix the sharp reflection happening after  pr 10036 and bugs on backend 4.1
 2017-03-31 16:04:00 -07:00
Chris Collins
b36f688a5a Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default 
use tablet-ui stylus as default, rather than avatar finger
 2017-03-31 15:34:37 -07:00
David Rowe
25ac82f162 Don't send "move" events for non-move events 2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240 Fix controls in HTML pages not responding to mouse events on tablet 2017-04-01 10:40:06 +13:00
Clément Brisset
9d0676dd87 Merge pull request #10088 from huffman/stable-merge 
Stable merge
 2017-03-31 14:27:42 -07:00
howard-stearns
5c8b2ba1c3 restore lost code 2017-03-31 13:28:14 -07:00
Seth Alves
54c66aff07 use tablet-ui stylus as default, rather than avatar finger 2017-03-31 13:18:40 -07:00
Vladyslav Stelmakhovskyi
7558765042 Script log now back to HUD 2017-03-31 14:20:15 +02:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -07:00
Anthony J. Thibault
22901a40c8 Expose Avatar skeletons to JavaScript 2017-03-30 17:27:40 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
Howard Stearns
3056bb16a2 typo, and delete request on abort/fail 2017-03-30 12:40:54 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Rowe
06910d1881 Add comment re scrollbar stability in tablet 2017-03-30 14:20:02 +13:00
David Rowe
f954767b84 Get entities list and entity properties scrollbars working on tablet 2017-03-30 14:04:03 +13:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00