Andrew Meadows
|
7d6424bdcc
|
Head::render() was cruft
|
2016-05-05 18:28:27 -07:00 |
|
Andrew Meadows
|
bcf2cc8074
|
use references not pointers for ViewFrustums
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
|
2016-05-05 18:28:27 -07:00 |
|
Seth Alves
|
ec50744aa1
|
Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data
fix bug preventing sim ownership release
|
2016-05-05 11:14:55 -07:00 |
|
Andrew Meadows
|
967a67256e
|
fix bug preventing sim ownership release
|
2016-05-05 10:52:53 -07:00 |
|
Seth Alves
|
929d831212
|
Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data
fix object position glitch of owned simulations on networks with long ping-time
|
2016-05-05 10:11:02 -07:00 |
|
samcake
|
a78719bc85
|
Merge pull request #7813 from ZappoMan/fixRecursiveMutex
fix recursive mutex in Entites.callEntityMethod()
|
2016-05-05 10:06:58 -07:00 |
|
Andrew Meadows
|
be9a572fb0
|
fix grab motion glitch on long-ping connections
|
2016-05-04 16:50:42 -07:00 |
|
David Rowe
|
4b05d8ed95
|
Increase maximum friction to 10.0 - Bullet's maximum
|
2016-05-05 07:50:15 +12:00 |
|
Brad Hefta-Gaub
|
2c9608489f
|
fix recursive mutex in Entites.callEntityMethod()
|
2016-05-04 10:01:20 -07:00 |
|
David Rowe
|
d1064bf5ea
|
Increase maximum friction to 1.0 - bullet can handle it
|
2016-05-04 10:58:33 +12:00 |
|
David Rowe
|
bc04d1b477
|
Increase maximum friction value from 0.99 to 0.9999
|
2016-05-04 09:01:26 +12:00 |
|
Andrew Meadows
|
ba226b9cb4
|
promote priority immediately when already owned
|
2016-05-03 13:43:08 -07:00 |
|
Brad Hefta-Gaub
|
eb209c7483
|
Merge pull request #7752 from Geenz/master
Correction To sRGB Conversions
|
2016-05-03 08:01:51 -07:00 |
|
Seth Alves
|
1da041de9b
|
don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity
|
2016-05-02 15:09:08 -07:00 |
|
Seth Alves
|
ae8f502808
|
keep track of actions we are editing and ignore updates from server for these actions
|
2016-05-02 14:23:36 -07:00 |
|
Zach Pomerantz
|
13945aa4d9
|
Annotate all virtual fns with override
|
2016-04-30 13:48:59 -07:00 |
|
Geenz
|
85e0620261
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2016-04-30 15:40:28 -04:00 |
|
Andrew Meadows
|
b5ad989811
|
more optimized uses of EntityItem::getDimensions()
|
2016-04-27 11:04:22 -07:00 |
|
Andrew Meadows
|
c686418be0
|
optimize use of EntityItem::getDimensions()
|
2016-04-27 10:34:29 -07:00 |
|
Geenz
|
83d6f7f1e3
|
Quick fix for incorrect conversion.
We want sRGB to linear, not linear to sRGB.
|
2016-04-26 18:49:03 -04:00 |
|
Geenz
|
ef7098b39a
|
Missed a few.
|
2016-04-26 17:12:04 -04:00 |
|
Seth Alves
|
16bf59f8a6
|
fix a crash in RenderableModelEntityItem::getModel
|
2016-04-25 10:26:32 -07:00 |
|
Brad Hefta-Gaub
|
8c7ef31636
|
Merge pull request #7746 from AndrewMeadows/supress-spurious-logs
reduce warnings about truncated kinematic timesteps
|
2016-04-23 09:34:45 -07:00 |
|
Brad Hefta-Gaub
|
04dab65b59
|
Merge pull request #7727 from ZappoMan/supportLargeClockSkew
support for larger than 35 minute clock skew
|
2016-04-23 08:42:38 -07:00 |
|
Andrew Meadows
|
d984ce4792
|
properly update _lastSimulated for kinematic objs
|
2016-04-22 17:19:00 -07:00 |
|
Andrew Meadows
|
34d622e498
|
add warning about truncated kinematic timestep
|
2016-04-22 13:10:23 -07:00 |
|
Andrew Meadows
|
872622c6f7
|
fix acceleration of for server-side kinematics
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
14abb15216
|
set kinematic accel before stepping
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
8efb07cfd8
|
correctg measured acceleration for kinematics
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
a79f49a5cd
|
don't stop slow kinematic objs when sending updates
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
ad045bc439
|
remove second-order term from kinematic motion
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
3639ffe53e
|
optimize kinematic motion math
|
2016-04-22 09:38:43 -07:00 |
|
Brad Hefta-Gaub
|
31f9d592e0
|
support for larger than 35 minute clock skew
|
2016-04-20 18:42:00 -07:00 |
|
Howard Stearns
|
9ff9682b2a
|
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
Reset entities script engine on domain change
|
2016-04-19 11:14:28 -07:00 |
|
Seth Alves
|
4bf98a80b9
|
Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash
fix entity-server crash when entity moves out of bounds
|
2016-04-18 14:09:21 -07:00 |
|
Brad Hefta-Gaub
|
374ba10524
|
more CR feedback
|
2016-04-18 12:23:36 -07:00 |
|
Brad Hefta-Gaub
|
1c111e20bd
|
fix possible thread issue with Entities.callEntityMethod()
|
2016-04-18 11:20:26 -07:00 |
|
Brad Hefta-Gaub
|
91334d6a39
|
Merge pull request #7664 from ZappoMan/reduceJointProperties
only export joint values if they've been explicitly set by scripts
|
2016-04-14 15:30:04 -07:00 |
|
Andrew Meadows
|
a263091c94
|
fix entity-server crash for out of bounds
|
2016-04-14 15:23:14 -07:00 |
|
Zach Pomerantz
|
e80898f095
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
|
2016-04-14 10:12:16 -07:00 |
|
Brad Hefta-Gaub
|
7b5075cce5
|
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
add a heuristic for deciding when it's safe to enable bullet
|
2016-04-14 09:35:58 -07:00 |
|
Brad Hefta-Gaub
|
b48503a82d
|
only export joint values if they've been explicitly set by scripts
|
2016-04-13 19:52:50 -07:00 |
|
Zach Pomerantz
|
7a15339631
|
Use AnimationCache for models
|
2016-04-13 15:44:47 -07:00 |
|
Seth Alves
|
3288bff963
|
don't flood log with messages about expired actions. also, try to remove such actions
|
2016-04-13 09:47:07 -07:00 |
|
Seth Alves
|
e4c91e5064
|
add a heuristic for deciding when it's safe to enable bullet
|
2016-04-12 11:46:00 -07:00 |
|
Seth Alves
|
1d63f6d354
|
Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe
|
2016-04-11 09:58:08 -07:00 |
|
Brad Hefta-Gaub
|
47ff5c090d
|
Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
fix export of animation properties
|
2016-04-11 09:37:47 -07:00 |
|
Brad Hefta-Gaub
|
cc418c615f
|
Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
treat children of avatars and children of entities differently until velocity handling is fixed
|
2016-04-10 14:55:03 -07:00 |
|
Seth Alves
|
43f735dd21
|
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
|
2016-04-09 22:18:43 -07:00 |
|
Seth Alves
|
2aa3e5d418
|
re-enabled EntityItem::simulateKinematicMotion for things with parents
|
2016-04-09 09:06:18 -07:00 |
|