David Back
|
f74e219029
|
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
|
2018-05-15 17:24:14 -07:00 |
|
David Back
|
623410a0aa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-15 09:53:24 -07:00 |
|
Zach Fox
|
e15a800639
|
Merge pull request #13166 from zfox23/showInvalidItemsInPurchases
Show invalidated items in My Purchases
|
2018-05-14 15:42:29 -07:00 |
|
Howard Stearns
|
d7121265d0
|
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal
fix lastEdited vs pal
|
2018-05-14 15:12:07 -07:00 |
|
John Conklin II
|
c57b0a957d
|
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero
avoid div by zero when measuring RigidBody effective acceleration
|
2018-05-14 13:41:08 -07:00 |
|
Zach Fox
|
83cae54601
|
Show 'invalidated' label for valid = false
|
2018-05-14 13:34:20 -07:00 |
|
Zach Fox
|
fbec285923
|
Merge branch 'master' of github.com:highfidelity/hifi into showInvalidItemsInPurchases
|
2018-05-14 13:17:46 -07:00 |
|
Sam Gateau
|
aa75af5ca4
|
Merge pull request #12814 from Zvork/shadow
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
|
2018-05-14 13:00:15 -07:00 |
|
Sam Gateau
|
d57ddbd3bf
|
Merge pull request #13139 from NissimHadar/missingImagesMDfiles
Autotester: Now remembers the previous folder.
|
2018-05-14 10:40:00 -07:00 |
|
Zach Fox
|
2a1c2ba7b1
|
PurchasedItem logic
|
2018-05-14 09:54:05 -07:00 |
|
Zach Fox
|
81ebb681bb
|
Show invalidated items in My Purchases
|
2018-05-14 09:35:34 -07:00 |
|
NissimHadar
|
a9a783588b
|
Fixed typo.
|
2018-05-14 09:25:17 -07:00 |
|
NissimHadar
|
e69871f499
|
Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles
|
2018-05-14 09:23:38 -07:00 |
|
David Back
|
3031bb05be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-11 17:54:20 -07:00 |
|
David Back
|
a57c280813
|
convertToCloneProperties
|
2018-05-11 17:54:08 -07:00 |
|
MiladNazeri
|
ea26512793
|
Merge pull request #13147 from ctrlaltdavid/21872-a
Fix JSDoc function definitions specifying properties instead of params
|
2018-05-11 16:20:06 -07:00 |
|
Seth Alves
|
ca56449c1d
|
Merge pull request #13159 from sethalves/fix-action-assert
don't assert when unserializing a 'spring' action
|
2018-05-11 15:15:51 -07:00 |
|
Seth Alves
|
85a6e2555f
|
don't assert when unserializing a 'spring' action
|
2018-05-11 13:55:29 -07:00 |
|
Stephen Birarda
|
4f7ce7345d
|
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak
Reset pending domain check-in count more frequently
|
2018-05-11 13:31:03 -07:00 |
|
David Back
|
65bda27ae3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-11 13:03:27 -07:00 |
|
Seth Alves
|
c624528f72
|
Merge pull request #13157 from druiz17/fix-qml-crash
fix qml crash on start up
|
2018-05-11 11:38:12 -07:00 |
|
John Conklin II
|
5cd225e4de
|
Merge pull request #12947 from jherico/feature/splash2
Additional work on splash screen
|
2018-05-11 11:26:37 -07:00 |
|
Dante Ruiz
|
4eba727849
|
fix qml crash on start up
|
2018-05-11 10:47:41 -07:00 |
|
Zach Fox
|
a6dd95e31b
|
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose
don't enable so much logging when 'verbose logging' is turned on
|
2018-05-11 10:44:48 -07:00 |
|
Dante Ruiz
|
9e9852d67b
|
Merge pull request #12989 from Triplelexx/21774_file_browser
Worklist #21774: Fix Windows.browseAssets() bugs
|
2018-05-11 08:50:17 -07:00 |
|
John Conklin II
|
4129664368
|
Merge pull request #13145 from highfidelity/stable
Merge RC67 stable into master
|
2018-05-10 17:07:20 -07:00 |
|
howard-stearns
|
bf26aec260
|
untabify
|
2018-05-10 16:39:56 -07:00 |
|
howard-stearns
|
50a53a5174
|
fix lastEdited vs pal
|
2018-05-10 16:00:01 -07:00 |
|
Seth Alves
|
826c427e2a
|
trying to sort-out audio-stream logging
|
2018-05-10 15:42:59 -07:00 |
|
David Rowe
|
fab85c3f6d
|
Fix JSDoc function definitions specifying properties instead of params
|
2018-05-11 09:52:48 +12:00 |
|
Seth Alves
|
32d10641dc
|
don't enable so much logging when 'verbose logging' is turned on
|
2018-05-10 14:41:54 -07:00 |
|
John Conklin II
|
bc9e403ab9
|
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2
Use HMAC authentication for network packets - 2nd attempt
|
2018-05-10 14:38:18 -07:00 |
|
John Conklin II
|
64d3219ee1
|
Merge pull request #12746 from gcalero/fix_radar_zoom_in
Android: Fix zoom in unresponsive in radar mode
|
2018-05-10 13:14:52 -07:00 |
|
Sam Gateau
|
fd9669b42d
|
Merge pull request #13125 from jherico/feature/testing
Working on improved unit testing, adding texture transfer testing
|
2018-05-10 12:29:43 -07:00 |
|
Triplelexx
|
a061e84ad7
|
remove unused commented code
|
2018-05-10 19:40:02 +01:00 |
|
Brad Davis
|
cb336bdeab
|
Fix linux build problems
|
2018-05-10 10:55:50 -07:00 |
|
John Conklin II
|
befb411f6e
|
Merge pull request #13025 from highfidelity/RC67
Beta Release 67 - branched at developer release 8181
|
2018-05-10 10:11:23 -07:00 |
|
David Back
|
5aab88be06
|
assert
|
2018-05-09 19:10:56 -07:00 |
|
David Back
|
1aa653c5db
|
tabs
|
2018-05-09 18:20:07 -07:00 |
|
David Back
|
7738a2bcdd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-09 18:12:46 -07:00 |
|
David Back
|
dea588ae4a
|
remove prints
|
2018-05-09 18:12:04 -07:00 |
|
David Back
|
3241c18271
|
first pass cloneables WIP
|
2018-05-09 18:10:40 -07:00 |
|
Seth Alves
|
4410402c7d
|
Merge pull request #13114 from sethalves/more-logging-suppression
more suppression of logging
|
2018-05-09 17:36:12 -07:00 |
|
John Conklin II
|
75164201d1
|
Merge pull request #13117 from SamGondelman/android
Test highp floats for Android
|
2018-05-09 14:36:51 -07:00 |
|
Simon Walton
|
9b6225db40
|
Bump default packet version 20 -> 21
|
2018-05-09 14:29:10 -07:00 |
|
Gabriel Calero
|
e0b57a2228
|
Code review in radar.js
|
2018-05-09 18:20:19 -03:00 |
|
MiladNazeri
|
bc03fb398f
|
Merge pull request #13102 from ctrlaltdavid/21856-h
Fix JSDoc for Users.requestUsernameFromID
|
2018-05-09 13:35:06 -07:00 |
|
Brad Davis
|
57691d5d66
|
Cache downloaded assets
|
2018-05-09 13:20:48 -07:00 |
|
Brad Davis
|
7fbad47351
|
Working on texture test
|
2018-05-09 13:20:48 -07:00 |
|
Brad Davis
|
1d403b4d67
|
Add texture transfer testing
|
2018-05-09 13:20:47 -07:00 |
|