Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Atlante45
49623fefd8
Fix Skyboxes sometimes not showing
2017-06-21 11:40:32 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Sam Cake
d19956f93c
Fixing warnings
2017-05-31 22:02:47 -07:00
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -07:00
Zach Fox
f2fab57187
Update conditional to handle 'other unowned' case
2017-05-25 13:01:40 -07:00
Zach Fox
be39874999
Changes after discussion with Brad
2017-05-25 13:01:40 -07:00
Zach Fox
f6195cdb1e
Committing checkpoint changes, then testing
2017-05-25 13:01:40 -07:00
Zach Fox
4d791211ee
Make the changes - big thanks to Andrew!
2017-05-25 13:01:40 -07:00
Sam Cake
3eb95d2d19
cleaning the commented code
2017-05-25 01:16:45 -07:00
samcake
e7b808cbc1
Merging with upstream
2017-05-23 12:12:31 -07:00
Sam Gateau
589bcc19ce
Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer
2017-05-19 17:50:19 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Andrew Meadows
ac6d4969d6
Merge pull request #10270 from Atlante45/fix/unload
...
Fix entity script unloads
2017-04-26 11:42:14 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
Atlante45
24f4107c92
Unload script when replaced with empty URL
2017-04-24 15:56:37 -07:00
Atlante45
d292451f91
Remove unnecessary const
2017-04-24 15:43:36 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
ZappoMan
ddd0645453
fix merge issue
2017-03-24 09:59:11 -07:00
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Brad Davis
944255a37b
Fix crash in render-perf-test
2017-03-22 22:44:05 -07:00
Seth Alves
424af2255b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-19 21:17:30 -08:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
humbletim
87d62ad1eb
Merge branch 'master' into 21114-part3
2017-03-16 16:39:37 -04:00
humbletim
758c07c7d4
Merge branch 'master' into 21114-part3
2017-03-16 14:29:17 -04:00
Stephen Birarda
0c657a1d55
add parameter to unload to remove entityID from map
2017-03-15 10:57:12 -07:00
Seth Alves
816b0b5cfd
unmangle merge
2017-03-15 09:02:32 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Seth Alves
509ce3f2d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub
8ae6f2727d
add support for double click messages to overlays and entities
2017-03-07 17:52:55 -08:00
humbletim
40ba8185a0
* Update per 21114-part2 changes.
...
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Seth Alves
cf37845f9e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-02 10:06:38 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Seth Alves
0e4b0332dd
avoid a rare crash
2017-02-25 11:35:27 -08:00
humbletim
b15956278c
separate out supporting changes into 21114-part2 branch
2017-02-16 07:40:19 -05:00
Seth Alves
792c7ff51f
PointerEvent will now relay keyboard modifiers
2017-02-15 10:41:56 -08: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
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Andrew Meadows
6ef4420f37
remove commented out cruft
2017-01-30 13:21:23 -08:00
