David Rowe
|
48d4316714
|
Fix typo
|
2016-03-17 09:34:21 +13:00 |
|
David Rowe
|
5faa7b3e87
|
Merge branch 'master' into 20851
Conflicts:
interface/resources/qml/dialogs/MessageDialog.qml
|
2016-03-17 09:29:56 +13:00 |
|
Clément Brisset
|
35aa074955
|
Merge pull request #7369 from birarda/udt-slow-start
repairs to udt SendQueue packet timing
|
2016-03-16 09:44:58 -07:00 |
|
Stephen Birarda
|
c94e2bdc8b
|
grab the now timestamp only when needed
|
2016-03-16 08:53:31 -07:00 |
|
Chris Collins
|
733e4d74f8
|
Merge pull request #7290 from huffman/bugsplat-username
Add HF username as default username for bugsplat
|
2016-03-16 08:42:26 -07:00 |
|
Brad Hefta-Gaub
|
d840e68f05
|
Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change
Reregister and scale after model change
|
2016-03-16 08:04:42 -07:00 |
|
Andrew Meadows
|
7acc56bf00
|
Merge pull request #7359 from zzmp/feat/bg-gpu-timer
Add a DrawBackgroundDeferred gpu timer
|
2016-03-16 07:58:53 -07:00 |
|
Zach Pomerantz
|
6f1079e0e0
|
Merge pull request #7372 from samcake/orange
Fixing a bug when albedo map transparent is not quite loaded yet
|
2016-03-15 19:47:02 -07:00 |
|
samcake
|
d58ac269ee
|
Fixing a bug when albedo map transaprent but not quite loaded yet
|
2016-03-15 17:01:26 -07:00 |
|
Andrew Meadows
|
6028c3e841
|
Merge pull request #7318 from birarda/atp
Asset Transfer Protocol Mappings
|
2016-03-15 16:52:36 -07:00 |
|
samcake
|
f30e8e9e0c
|
Merge pull request #7281 from zzmp/fix/png-opacity
Fix materials to honor png texture opacity
|
2016-03-15 16:08:36 -07:00 |
|
Ryan Huffman
|
aa4c0ca15a
|
Merge pull request #115 from birarda/atp-mappings
make TRUNCATED_HASH_NUM_CHAR a non-static const
|
2016-03-15 15:57:06 -07:00 |
|
Stephen Birarda
|
92b287355c
|
make TRUNCATED_HASH_NUM_CHAR a non-static const
|
2016-03-15 15:56:13 -07:00 |
|
Brad Hefta-Gaub
|
870677a223
|
Merge pull request #7339 from samcake/red
Less jittering at far distance
|
2016-03-15 15:39:33 -07:00 |
|
Stephen Birarda
|
1cd16da83e
|
do sleep timing off when next packet would have been
|
2016-03-15 15:28:55 -07:00 |
|
Clément Brisset
|
253b6e3067
|
Merge pull request #114 from birarda/atp-mappings
fixes for styling and logging from CR
|
2016-03-15 14:42:01 -07:00 |
|
Stephen Birarda
|
0012967734
|
use curly braced initialization for consts
|
2016-03-15 14:38:41 -07:00 |
|
Stephen Birarda
|
b13dff1c77
|
Revert "remove redundant static from const in AssetServer"
This reverts commit 0837261d403e844f648f4f4ddcce7d7b79c7083b.
|
2016-03-15 14:38:08 -07:00 |
|
Stephen Birarda
|
29cd487f84
|
fixes for styling and logging from CR
|
2016-03-15 14:38:08 -07:00 |
|
Stephen Birarda
|
b8abb1b6dd
|
remove redundant static from const in AssetServer
|
2016-03-15 14:38:08 -07:00 |
|
Stephen Birarda
|
42d7bc4263
|
Merge pull request #113 from Atlante45/feat/atp
Fix drag&drop
|
2016-03-15 14:36:37 -07:00 |
|
samcake
|
f3daa9e1c5
|
Fixing the lighting issue in stereo
|
2016-03-15 14:35:43 -07:00 |
|
Eric Levin
|
377d89e9d6
|
added lifetime to water particle effect
|
2016-03-15 14:08:50 -07:00 |
|
Atlante45
|
03efde5b3c
|
Change text in case of drag and drop.
|
2016-03-15 13:53:13 -07:00 |
|
Brad Hefta-Gaub
|
5245b6f7be
|
Merge pull request #7323 from howard-stearns/zone-visibility
Zone visibility
|
2016-03-15 13:44:40 -07:00 |
|
samcake
|
a779381230
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-03-15 13:06:07 -07:00 |
|
howard-stearns
|
1891062dd2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reregister-and-scale-after-model-change
|
2016-03-15 12:22:36 -07:00 |
|
howard-stearns
|
ddc658af5f
|
After a modelURL change to an existing model, allow the model to be
snapped and scaled to the existing entity registration and dimensions.
|
2016-03-15 12:20:51 -07:00 |
|
Chris Collins
|
e47c8896db
|
Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h
Application: fix third-person and fullscreen-mirror toggle
|
2016-03-15 11:50:22 -07:00 |
|
Atlante45
|
4265ddbd0e
|
Can't drop fbx if you can't rez
|
2016-03-15 11:42:48 -07:00 |
|
Atlante45
|
4a90ec303c
|
Fix drag&drop
|
2016-03-15 11:22:42 -07:00 |
|
Anthony Thibault
|
addde84bee
|
Merge pull request #7363 from markej/master
Fill in the Downloads: line of the stats window
|
2016-03-15 10:42:09 -07:00 |
|
samcake
|
af24b5f1a3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-03-15 10:23:06 -07:00 |
|
Clément Brisset
|
17e5b441cf
|
Merge pull request #111 from huffman/atp-manager-name
Add atp filename to entities added to world
|
2016-03-15 10:19:53 -07:00 |
|
Clément Brisset
|
47f18e5166
|
Merge pull request #110 from huffman/atp-upload
Atp upload updates
|
2016-03-15 10:19:44 -07:00 |
|
Ryan Huffman
|
1b81b4f01b
|
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
|
2016-03-15 10:19:20 -07:00 |
|
Anthony J. Thibault
|
7539eec134
|
Application: fix third-person and fullscreen-mirror toggle
|
2016-03-15 10:11:56 -07:00 |
|
Ryan Huffman
|
7947bd7724
|
Fix message typo enter => entering
|
2016-03-15 10:11:53 -07:00 |
|
Ryan Huffman
|
cbed674cba
|
Merge pull request #112 from Atlante45/feat/atp
In place editing
|
2016-03-15 09:54:03 -07:00 |
|
Clément Brisset
|
bbfbbf6565
|
Merge pull request #109 from birarda/asset-migrator
tweaks to the ATP asset migrator for compound URLs and mappings
|
2016-03-15 09:25:11 -07:00 |
|
Atlante45
|
07d2213628
|
Remove debug
|
2016-03-15 09:14:22 -07:00 |
|
Atlante45
|
9b8b1d41e3
|
Edit in place
|
2016-03-15 09:14:22 -07:00 |
|
Atlante45
|
98851679c5
|
Remove unused AssetMappingItem
|
2016-03-15 09:14:22 -07:00 |
|
Stephen Birarda
|
72c64532f5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2016-03-15 09:12:49 -07:00 |
|
Howard Stearns
|
010aaa55c0
|
const ref
|
2016-03-14 22:13:26 -07:00 |
|
Howard Stearns
|
28f5ee16b8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility
|
2016-03-14 22:05:41 -07:00 |
|
Ryan Huffman
|
e54d5aa162
|
Merge pull request #7354 from birarda/udt-slow-start
fix for UDT slow start phase with handshake changes
|
2016-03-14 21:07:49 -07:00 |
|
Stephen Birarda
|
8cb602173a
|
remove the unused member variable
|
2016-03-14 20:54:41 -07:00 |
|
Brad Hefta-Gaub
|
cf6a975a2b
|
Merge pull request #7336 from ctrlaltdavid/text3d-tuning
Improve text3d rendering
|
2016-03-14 18:59:06 -07:00 |
|
Brad Hefta-Gaub
|
11e88f965d
|
Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location
MyAvatar: prevent roll and pitch in avatar via snapshot url.
|
2016-03-14 18:58:49 -07:00 |
|