Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Stephen Birarda
602d65a71a
Merge pull request #10001 from birarda/cleanup-ebp
...
cleanup EncodeBitstreamParams to use nodeData when possible
2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Brad Davis
fe84232ab4
More work on thread safety
2017-04-04 10:50:56 -07:00
Brad Davis
03c6275268
more thread safety
2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789
Thread safety for property getter/setters on entities
2017-04-04 10:50:53 -07:00
Stephen Birarda
53e6a77fcc
cleanup EncodeBitstreamParams to use nodeData when possible
2017-03-24 13:41:36 -07:00
Seth Alves
ce9bb439b3
change Model api in anticipation of more than just PolyVox being able to give meshes to javascript
2017-03-23 09:55:30 -07:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Stephen Birarda
304618f51d
cleanup comment and scoping for server script URL changes
2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9
a simple hack to accept newer server scripts
2017-01-25 12:39:41 -08:00
Ryan Huffman
ee8898568d
Remove const from getScript & getServerScripts
2017-01-20 14:36:01 -08:00
Atlante45
20a82df9a0
Fix scripts not reloading in certain edge cases
2017-01-19 15:48:44 -08:00
Atlante45
cbc69fbf9e
Fix script preload functions
2017-01-18 16:42:25 -08:00
Atlante45
e94cccf08d
Fix server script preload funcitons
2017-01-18 16:12:41 -08:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034
leverage JSON filter changes to OctreeQuery in EntityServer
2017-01-18 14:58:36 -08:00
Atlante45
20b7bb0c54
EntityScriptServer tracks server scripts
2017-01-17 16:41:56 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
Seth Alves
01ff3f14b6
re-evaluate an entities in-bullet status when parentID changes
2017-01-09 15:28:05 -08:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
samcake
dfc0b7beac
adressed reveiw comments
2016-11-22 10:15:49 -08:00
samcake
a05e42138c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-14 09:58:12 -08:00
Seth Alves
899dec8b10
Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by
2016-11-11 06:11:49 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
Seth Alves
850361f222
lastEditedBy property for entities
2016-11-10 15:26:28 -08:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
samcake
8a44140e6b
cleaning up the comments from review and trying something to adress the issue that showed up on i5
2016-10-07 16:04:19 -07:00
samcake
108910052a
Adding the reverse transformation
2016-09-09 19:00:54 -07:00
Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
samcake
b563e280e4
Commuting the LIghtEntityItem changes correctly to the LightRenderItem
2016-08-31 13:55:41 -07:00
samcake
3755a3fc32
Add batch timing information vs gpu
2016-08-29 17:54:17 -07:00
Andrew Meadows
acaa77b75a
remove cruft from debug efforts
2016-08-24 22:26:56 -07:00
Andrew Meadows
b2dfa49a6f
stubbery for alerting entity that shape changed
2016-08-24 22:25:45 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
Brad Hefta-Gaub
1cec7b2db0
Merge pull request #8429 from SamGondelman/loadingFade2
...
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
SamGondelman
ccca6d935f
don't fade after physics kick in
2016-08-12 14:35:22 -07:00
Seth Alves
15e2140cb2
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-11 15:06:58 -07:00
SamGondelman
36d9f92101
performance optimization to minimize calling usecTimestampNow
2016-08-09 13:10:02 -07:00
SamGondelman
ac9a80131a
refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes
2016-08-04 12:34:46 -07:00
