SamGondelman
|
cc8ecdc596
|
put back entity signals for scripts
|
2017-10-12 17:28:00 -07:00 |
|
SamGondelman
|
0d164363af
|
cleanup mousePressOffEntity signal
|
2017-10-12 15:29:29 -07:00 |
|
SamGondelman
|
1a047613bf
|
fix pointerevents on entities from scripts
|
2017-10-12 12:31:36 -07:00 |
|
SamGondelman
|
53fde83922
|
cleaning up pointerevents, wip
|
2017-10-12 11:21:50 -07:00 |
|
Atlante45
|
6dd49f5c32
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2017-10-10 16:53:34 -07:00 |
|
SamGondelman
|
ee02fa9a91
|
model asks for renderUpdate if animating
(cherry picked from commit 873ae9b9d6 )
|
2017-10-09 13:55:48 -07:00 |
|
SamGondelman
|
873ae9b9d6
|
model asks for renderUpdate if animating
|
2017-10-09 13:36:38 -07:00 |
|
Bradley Austin Davis
|
c92588685b
|
Merge pull request #11533 from SamGondelman/modelMaster
Fix model loading for real this time
|
2017-10-08 10:23:13 -07:00 |
|
SamGondelman
|
a6b7578c3c
|
start fixing asynch issue, fixes model loading!
|
2017-10-05 12:30:00 -07:00 |
|
SamGondelman
|
3a6e84e681
|
trying to fix model issue
|
2017-10-04 17:26:12 -07:00 |
|
SamGondelman
|
215193ad90
|
try to improve performance
(cherry picked from commit a5f5f9fc5d )
|
2017-10-04 13:50:35 -07:00 |
|
SamGondelman
|
a5f5f9fc5d
|
try to improve performance
|
2017-10-04 12:05:13 -07:00 |
|
Andrew Meadows
|
46e809bbb2
|
use a better variable name
|
2017-10-03 12:35:03 -07:00 |
|
Andrew Meadows
|
ef326a3851
|
expose performance hot spot in stats details
|
2017-10-03 12:35:02 -07:00 |
|
Sam Gateau
|
9317ad38aa
|
Merge pull request #11462 from highfidelity/game-render-interface
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
|
2017-09-26 17:40:23 -07:00 |
|
Bradley Austin Davis
|
e42068f681
|
Merge branch 'master' into android_new
|
2017-09-26 14:31:29 -07:00 |
|
samcake
|
510b446409
|
mergine with master, resolving conflict
|
2017-09-26 13:13:46 -07:00 |
|
Seth Alves
|
7397a123c5
|
Merge pull request #11345 from SamGondelman/textAA
Text3D Overlays and Entities fixes and no-AA
|
2017-09-26 12:26:08 -07:00 |
|
samcake
|
b5c942f7f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
|
2017-09-26 10:47:59 -07:00 |
|
Andrew Meadows
|
67481287ff
|
comment out asserts that fail to compile in Debug
|
2017-09-26 09:29:43 -07:00 |
|
Brad Hefta-Gaub
|
bafb59e691
|
Merge pull request #11436 from SamGondelman/missingModels
Fix missing models
|
2017-09-23 13:56:50 -07:00 |
|
SamGondelman
|
86198606e0
|
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
|
2017-09-22 17:12:44 -07:00 |
|
Anthony Thibault
|
20cb02dabb
|
Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
Fix for TextEntity rendering, the translation was incorrect
|
2017-09-22 11:19:24 -07:00 |
|
SamGondelman
|
be27376c52
|
add comment about bottleneck
|
2017-09-22 10:21:32 -07:00 |
|
Anthony J. Thibault
|
d3c60f3057
|
Fix for TextEntity rendering, the translation was incorrect
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
|
2017-09-22 09:44:51 -07:00 |
|
Brad Davis
|
549cb77902
|
Fix dimensions of rendered web entities
|
2017-09-21 20:59:01 -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 |
|
Bradley Austin Davis
|
bc4193f276
|
Merge branch 'master' into android_new
|
2017-09-19 14:27:31 -07:00 |
|
Bradley Austin Davis
|
b93e91b9f3
|
New android toolchain
|
2017-09-19 13:45:12 -07:00 |
|
Anthony J. Thibault
|
73ad9051a4
|
Shapes now render at the correct size.
|
2017-09-18 15:27:58 -07:00 |
|
Sam Gateau
|
84dfe53fee
|
Merge pull request #11362 from jherico/crash/model-race
Ensure thread-safety for model pointer access
|
2017-09-16 10:45:09 -07:00 |
|
Seth Alves
|
d968bbad6c
|
Merge pull request #11364 from sethalves/rework-scriptengine-lifetime
Rework scriptengine lifetime
|
2017-09-15 12:17:51 -07:00 |
|
Seth Alves
|
8a49edbecb
|
code review
|
2017-09-15 10:08:35 -07:00 |
|
Brad Davis
|
688ee68cf9
|
Ensure thread-safety for model pointer access
|
2017-09-14 12:29:23 -07:00 |
|
Brad Davis
|
aef85eb69d
|
Fix polyline rendering using default texture
|
2017-09-14 10:48:14 -07:00 |
|
Seth Alves
|
cf2979dc78
|
Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime
|
2017-09-14 10:42:26 -07:00 |
|
Seth Alves
|
d89f2b77da
|
rework ScriptEngine lifetimes using 'smart' pointers
|
2017-09-14 10:42:21 -07:00 |
|
Brad Davis
|
501eee8b10
|
Fix transform of polylines with high update rates
|
2017-09-14 08:45:37 -07:00 |
|
Brad Davis
|
75e7146c5b
|
Fix polyline crash and flicker
|
2017-09-14 08:45:36 -07:00 |
|
Brad Davis
|
f4d8216501
|
Fix race condition accessing QString sub-properties in zones
|
2017-09-13 18:06:21 -07:00 |
|
Andrew Meadows
|
5741699bab
|
Merge pull request #11301 from Menithal/21484-Fix
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
|
2017-09-13 08:05:53 -07:00 |
|
SamGondelman
|
a955381726
|
Merge remote-tracking branch 'upstream/master' into textAA
|
2017-09-12 16:50:16 -07:00 |
|
SamGondelman
|
1b85a453ab
|
working on text3d overlays and entities
|
2017-09-12 16:49:51 -07:00 |
|
Menithal
|
40d339a831
|
21484: Updated code to go with PR feedback
|
2017-09-11 20:36:29 +03:00 |
|
Bradley Austin Davis
|
eb8b892571
|
Various Mac fixes
|
2017-09-07 14:45:35 -07:00 |
|
Bradley Austin Davis
|
37b184d982
|
Fix crashes in entity rendering on OSX
|
2017-09-07 14:32:50 -07:00 |
|
Menithal
|
856452405e
|
Made Code abit more concise for better compilation
|
2017-09-05 08:46:37 +03:00 |
|