Seth Alves
|
910c8da046
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-04 14:19:12 -08:00 |
|
Clément Brisset
|
da6db93508
|
Merge pull request #4375 from ctrlaltdavid/20370
More parentheses to address Xcode compiler warnings
|
2015-03-04 10:06:54 -08:00 |
|
David Rowe
|
4c959e8d82
|
More parentheses to address Xcode compiler warnings
|
2015-03-04 09:17:19 -08:00 |
|
Seth Alves
|
15609a80ec
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-04 08:48:54 -08:00 |
|
Seth Alves
|
b4998e9c53
|
falling onto an object works
|
2015-03-04 08:48:48 -08:00 |
|
Stephen Birarda
|
3005f74411
|
fix localhost port check to not kill user lookup
|
2015-03-03 23:11:02 -08:00 |
|
Seth Alves
|
a254f017cc
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-03 18:37:40 -08:00 |
|
Seth Alves
|
8eec66c066
|
merge upstream, avatar can now fall onto a cube
|
2015-03-03 18:37:16 -08:00 |
|
samcake
|
6b1f42df83
|
Merge pull request #4366 from ZappoMan/removeMetavoxels
remove metavoxels
|
2015-03-03 15:50:53 -08:00 |
|
Brad Hefta-Gaub
|
9649ed9936
|
Merge pull request #4371 from huffman/light-radius
Update Light to set direction when setting orientation
|
2015-03-03 15:50:04 -08:00 |
|
Seth Alves
|
7e4b597ca3
|
keep physics specific code in PhysicsEngine
|
2015-03-03 15:45:10 -08:00 |
|
Seth Alves
|
5d4ef8d5b8
|
initial flailing
|
2015-03-03 14:30:26 -08:00 |
|
Ryan Huffman
|
3fef8a1622
|
Update Light to set direction when setting orientation
|
2015-03-03 12:41:51 -08:00 |
|
Brad Hefta-Gaub
|
b118912708
|
Merge pull request #4361 from samcake/temp0
evolve the Transform stack away from the legacy GL to the brand new shader way
|
2015-03-03 11:43:01 -08:00 |
|
Brad Hefta-Gaub
|
29340b6586
|
Merge pull request #4369 from ctrlaltdavid/20370
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
|
2015-03-03 11:17:31 -08:00 |
|
Sam Gateau
|
cad2184927
|
FIxing the compilation issue for linux
|
2015-03-03 11:09:11 -08:00 |
|
Brad Hefta-Gaub
|
b88d52a310
|
Merge pull request #4363 from huffman/block-restricted-users
Add permission-checking to edit entities
|
2015-03-03 11:04:46 -08:00 |
|
Sam Gateau
|
598b791aee
|
FIxing the compilation issue for linux
|
2015-03-03 11:01:47 -08:00 |
|
Sam Gateau
|
4619ba1f5b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-03-03 10:56:04 -08:00 |
|
Stephen Birarda
|
eb8e8e9a62
|
Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem
pass more localhost ports via shared memory
|
2015-03-03 10:05:24 -08:00 |
|
Philip Rosedale
|
c9f97b312e
|
Merge pull request #4365 from sethalves/log-only-once
Log message type just once
|
2015-03-02 20:38:54 -08:00 |
|
ZappoMan
|
5c3c94a618
|
remove metavoxels
|
2015-03-02 17:21:43 -08:00 |
|
Ryan Huffman
|
b370e025c9
|
Move EntityScriptingInterface instance to DependencyManager
|
2015-03-02 15:05:31 -08:00 |
|
Ryan Huffman
|
98e0f235cc
|
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
|
2015-03-02 14:47:26 -08:00 |
|
Seth Alves
|
bb7b132b78
|
Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once.
|
2015-03-02 14:18:26 -08:00 |
|
Brad Hefta-Gaub
|
6d8ccfbc2a
|
Merge pull request #4357 from huffman/update-light-entity-properties
Update light entity properties
|
2015-03-02 13:51:48 -08:00 |
|
Ryan Huffman
|
38a361dcf0
|
Remove class scope on _entityScriptingInterface property references
|
2015-03-02 11:32:07 -08:00 |
|
Ryan Huffman
|
75a943386b
|
Remove nullptr comparison
|
2015-03-02 10:44:32 -08:00 |
|
Ryan Huffman
|
a443157dd7
|
Update ScriptEngine::entityScriptingInterface to be static pointer
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
|
2015-03-02 10:40:46 -08:00 |
|
Ryan Huffman
|
9a302eebed
|
Add Entities.canAdjustLocksChanged
|
2015-03-02 10:40:29 -08:00 |
|
Ryan Huffman
|
64cb517856
|
Add LimitedNodeList::canAdjustLocksChanged signal
|
2015-03-02 10:40:11 -08:00 |
|
Ryan Huffman
|
1a3eb68e2d
|
Update lightEntityItem old version handling to be more clear
|
2015-03-02 09:25:18 -08:00 |
|
Brad Hefta-Gaub
|
a2d8f89426
|
Merge pull request #4358 from huffman/handle-sigint
Add SIGINT handling to assignment-client
|
2015-02-27 22:13:10 -08:00 |
|
Sam Gateau
|
5652852d1a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-27 17:35:59 -08:00 |
|
Sam Gateau
|
5ab3cbb7ec
|
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
|
2015-02-27 17:11:16 -08:00 |
|
ZappoMan
|
31c96523fb
|
add support for transparency in RAW heightmaps
|
2015-02-27 15:57:46 -08:00 |
|
Ryan Huffman
|
11efcd70d8
|
Add SIGINT handling to assignment-client
|
2015-02-27 14:09:46 -08:00 |
|
Ryan Huffman
|
84691f922c
|
Remove old light color properties
|
2015-02-27 14:04:56 -08:00 |
|
Ryan Huffman
|
61bc32493f
|
Fix entity version name in LightEntityItem
|
2015-02-27 13:49:17 -08:00 |
|
Ryan Huffman
|
a7f84bcd30
|
Update entity server version number
|
2015-02-27 13:46:04 -08:00 |
|
Ryan Huffman
|
093e5db90d
|
Update entity light properties to use new model
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
|
2015-02-27 13:42:56 -08:00 |
|
Sam Gateau
|
ea88cbd75f
|
Merge with upstream master
|
2015-02-27 13:19:50 -08:00 |
|
Ryan Huffman
|
5c9473cd24
|
Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties
Conflicts:
libraries/entities-renderer/src/RenderableLightEntityItem.cpp
|
2015-02-27 12:20:10 -08:00 |
|
Ryan Huffman
|
fdc1146339
|
Update RenderableLightEntityItem to use update light entity
|
2015-02-27 12:14:50 -08:00 |
|
Seth Alves
|
ce3c8f87d9
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-27 11:08:29 -08:00 |
|
Brad Hefta-Gaub
|
08dc883b0e
|
Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
|
2015-02-27 10:54:19 -08:00 |
|
Philip Rosedale
|
35205fbbf3
|
Merge pull request #4347 from samcake/temp1
Introducing the SunSkyStage
|
2015-02-27 10:37:02 -08:00 |
|
Seth Alves
|
fb4f2fe89c
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-27 10:19:06 -08:00 |
|
Philip Rosedale
|
df553ac65e
|
Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x
Assignment client keep a spare
|
2015-02-27 07:39:06 -08:00 |
|
Sam Gateau
|
c7eeebe52c
|
and fixing a bug with shadowing of lightmapped surface
|
2015-02-26 18:07:43 -08:00 |
|