Seth Alves
|
03706359f5
|
cleanups
|
2015-04-24 17:44:52 -07:00 |
|
Seth Alves
|
218393a2b3
|
rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken
|
2015-04-24 17:37:19 -07:00 |
|
Seth Alves
|
6e6793cbcc
|
remove debugging prints
|
2015-04-24 15:18:02 -07:00 |
|
Seth Alves
|
2a8fbeca32
|
sync
|
2015-04-24 14:43:39 -07:00 |
|
Seth Alves
|
e7c6ee597a
|
sync
|
2015-04-24 14:36:05 -07:00 |
|
Seth Alves
|
ea250c037a
|
sync
|
2015-04-24 14:27:32 -07:00 |
|
Seth Alves
|
6b53fefebe
|
sync
|
2015-04-24 14:21:59 -07:00 |
|
Seth Alves
|
fea8d84618
|
sync
|
2015-04-24 14:09:10 -07:00 |
|
Seth Alves
|
ad85837b5a
|
sync
|
2015-04-24 13:44:34 -07:00 |
|
Seth Alves
|
902e84c711
|
sync
|
2015-04-24 13:10:38 -07:00 |
|
Seth Alves
|
a27f8f3f10
|
sync
|
2015-04-24 11:28:44 -07:00 |
|
Seth Alves
|
926694517f
|
sync
|
2015-04-24 11:07:45 -07:00 |
|
Seth Alves
|
b40e78311b
|
disable hack to notice that the server is sending the same thing repeatedly
|
2015-04-24 11:00:06 -07:00 |
|
Seth Alves
|
1b84be6e10
|
attempting to have visual indicator of simulatorID
|
2015-04-24 10:55:43 -07:00 |
|
Seth Alves
|
6fdbce9ee3
|
oops
|
2015-04-24 09:29:57 -07:00 |
|
Seth Alves
|
c2422c2382
|
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
|
2015-04-24 09:29:26 -07:00 |
|
Seth Alves
|
6d151ee3ed
|
try a different way of identifying when to claim simulation ownership of a moving entity
|
2015-04-24 09:29:05 -07:00 |
|
Brad Hefta-Gaub
|
22ff2ba1b8
|
Merge pull request #4687 from Atlante45/zone_shape_edit_js
Zone ShapeType/CompoundShapeURL in edit.js
|
2015-04-24 09:08:56 -07:00 |
|
Atlante45
|
a26d9ef353
|
Fix ShapeType/String conversion
|
2015-04-24 16:49:18 +02:00 |
|
Atlante45
|
fff8b99d10
|
Fix keylight color
Was an integer division producing a float
|
2015-04-24 15:31:25 +02:00 |
|
Seth Alves
|
cf0499e671
|
various physics-related experiments
|
2015-04-23 21:07:04 -07:00 |
|
Andrew Meadows
|
0daaf20f01
|
Merge pull request #4675 from sethalves/detect-ballistic
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
|
2015-04-23 14:19:51 -07:00 |
|
ZappoMan
|
5dddca37ca
|
fix default shape of zones
|
2015-04-23 13:44:39 -07:00 |
|
Seth Alves
|
bc65616bb3
|
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
|
2015-04-23 13:09:22 -07:00 |
|
Brad Hefta-Gaub
|
ad7293d4ad
|
Merge pull request #4679 from jherico/offscreen
Fix a couple of bugs with the new offscreen UI
|
2015-04-23 12:45:51 -07:00 |
|
Atlante45
|
0b1d4fb1d6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
|
2015-04-23 21:16:11 +02:00 |
|
Brad Hefta-Gaub
|
945433be28
|
Merge pull request #4678 from sethalves/fix-pile-at-origin
don't pile things up at the origin during a load
|
2015-04-23 11:40:46 -07:00 |
|
Brad Davis
|
d0af5580c8
|
Fix mouse wheel and clickthrough bugs in offscreen UI
|
2015-04-23 10:28:03 -07:00 |
|
Atlante45
|
b776ea8110
|
Make ::contains() back into a const
|
2015-04-23 19:15:06 +02:00 |
|
Atlante45
|
b340cd06bf
|
Fix volume formula for capsules
|
2015-04-23 19:14:07 +02:00 |
|
Seth Alves
|
c21e06e7a7
|
don't pile things up at the origin during a load
|
2015-04-23 10:08:59 -07:00 |
|
Seth Alves
|
2ca592de8b
|
fix logic with infectious simulation ownership
|
2015-04-23 10:02:29 -07:00 |
|
Atlante45
|
83490051d9
|
Move shape related contains() to ShapeInfo
|
2015-04-23 18:55:20 +02:00 |
|
Ryan Huffman
|
e0d4a0b1e1
|
Add functionality to turn zone picking off
|
2015-04-23 09:36:41 -07:00 |
|
Seth Alves
|
10e5378396
|
fix mangled if
|
2015-04-23 09:13:18 -07:00 |
|
Atlante45
|
51d99da29f
|
Magic number
|
2015-04-23 17:50:26 +02:00 |
|
Atlante45
|
f494f86ee5
|
Handle registration point in transforms
|
2015-04-23 17:48:29 +02:00 |
|
Atlante45
|
bda72025af
|
Check mesh extend before going through triangles
|
2015-04-23 16:40:40 +02:00 |
|
Brad Hefta-Gaub
|
82d3302d1b
|
Merge pull request #4644 from jherico/offscreen
Working on new-UI implementations of address bar and login
|
2015-04-23 07:17:45 -07:00 |
|
Atlante45
|
99fd590a90
|
Update compound shape geometry when async get
|
2015-04-23 16:05:06 +02:00 |
|
Atlante45
|
d18229d52d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
|
2015-04-23 15:58:57 +02:00 |
|
Atlante45
|
6be0910966
|
Fix contain for collision hulls
|
2015-04-23 15:58:18 +02:00 |
|
Atlante45
|
3a0b5f9d22
|
Register RenderableZoneEntityItem in EntityTreeRenderer
|
2015-04-23 15:34:03 +02:00 |
|
Atlante45
|
15482d6a57
|
Don't compute shape for zones
|
2015-04-23 15:21:51 +02:00 |
|
Atlante45
|
fb4d1d3557
|
Fix compoundShapeURL reseting shapeType
|
2015-04-23 14:24:20 +02:00 |
|
Atlante45
|
f117941c8d
|
Macro fixing
|
2015-04-23 13:25:14 +02:00 |
|
Atlante45
|
01f4f34911
|
Centralize contains standard cases
|
2015-04-23 13:04:59 +02:00 |
|
Atlante45
|
837a0d3ba8
|
rename collision model in edit.js
|
2015-04-23 12:13:52 +02:00 |
|
Atlante45
|
3ebe72f025
|
Fix read macro
|
2015-04-23 12:12:42 +02:00 |
|
Seth Alves
|
9e96026c52
|
move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState
|
2015-04-22 21:36:36 -07:00 |
|