John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname
...
Fix location.hostname
2018-04-09 09:42:41 -07: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
Stephen Birarda
1ff7939735
move file ~ expansion from AddressManager to DomainHandler
2018-04-06 11:05:17 -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
samcake
78053b8b48
Refix the normal map case foro translucents
2018-04-04 18:33:27 -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
John Conklin II
8c8400947f
Merge pull request #12745 from SamGondelman/shadow
...
RC66: Fix shadows on primitives
2018-03-30 12:52:08 -07:00
SamGondelman
5a7e9d8e3e
fix shadows on primitives
2018-03-30 09:48:04 -07:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes
...
Fix/rc66 crashes
2018-03-29 18:04:52 -07:00
SamGondelman
afe39aba46
fix octal code char issue
2018-03-29 10:05:08 -07:00
Brad Davis
9be162de95
Synchronously shut down QML rendering threads
2018-03-28 09:13:46 -07:00
Seth Alves
6948de7e24
default to serverless tutorial
2018-03-26 14:32:40 -07:00
SamGondelman
a19f71e759
fix tonemapping on android
2018-03-23 14:16:47 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android
...
Android: Stats, disable IK, reduce impact of InputRecorder
2018-03-23 11:08:50 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807
...
JSDoc that an entity's clientOnly property can be set at entity creation
2018-03-22 17:55:45 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable
...
Merge stable back into master
2018-03-22 15:08:30 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains
...
Serverless domains
2018-03-22 14:06:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix
...
Lexer code has confusion between strings and chars
2018-03-22 12:03:47 -07:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context
...
Fix/current context
2018-03-22 10:54:34 -07:00
Dante Ruiz
cea0f98aae
reverting files
2018-03-22 09:20:27 -07:00
Dante Ruiz
f5a954d08e
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1
Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread
2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746
Compare QString w/ char*, not char
2018-03-21 23:09:46 -07:00
Seth Alves
b551b144a7
remove unneeded setIsConnected call
2018-03-21 19:15:27 -07:00
Seth Alves
4f20a87c6d
review
2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4
review
2018-03-21 16:18:31 -07:00
Brad Davis
d529d7b1d3
Remove whitespace before shader version line
2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67
make sure _sockAddr is cleared if the new url isn't a hifi:// one
2018-03-21 15:28:12 -07:00
Seth Alves
bea7ee42e2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee
rearrange domain-url-changed signals
2018-03-21 14:30:00 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex
...
Materials on primitives
2018-03-21 12:08:24 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common
...
Break out common GL and GLES code into a single shared library
2018-03-21 11:28:24 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776
...
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
2018-03-21 09:27:51 -07:00
Bradley Austin Davis
d5d8e4c0b0
Restoring geometry shader
2018-03-20 18:28:53 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix
...
Model behaves correctly if missing material
2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative
...
Support relative paths for material images
2018-03-20 14:24:50 -07:00
Bradley Austin Davis
a861be112f
Fix GLES build
2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe
...
switch back to app-local VC runtimes and UCRT
2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash
...
Android - Prevent crash when setting the url property to _webSurface.
2018-03-20 11:40:08 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
