Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
David Back
|
afd4b5a8ab
|
update default avatar to fix non-flat feet
|
2018-06-06 11:48:04 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Sam Gateau
|
c145c0c1b8
|
Merge pull request #13186 from SamGondelman/etc2comp
Android: Local texture compression using Etc2Comp
|
2018-06-06 11:13:50 -07:00 |
|
SamGondelman
|
d2f8ee327d
|
properly reset highlight framebuffer
|
2018-06-05 18:18:24 -07:00 |
|
Alexander Ivash
|
5897c9948d
|
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-06 03:52:22 +03:00 |
|
amantley
|
0c879d85b5
|
added print statements and removed summed coeff from avatarData.cpp
|
2018-06-05 17:33:32 -07:00 |
|
Cristian Luis Duarte
|
b38eae3731
|
Only add RenderShadowTask if isDeferred
|
2018-06-05 18:54:48 -03:00 |
|
SamGondelman
|
aec7206901
|
get rid of overlay pipelines and just use forward rendering
|
2018-06-05 14:44:44 -07:00 |
|
Anthony J. Thibault
|
94c39bc4af
|
Better fix for looking down at your own body.
|
2018-06-05 14:43:33 -07:00 |
|
amantley
|
95bf5ce464
|
Merge remote-tracking branch 'origin/scriptedBlendshapes' into scriptedBlendshapes
syncing with remote repo
|
2018-06-05 13:34:34 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
sabrina-shanman
|
9ac1443b83
|
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
|
2018-06-05 11:17:17 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
Andrew Meadows
|
4329ea5240
|
Merge master' into 'workload'
|
2018-06-04 16:11:25 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
Andrew Meadows
|
8eedf83f70
|
increment packet version for workload logic
|
2018-06-04 15:23:31 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Angus Antley
|
beaea7abe6
|
changed max face tracker info size to reflect summed coeff
|
2018-06-02 14:39:30 +01:00 |
|
amantley
|
2879eeb687
|
added flags for procedural face movement AvatarData.cpp toByteArray and parseDataFromBuffer
|
2018-06-01 17:18:48 -07:00 |
|
Andrew Meadows
|
db3520b332
|
also update queryAACube for 'Held' things
|
2018-06-01 16:38:57 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
Simon Walton
|
2d9a5c62c1
|
Clean-up for compiler warnings
|
2018-06-01 10:02:41 -07:00 |
|
Seth Alves
|
97b3fdfe68
|
make legacy collisionless property work right
|
2018-06-01 09:34:34 -07:00 |
|
Simon Walton
|
c277cc7574
|
Fix minor error
|
2018-05-31 18:39:25 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
amantley
|
3bda5bf6a0
|
added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h
|
2018-05-31 17:58:37 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
John Conklin II
|
611159f65f
|
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
Initialize Qt's use of openssl lib before calling RSA code
|
2018-05-31 14:34:24 -07:00 |
|
John Conklin II
|
ec3f9549f1
|
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
Fix EntityScriptingInterface::getChildrenIDs function
|
2018-05-31 14:27:25 -07:00 |
|
Sam Gateau
|
46d055a488
|
Merge pull request #12649 from samcake/punk
Fix addressing the avatar mesh visibility switch bug
|
2018-05-31 14:16:04 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
Cristian Luis Duarte
|
f99b2dd23f
|
Android - Fix joystick and view control bug that makes it bounce
|
2018-05-31 16:02:41 -03:00 |
|
Andrew Meadows
|
b23f44168d
|
revert bad optimization
|
2018-05-31 12:01:07 -07:00 |
|
SamGondelman
|
1470170296
|
lock weak resource
|
2018-05-31 11:54:37 -07:00 |
|
luiscuenca
|
60758dec8d
|
Check for null pointer
|
2018-05-31 11:32:45 -07:00 |
|
John Conklin II
|
4175825093
|
Merge pull request #13215 from AndrewMeadows/activate-on-action-removal
activate RigidBody when removing physics Action
|
2018-05-31 11:20:03 -07:00 |
|
amantley
|
7cc5e96f2d
|
Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
|
2018-05-31 10:35:31 -07:00 |
|
Andrew Meadows
|
7e44b9b3ae
|
motionState needs correct region when adding to physics
|
2018-05-31 10:23:49 -07:00 |
|
Andrew Meadows
|
addbb597fc
|
move setSpaceIndex() to cpp file for easier debugging in future
|
2018-05-31 10:22:39 -07:00 |
|
Andrew Meadows
|
62df4999ef
|
declare method const
|
2018-05-31 10:22:22 -07:00 |
|
Andrew Meadows
|
feacb18290
|
more correct variable name and optimization
|
2018-05-31 10:22:06 -07:00 |
|
Andrew Meadows
|
7fc75e5af0
|
more correct comments
|
2018-05-31 10:21:46 -07:00 |
|
Andrew Meadows
|
c2f5d19ddb
|
add TODO about optimizing character ray tracing
|
2018-05-31 10:21:14 -07:00 |
|
Cristian Luis Duarte
|
688fad1776
|
Android - Fix joystick and view control bug that makes it bounce
|
2018-05-31 14:11:28 -03:00 |
|
David Back
|
ac33f33828
|
update version from json in toByteArray
|
2018-05-31 09:24:16 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
Sam Gondelman
|
ae3b933a80
|
Merge branch 'master' into etc2comp
|
2018-05-30 17:17:03 -07:00 |
|
samcake
|
37c1f4fc06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-30 16:05:46 -07:00 |
|
Andrew Meadows
|
003e444246
|
Merge branch 'master' into 'workload'
|
2018-05-30 16:04:13 -07:00 |
|
John Conklin II
|
6095a3b319
|
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
|
2018-05-30 13:55:34 -07:00 |
|
Simon Walton
|
a3324c5616
|
Remove empty destructor
|
2018-05-30 13:52:26 -07:00 |
|
Simon Walton
|
8fb5d1b92d
|
Make RSA key-pair class a Runnable that's owned by a threadpool
|
2018-05-30 13:41:08 -07:00 |
|
samcake
|
457b77ca09
|
fixing static definition maybe
|
2018-05-30 13:37:32 -07:00 |
|
Gabriel Calero
|
3f696df3a5
|
Show stats button only in debug mode. Add isDebugMode to Script public interface
|
2018-05-30 15:40:15 -03:00 |
|
samcake
|
2e9076c71e
|
Clean up and trying to get ready for merge
|
2018-05-30 11:14:49 -07:00 |
|
Andrew Meadows
|
bc57003cfb
|
activate body before disconnecting action from entity
|
2018-05-29 17:56:41 -07:00 |
|
Andrew Meadows
|
5d3502ed88
|
activate body when removing action
|
2018-05-29 17:56:41 -07:00 |
|
samcake
|
873cabe284
|
Cleaning the code
|
2018-05-29 17:46:25 -07:00 |
|
Simon Walton
|
66d39667e1
|
AccountManager destructor waits for any RSA key thread
|
2018-05-29 17:04:37 -07:00 |
|
David Rowe
|
ac0607b5ae
|
Review Entites.cloneEntity() JSDoc and add JSDoc for new properties
|
2018-05-30 10:02:10 +12:00 |
|
Andrew Meadows
|
57138b5fb7
|
disable workload region regulation by default
also set default region radiuses large
|
2018-05-29 14:21:16 -07:00 |
|
Gabriel Calero
|
bb73af7230
|
Show stats button only in debug mode. Add isDebugMode to Script public interface
|
2018-05-29 17:21:44 -03:00 |
|
samcake
|
82503a9e64
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-29 08:59:37 -07:00 |
|
Sam Gateau
|
2f94c43968
|
Removing the getLayer from the meshPArtPayload and check that it s working
|
2018-05-28 23:20:04 -07:00 |
|
David Rowe
|
e20e014a5c
|
Add JSDoc stubs for new Render API functions
|
2018-05-28 12:02:08 +12:00 |
|
Sam Gateau
|
678effdb48
|
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
|
2018-05-26 23:28:59 -07:00 |
|
samcake
|
221b513b19
|
Oh boy
|
2018-05-25 16:33:34 -07:00 |
|
samcake
|
051776ab1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-25 10:30:45 -07:00 |
|
Andrew Meadows
|
1612d90cd3
|
minor DynamicsWorld optimizations and track global steps count therein
|
2018-05-25 08:31:09 -07:00 |
|
Andrew Meadows
|
ed62a2fc37
|
_lastKinematicStep now mutable, avoids explicit const_cast
|
2018-05-25 08:31:09 -07:00 |
|
John Conklin II
|
286d09939d
|
Merge pull request #13205 from luiscuenca/GLTFfix1
Minor fix allows import glTF from Substance Painter
|
2018-05-25 08:28:29 -07:00 |
|
Sam Gateau
|
aa49595a23
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 18:19:55 -07:00 |
|
Clement
|
20f33d9cbc
|
CR
|
2018-05-24 17:45:10 -07:00 |
|
Clement
|
5f41505846
|
Store big web requests on disk
|
2018-05-24 17:30:32 -07:00 |
|
Clement
|
19100c9550
|
Coding Standard
Spacing
Self-Sufficient Headers
|
2018-05-24 17:30:32 -07:00 |
|
Clement
|
e096ff91f6
|
Explicitely manage HTTPManager lifetime
|
2018-05-24 17:30:32 -07:00 |
|
samcake
|
55ec0d3e84
|
Fixing the merge conflicts and repairing the regulation values
|
2018-05-24 17:25:00 -07:00 |
|
samcake
|
559d436dfa
|
Fixing the merge conflicts
|
2018-05-24 16:57:10 -07:00 |
|
Anthony Thibault
|
eae5215d94
|
Merge pull request #13206 from ctrlaltdavid/21872-c
JSDoc fixes
|
2018-05-24 16:44:55 -07:00 |
|
John Conklin II
|
caee987d96
|
Merge pull request #13210 from SamGondelman/macSkybox
Mac: render unsupported BPTC textures as uncompressed
|
2018-05-24 14:52:11 -07:00 |
|
samcake
|
44a8d880fa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 14:31:53 -07:00 |
|
John Conklin II
|
36d2baab60
|
Merge pull request #13214 from SamGondelman/primCrash
Fix crash in GL45Backend::do_drawIndexedInstanced
|
2018-05-24 13:33:06 -07:00 |
|
John Conklin II
|
04bf8f851f
|
Merge pull request #13219 from samcake/one
Bringing Evolution to the Job Engine Task library developed in the workload project to master
|
2018-05-24 13:30:16 -07:00 |
|
Brad Davis
|
7e16325805
|
Unit testing cached and uncached shader loading
|
2018-05-24 12:42:34 -07:00 |
|
Bradley Austin Davis
|
3beb77694f
|
Cached shader binaries and uniform data for shaders
|
2018-05-24 12:42:33 -07:00 |
|
Stephen Birarda
|
2cb7c9cc62
|
add a BUILD_TYPE to BuildInfo, fix conditional
|
2018-05-24 12:04:32 -07:00 |
|
Stephen Birarda
|
45b8c1248c
|
disable version checking for nightly builds
|
2018-05-24 12:03:33 -07:00 |
|
Andrew Meadows
|
885c7bc97d
|
bump protocol for extra byte in collisionMask
|
2018-05-24 11:28:52 -07:00 |
|
Andrew Meadows
|
d42375e4fe
|
finish uint8_t to uint16_t conversion
|
2018-05-24 11:28:52 -07:00 |
|
Andrew Meadows
|
31dd59d212
|
double bits in collision groups
|
2018-05-24 11:28:52 -07:00 |
|
Sam Gateau
|
b8b337dbe4
|
There and back again...
|
2018-05-24 01:18:36 -07:00 |
|
Sam Gateau
|
13d02011f3
|
There and back again...
|
2018-05-24 00:53:29 -07:00 |
|
Sam Gateau
|
f66e13b2ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-23 21:43:36 -07:00 |
|
samcake
|
c29b93b986
|
Merging with latest master and bringin low hanging fruits from Andrews pr
|
2018-05-23 17:49:10 -07:00 |
|
samcake
|
40370f860a
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-05-23 17:26:08 -07:00 |
|
samcake
|
c66b592b3a
|
MOVe the feedINput functions at the right spot
|
2018-05-23 17:04:00 -07:00 |
|
SamGondelman
|
e6741a363e
|
add local-only isVisibleInSecondaryCamera flag to entities
|
2018-05-23 16:35:21 -07:00 |
|
samcake
|
7ed39f4052
|
Adjusting the syntax to have linux compiling maybe
|
2018-05-23 16:16:57 -07:00 |
|
samcake
|
cf58f31f3e
|
Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'
|
2018-05-23 15:08:48 -07:00 |
|
Andrew Meadows
|
d50da2babc
|
Merge 'master' into 'workload'
|
2018-05-23 14:51:05 -07:00 |
|
John Conklin II
|
3e665fb616
|
Merge pull request #13179 from dback2/cloneables
Server-Managed Cloneables + Cloneable Properties
|
2018-05-23 12:40:27 -07:00 |
|
samcake
|
55945b5454
|
Remove deprecated and commented code
|
2018-05-23 12:36:20 -07:00 |
|
samcake
|
b06356b0fd
|
Remove deprecated and commented code
|
2018-05-23 11:58:25 -07:00 |
|
samcake
|
5bede45c85
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-23 11:26:07 -07:00 |
|
Ryan Huffman
|
59ca2f9977
|
Fix ResourceManager not properly shutting down thread
|
2018-05-23 10:51:12 -07:00 |
|
Ryan Huffman
|
8e1c7531dc
|
Add option to oven.exe to disable texture baking
|
2018-05-23 10:42:14 -07:00 |
|
David Rowe
|
ebeee51581
|
Update image links
|
2018-05-23 17:20:24 +12:00 |
|
samcake
|
184d50b018
|
Well
|
2018-05-22 17:55:26 -07:00 |
|
samcake
|
4985207b45
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-22 17:40:54 -07:00 |
|
Liv Erickson
|
56493346c1
|
fix permissions check
|
2018-05-22 15:41:48 -07:00 |
|
John Conklin II
|
52a05680e7
|
Merge pull request #12895 from vladest/menu-updates
Menu Cleanup and Reorganization
|
2018-05-22 13:21:08 -07:00 |
|
Liv Erickson
|
0ebd13b3e6
|
cannot edit origin from client / fix ICE issue
|
2018-05-22 13:17:23 -07:00 |
|
SamGondelman
|
9dfc61a452
|
possible fix for gl crash
|
2018-05-22 12:51:32 -07:00 |
|
David Rowe
|
6a75e7acb6
|
Fix canCastShadow property JSDoc
|
2018-05-23 07:11:23 +12:00 |
|
Liv Erickson
|
7efcc135e4
|
reorder flags
|
2018-05-22 11:03:41 -07:00 |
|
Liv Erickson
|
e273a0c1a6
|
fix define properties
|
2018-05-22 09:10:50 -07:00 |
|
samcake
|
072d0f262c
|
FIxing the problem of shadows not repecting the cull group
|
2018-05-21 18:07:04 -07:00 |
|
Liv Erickson
|
27c2bb9046
|
add properties group where missing
|
2018-05-21 17:39:08 -07:00 |
|
Liv Erickson
|
a1e7f648bc
|
add debug properties
|
2018-05-21 17:14:36 -07:00 |
|
Liv Erickson
|
e76829bb1d
|
change to DEFINE_PROPERTY_REF
|
2018-05-21 16:51:23 -07:00 |
|
Liv Erickson
|
604b3cac1c
|
check for null entities in grab, add conversion for old userdata cloneable
|
2018-05-21 16:19:43 -07:00 |
|
samcake
|
f536f7b6c9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-21 15:52:51 -07:00 |
|
samcake
|
2dc28a504c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-21 15:52:42 -07:00 |
|
Sam Gateau
|
87989268bf
|
Merge pull request #13182 from jherico/feature/batch_pooling
Use pooled gpu batches
|
2018-05-21 15:47:55 -07:00 |
|
Sam Gateau
|
a1c948c0f0
|
Merge pull request #13127 from SimonWalton-HiFi/half-baked-model
Incorrectly baked model crashes Interface
|
2018-05-21 15:30:42 -07:00 |
|
SamGondelman
|
45289dea09
|
on mac, render unsupported bptc textures (skyboxes) as uncompressed
|
2018-05-21 14:27:18 -07:00 |
|
Brad Davis
|
9c26b2c1d3
|
Use pooled gpu batches
|
2018-05-21 13:53:44 -07:00 |
|
David Rowe
|
fa54461788
|
Update some recent JSDoc additions
|
2018-05-22 08:52:39 +12:00 |
|
Simon Walton
|
c205a856a7
|
Split canned FBX header in two; only check first part on read
|
2018-05-21 13:29:08 -07:00 |
|
John Conklin II
|
61eccabb56
|
Merge pull request #13208 from jherico/fix/texture_warnings
Fixing populated / allocated tracking for textures
|
2018-05-21 13:27:56 -07:00 |
|
Brad Davis
|
6daffba18e
|
Fixing populated / allocated tracking for textures
|
2018-05-21 11:51:05 -07:00 |
|
John Conklin II
|
168edb1cde
|
Merge pull request #13192 from druiz17/fix-spaming-set-host
fix case sensitive comparison in AddressManager::setHost
|
2018-05-21 11:16:18 -07:00 |
|
samcake
|
b4807becb6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-21 10:41:25 -07:00 |
|
samcake
|
03271d6818
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-05-21 10:38:44 -07:00 |
|
Dante Ruiz
|
249d22b4b4
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-21 10:31:24 -07:00 |
|
Sam Gateau
|
3d4964559d
|
Merge pull request #13202 from jherico/fix/texture_warnings
Fix logspam from texture transfer code
|
2018-05-21 10:20:40 -07:00 |
|
John Conklin II
|
88163424f0
|
Merge pull request #13164 from SimonWalton-HiFi/entities-relaying
Move down OctreeQueryNode::_viewMutex to OctreeQuery
|
2018-05-21 10:14:41 -07:00 |
|
Sam Gondelman
|
45beb686a0
|
Merge pull request #13204 from SamGondelman/hudCrash
Protect against null hudTexture
|
2018-05-21 09:31:08 -07:00 |
|
Sam Gateau
|
e1690a28e1
|
Merging with master
|
2018-05-20 23:04:11 -07:00 |
|
Thijs Wenker
|
7f4e9a0089
|
style
|
2018-05-21 06:17:08 +02:00 |
|
Thijs Wenker
|
f4df75d016
|
CR feedback
|
2018-05-21 06:04:05 +02:00 |
|
Livi Erickson
|
70bbac5c83
|
update with lastEditedCheck
|
2018-05-20 18:49:41 -07:00 |
|
Livi Erickson
|
9f7b383757
|
address CR feedback
|
2018-05-20 18:22:17 -07:00 |
|
David Rowe
|
e44e7ca35f
|
Fix up Resource and resource cache APIs' JSDoc
|
2018-05-21 11:57:16 +12:00 |
|
Livi Erickson
|
9c0084209b
|
fix style error, start lifetime properly for cloned entities
|
2018-05-20 16:41:14 -07:00 |
|
David Rowe
|
6d4f704279
|
Regularize some JSDoc usage
|
2018-05-21 09:32:10 +12:00 |
|
luiscuenca
|
1130f9998d
|
Minor fix allows import GLTF from Substance Painter
|
2018-05-19 10:42:55 -07:00 |
|
Liv Erickson
|
6c8d68afc6
|
add extra cleanup in delete messages and simulation, as a fall back
|
2018-05-18 18:18:42 -07:00 |
|
Simon Walton
|
e4130dbf39
|
Merge remote-tracking branch 'upstream/master' into half-baked-model
|
2018-05-18 17:48:52 -07:00 |
|
samcake
|
3aaa01788c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-18 17:42:30 -07:00 |
|
samcake
|
36a08fdd84
|
Friday night end of the day, last compilation.... almost
|
2018-05-18 17:41:28 -07:00 |
|
Liv Erickson
|
29b11b9101
|
some fixes to server cloneables
|
2018-05-18 17:12:41 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
Sam Gateau
|
8ae253019c
|
Merge pull request #13201 from samcake/brown
Fix Flickery Procedural Shader
|
2018-05-18 16:11:21 -07:00 |
|
Sam Gateau
|
026cae09f7
|
Merge pull request #13200 from Cristo86/gles_ishazeenabled_error_fix
Fix isHazeEnabled() checks with 0.0 to fix GLES compiler error
|
2018-05-18 15:44:24 -07:00 |
|
SamGondelman
|
484bda0f3c
|
check for null texture
|
2018-05-18 15:34:07 -07:00 |
|
Sam Gateau
|
07f1ab8c98
|
Merge pull request #13194 from SamGondelman/resolution
Fix Scale Resolution option
|
2018-05-18 15:23:01 -07:00 |
|
Brad Davis
|
fb101cf036
|
Fix logspam from texture transfer code
|
2018-05-18 14:51:26 -07:00 |
|
samcake
|
0e66ca1dfd
|
Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned
|
2018-05-18 13:25:08 -07:00 |
|
SamGondelman
|
12b91a2ab7
|
compress skyboxes
|
2018-05-18 13:18:43 -07:00 |
|
Cristian Luis Duarte
|
c7edf72f71
|
Check isHazeEnabled() vs 0.0 to compile on GLES
|
2018-05-18 15:59:24 -03:00 |
|
Andrew Meadows
|
84a2e5e443
|
fix yeild behavior for owned things outside of R1
|
2018-05-18 11:23:56 -07:00 |
|
Simon Walton
|
7f2a90cdb9
|
Address couple of reviewer issues
|
2018-05-18 11:20:45 -07:00 |
|
Dante Ruiz
|
027d1ed50b
|
making requested changes
|
2018-05-18 11:07:11 -07:00 |
|
Liv Erickson
|
de05388ebf
|
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
|
2018-05-18 10:42:26 -07:00 |
|
Andrew Meadows
|
c8b8d0f1c4
|
remove commented out cruft
|
2018-05-18 10:31:08 -07:00 |
|
Simon Walton
|
545ada0abb
|
Connect signal to keyGen thread for it to quit when owner destructed
|
2018-05-18 10:28:52 -07:00 |
|
Andrew Meadows
|
063c2564d1
|
only clear bid state when ownership actually changed
|
2018-05-18 10:28:45 -07:00 |
|
Andrew Meadows
|
a9c193b672
|
merge 'workload-014' into 'workload'
|
2018-05-18 10:12:04 -07:00 |
|
Brad Davis
|
3356486f27
|
Fix populated texture size tracking
|
2018-05-18 09:23:54 -07:00 |
|
Brad Davis
|
91f1d93d4e
|
Fix flicker while transferring texture data
|
2018-05-18 09:23:54 -07:00 |
|
Brad Davis
|
ae07036f20
|
Add ideal resource texture memory stat
|
2018-05-18 09:23:53 -07:00 |
|
Brad Davis
|
fb81cf927a
|
Faster texture transfers
|
2018-05-18 09:21:02 -07:00 |
|
Liv
|
40ff3f966f
|
Merge pull request #13165 from ctrlaltdavid/21872-b
JSDoc stubs for various APIs
|
2018-05-18 09:11:55 -07:00 |
|
Andrew Meadows
|
a23126a6b2
|
Merge 'master' into 'workload'
|
2018-05-18 07:38:02 -07:00 |
|
samcake
|
aa18aaa7b1
|
Maybe
|
2018-05-17 18:06:46 -07:00 |
|
Andrew Meadows
|
00e360aff0
|
reduce sim ownership priority when releasing grab
|
2018-05-17 17:25:07 -07:00 |
|
Andrew Meadows
|
926014b43f
|
entity-server always promotes VOLUNTEER to RECRUIT
|
2018-05-17 17:24:24 -07:00 |
|
SamGondelman
|
c57c15f22c
|
fix resolution option
|
2018-05-17 16:58:35 -07:00 |
|
Dante Ruiz
|
48404d811c
|
fix case sensitive comparison
|
2018-05-17 16:34:52 -07:00 |
|
David Back
|
4e14eb37e3
|
update comment
|
2018-05-17 16:34:19 -07:00 |
|
David Back
|
30855f94eb
|
set last edited to 0 to ensure server update
|
2018-05-17 16:02:58 -07:00 |
|
Sam Gondelman
|
74840d2130
|
Merge pull request #12935 from gcalero/android_new_login
Android new login
|
2018-05-17 15:53:25 -07:00 |
|
David Back
|
26b6b851f5
|
Merge branch 'cloneables' of github.com:dback2/hifi into cloneables
|
2018-05-17 14:50:39 -07:00 |
|
David Back
|
b8ce07744d
|
initialize prop defaults, no bool returns
|
2018-05-17 14:50:14 -07:00 |
|
samcake
|
0cf87748cd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-17 14:20:44 -07:00 |
|
Simon Walton
|
fe92cf0c47
|
Move fix up a level to bit a little more general
|
2018-05-17 13:34:38 -07:00 |
|
David Rowe
|
33ba559bb4
|
Show all OverlayWebWindows properties and functions together
|
2018-05-18 08:02:02 +12:00 |
|
David Rowe
|
2669a39e0f
|
Deprecate Agent API items that shouldn't be exposed in the API
|
2018-05-18 07:32:25 +12:00 |
|
Clement
|
da08d747dc
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-05-17 12:10:08 -07:00 |
|
Liv Erickson
|
ec8aa71dc4
|
Add JSDoc header to new clone function in Entity API
|
2018-05-17 11:25:20 -07:00 |
|
David Back
|
42d8492427
|
no clock skew
|
2018-05-17 11:17:04 -07:00 |
|
David Back
|
3730cbe36c
|
reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable
|
2018-05-17 10:28:48 -07:00 |
|