John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
...
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821
...
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
2018-04-11 12:07:32 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump
...
Android Control - jump and view sensitivity
2018-04-09 17:32:57 -07:00
Cristian Luis Duarte
1242446c52
Cleanup controller code
2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66
...
RC66 merge back to master
2018-04-09 13:17:12 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname
...
Fix location.hostname
2018-04-09 09:42:41 -07:00
Cristian Luis Duarte
f556c8d3a7
Merge remote-tracking branch 'hifi/master' into android_jump
2018-04-06 18:02:30 -03:00
John Conklin II
02422ba538
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde
...
RC66 - move file ~ expansion from AddressManager to DomainHandler
2018-04-06 13:31:01 -07:00
Clement
dea5382991
Fix location.hostname
2018-04-06 13:19:07 -07:00
John Conklin II
fe5e797a24
Merge pull request #12816 from SamGondelman/web66
...
RC66: Possible fix for QML texture leak
2018-04-06 13:08:50 -07:00
Cristian Luis Duarte
bd6f0fd59e
Make view/rotation control independent of touchUpdate events rate
2018-04-06 16:17:28 -03:00
Stephen Birarda
1ff7939735
move file ~ expansion from AddressManager to DomainHandler
2018-04-06 11:05:17 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
...
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock
...
Remove lock file recovery in entity server
2018-04-06 10:04:34 -07:00
SamGondelman
d38dadaf58
possible fix for qml texture leak
2018-04-06 09:34:00 -07:00
Seth Alves
8de545acdf
add new address accessor for 'public' addresses, use it for snapshot and stream
2018-04-05 13:39:51 -07:00
Seth Alves
148007435e
update comment
2018-04-05 13:01:31 -07:00
Seth Alves
1de878eb9c
fix logic
2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2
currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version
2018-04-05 12:39:49 -07:00
Ryan Huffman
010356709d
Remove lock file recovery in entity server
...
* We no longer make backups at the ES, so there is no backup to
recover from if we crash during persist to disk.
* When loading the most recent backup we look for files that match our
backup rules. If we have no backup rules we end up grabbing
everything.
* Because we grab everything, we are at risk of grabbing the lock file
and treating it as a backup. In the case where we crash on persist, we
end up replacing the models.json.gz file with the lock file (!!).
This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
2018-04-05 11:52:31 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
samcake
78053b8b48
Refix the normal map case foro translucents
2018-04-04 18:33:27 -07:00
Cristian Luis Duarte
1a967e45a6
Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity
2018-04-04 21:54:12 -03:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade
...
Update to Transitions debugging / editing script
2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
b61a436a84
Android fly - Use new asset and screen position - missing cpp
2018-04-04 18:23:03 -03:00
Cristian Luis Duarte
ffb8b0a60e
Android fly - Use new asset and screen position
2018-04-04 18:19:01 -03:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816
...
Remove Entities.currentAvatarEnergy and related from the API
2018-04-04 08:07:46 -07:00
Andrew Meadows
f0fcfc432c
fix typo in comment
2018-04-03 22:16:10 -07:00
Andrew Meadows
d57cb0b5d7
use list.empty() instead of comparing list.size()
2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9
use std::numeric_limtis<uint64_t>::max() instead of -1
2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8
more 'const uint64_t&' purges
2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807
DRY: simpler removal of element from middle of std::vector
2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d
add comment about returning smart pointer by ref
2018-04-03 18:26:43 -07:00
Anthony Thibault
00bec7310e
Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js
...
JavaScript exceptions during Controller system callbacks are now logged
2018-04-03 16:22:44 -07:00
Cristian Luis Duarte
88c83f3bfe
Merge remote-tracking branch 'hifi/master' into android_jump
2018-04-03 19:59:21 -03:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline
...
fix ContextOverlayInferface highlighing unspecified entities.
2018-04-03 12:29:19 -07:00
Cristian Luis Duarte
cbf13c9f8c
Merge remote-tracking branch 'hifi/master' into android_jump
2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9
Android - Initial Jump button implementation
2018-04-03 16:07:40 -03:00
Seth Alves
71d6dbf9bf
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
2018-04-02 15:52:28 -07:00
David Rowe
ab8ee20960
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
2018-04-03 10:00:19 +12:00
Brad Davis
14ea168ab3
Merge remote-tracking branch 'upstream/master' into bindless
2018-04-02 13:13:28 -07:00
Anthony Thibault
dc9c9fd0ee
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping
...
Reduce avatar elbow fluttering by disabling pole vectors
2018-04-02 10:51:28 -07:00
Andrew Meadows
59abc1d5b5
DRY sendBid() and sendUpdate()
2018-03-30 17:04:31 -07:00
Sam Gateau
8178ee7f34
Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror
2018-03-30 17:00:11 -07:00
Sam Gateau
d5496d68fd
FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly
2018-03-30 16:58:41 -07:00
Andrew Meadows
766077204e
fix typo inside assert()
2018-03-30 16:35:16 -07:00
Dante Ruiz
c99676b510
atlernate fix for selected entities
2018-03-30 13:44:54 -07:00
Andrew Meadows
a924bd4eb0
set correct _bidPriority on first ownership update
2018-03-30 13:18:32 -07:00
Andrew Meadows
5a5376c3d5
untangle 'bidding' from 'owned'
2018-03-30 13:18:32 -07:00
