samcake
|
b5c942f7f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
|
2017-09-26 10:47:59 -07:00 |
|
SamGondelman
|
be27376c52
|
add comment about bottleneck
|
2017-09-22 10:21:32 -07:00 |
|
SamGondelman
|
9f12d3a365
|
fix missing models
|
2017-09-21 17:57:25 -07:00 |
|
samcake
|
9a9d13e519
|
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
|
2017-09-21 09:05:46 -07:00 |
|
Brad Davis
|
27350bd7de
|
Don't add items to the scene graph until they have a valid parent chain
|
2017-09-20 16:52:23 -07:00 |
|
samcake
|
fd8868f609
|
Moving the render transform evaualtion in game loop for Models
|
2017-09-19 17:30:20 -07:00 |
|
Seth Alves
|
d89f2b77da
|
rework ScriptEngine lifetimes using 'smart' pointers
|
2017-09-14 10:42:21 -07:00 |
|
Bradley Austin Davis
|
eb8b892571
|
Various Mac fixes
|
2017-09-07 14:45:35 -07:00 |
|
Seth Alves
|
7220a6998a
|
remove unneeded bind-by-ref thing from lambdas
|
2017-08-28 17:08:59 -07:00 |
|
Seth Alves
|
b9c68f9156
|
give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup
|
2017-08-28 17:01:01 -07:00 |
|
Brad Davis
|
e817d3ced4
|
Threaded rendering & entity rendering refactor
|
2017-08-24 13:34:34 -07:00 |
|
SamGondelman
|
a904ae1a8a
|
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
|
2017-08-22 11:41:20 -07:00 |
|
Zach Fox
|
b8c45b0c30
|
Don't always do precision picking inside mouseMoveEvent
|
2017-08-09 14:23:43 -07:00 |
|
Zach Fox
|
62f6c10b2b
|
Renaming things; bugfixes; improvements
|
2017-07-26 12:45:10 -07:00 |
|
Zach Fox
|
96f52a9812
|
First pass at getting overlays to show up on hover
|
2017-07-17 17:05:16 -07:00 |
|
Zach Fox
|
147474e19a
|
Logging category and filter
|
2017-07-17 11:17:59 -07:00 |
|
Zach Fox
|
e602d3610e
|
Initial commit for HoverOverlayInterface
|
2017-07-14 17:26:53 -07:00 |
|
Brad Davis
|
6fc82bb351
|
Switch to preprocessor macro for blocking invokes to capture function information
|
2017-06-30 11:36:24 -07:00 |
|
Brad Davis
|
b52dd7b822
|
Don't use blocking connections on the main thread
|
2017-06-29 20:45:17 -07:00 |
|
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 |
|