Seth Alves
|
b5bfbba759
|
only set simulationID on scripted entity creation if the entity has velocity or rotation
|
2015-04-14 10:17:54 -07:00 |
|
Seth Alves
|
d330319ed9
|
when a script creates and object, set the local Node as the simulation owner
|
2015-04-14 09:56:39 -07:00 |
|
Seth Alves
|
de2e5ae718
|
adjust logic for when to claim or release simulator status
|
2015-04-14 09:00:48 -07:00 |
|
Seth Alves
|
f7c0637952
|
oops
|
2015-04-13 16:51:05 -07:00 |
|
Seth Alves
|
05ef357854
|
debug prints
|
2015-04-13 16:47:06 -07:00 |
|
Seth Alves
|
cf6259c5d7
|
turn down debugging
|
2015-04-13 16:41:38 -07:00 |
|
Seth Alves
|
256a7f5198
|
try different login for deciding when to update/clear simulatorID
|
2015-04-13 16:37:44 -07:00 |
|
Seth Alves
|
4677324a87
|
try different login for deciding when to update/clear simulatorID
|
2015-04-13 16:30:16 -07:00 |
|
Seth Alves
|
a30e807051
|
get rid of unneeded updateSimulatorID, set changed simulator id in properties so it gets included in outgoing packet
|
2015-04-13 16:20:30 -07:00 |
|
Seth Alves
|
396f6b1987
|
mess with debugging prints
|
2015-04-13 15:22:54 -07:00 |
|
Seth Alves
|
9c2fec36fd
|
adjust debugging, try a different DIRTY flag
|
2015-04-13 12:52:31 -07:00 |
|
Seth Alves
|
f42a43e180
|
cause changes to _simulatorID to be broadcast
|
2015-04-13 12:39:40 -07:00 |
|
Seth Alves
|
eace91e833
|
if an entity is being moved and has no sim-id, set sim-id to local node-id. if it has a sim-id, and it's not the same as the local node's, don't broadcast the change
|
2015-04-13 12:25:44 -07:00 |
|
Seth Alves
|
e2af93db5f
|
some debugging
|
2015-04-13 11:38:30 -07:00 |
|
Seth Alves
|
f44f823649
|
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
|
2015-04-13 10:45:07 -07:00 |
|
Andrew Meadows
|
fe482b35ff
|
Merge pull request #4635 from sethalves/fix-extents-race
don't compute shape info until both render and collision geometries are ...
|
2015-04-13 10:19:06 -07:00 |
|
Seth Alves
|
8479f0d4c1
|
don't compute shape info until both render and collision geometries are fully loaded
|
2015-04-13 09:34:38 -07:00 |
|
Andrew Meadows
|
f969517ab0
|
Merge pull request #4633 from Atlante45/master
Fix ghost avatars
|
2015-04-13 08:45:01 -07:00 |
|
Andrew Meadows
|
0a5ae8e7e1
|
Merge pull request #4610 from thoys/20367
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
|
2015-04-13 08:42:39 -07:00 |
|
Clément Brisset
|
ccfb912b89
|
Merge pull request #4632 from ctrlaltdavid/fix-typo
Fix typo
|
2015-04-13 15:59:33 +02:00 |
|
Atlante45
|
809c7919aa
|
Fix ghost avatars
|
2015-04-13 15:57:36 +02:00 |
|
David Rowe
|
caaf090b87
|
Fix typo
|
2015-04-12 13:02:27 -07:00 |
|
Philip Rosedale
|
4ad5a6c138
|
Merge pull request #4630 from Atlante45/fix_quick_turn
Fix quick turn
|
2015-04-10 13:43:36 -07:00 |
|
Andrew Meadows
|
e9159304d2
|
Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol
Acceleration and owner in wire protocol
|
2015-04-10 09:07:47 -07:00 |
|
Atlante45
|
910e13edeb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_quick_turn
|
2015-04-10 17:51:32 +02:00 |
|
Atlante45
|
176f1beb08
|
Fix camera quick turn
|
2015-04-10 17:50:41 +02:00 |
|
Philip Rosedale
|
61e6c0461b
|
Merge pull request #4628 from huffman/fix-selection-error
Fix error in entity properties not showing selections
|
2015-04-09 20:52:21 -07:00 |
|
Ryan Huffman
|
5a9ee73476
|
Fix error in entity properties not showing selections
|
2015-04-09 20:10:02 -07:00 |
|
Philip Rosedale
|
d24264bd81
|
Merge pull request #4626 from sethalves/island
more changes to vhacd tool -- useful for generating hull for low-poly island
|
2015-04-09 15:34:48 -07:00 |
|
Andrew Meadows
|
f93ee340fc
|
Merge pull request #4627 from sethalves/no-upper-size-limit-for-collisions
don't keep large things out of physics engine
|
2015-04-09 15:14:39 -07:00 |
|
Seth Alves
|
4ada3fc9a4
|
don't keep large things out of physics engine
|
2015-04-09 15:12:51 -07:00 |
|
Thijs Wenker
|
cf403a7ad8
|
Merge branch 'master' of https://github.com/worklist/hifi into 20367
|
2015-04-09 23:47:20 +02:00 |
|
Thijs Wenker
|
0cb5ee5bd1
|
- Scripts JS object renamed to ScriptDiscoveryService.
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
|
2015-04-09 23:46:49 +02:00 |
|
Seth Alves
|
efa5c473d2
|
add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields
|
2015-04-09 14:29:17 -07:00 |
|
Clément Brisset
|
fea7a58774
|
Merge pull request #4605 from ericrius1/light
Updated lightcontroller.js logic to find the nearest light when user cli...
|
2015-04-09 22:49:22 +02:00 |
|
Philip Rosedale
|
eaec0a6ea7
|
Merge pull request #4625 from ctrlaltdavid/users-tweaks
Tweak users display to work better with variety of backgrounds
|
2015-04-09 13:34:21 -07:00 |
|
David Rowe
|
d6c15549e4
|
Tweak users display to work better with variety of backgrounds
|
2015-04-09 13:03:12 -07:00 |
|
Brad Davis
|
3d6cf82659
|
Merge pull request #4624 from ctrlaltdavid/memory-fixes
Replace try with nothrow
|
2015-04-09 12:30:44 -07:00 |
|
Andrew Meadows
|
0751de4304
|
Merge pull request #4618 from ctrlaltdavid/large-address-aware
Add /LARGEADDRESSAWARE linker flag for Windows builds
|
2015-04-09 11:18:06 -07:00 |
|
Eric Levin
|
396325629e
|
added back original light controller script
|
2015-04-09 10:43:34 -07:00 |
|
David Rowe
|
ae3d606e95
|
Replace try with nothrow
|
2015-04-09 10:01:31 -07:00 |
|
Seth Alves
|
66ea6f4eb4
|
Merge branch 'master' of github.com:highfidelity/hifi into island
|
2015-04-09 09:59:00 -07:00 |
|
Clément Brisset
|
59a5fac2f1
|
Merge pull request #4619 from ctrlaltdavid/memory-fixes
Memory fixes
|
2015-04-09 18:51:02 +02:00 |
|
Eric Levin
|
c0e7cd1f6a
|
deleted unnecessary line with typo
|
2015-04-09 09:50:12 -07:00 |
|
samcake
|
91d6046051
|
Merge pull request #4622 from jherico/starfield_hack_fix
Ensure blending is enabled during starfield rendering
|
2015-04-09 09:45:14 -07:00 |
|
Brad Davis
|
21dd87c11c
|
Merge pull request #4620 from Atlante45/remove_url_extra_whitespace
Trim entity properties set from JS that are strings
|
2015-04-09 09:29:46 -07:00 |
|
Seth Alves
|
b472edbebb
|
remove debug print for something that no longer exists
|
2015-04-09 09:26:14 -07:00 |
|
Seth Alves
|
73a1265624
|
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
|
2015-04-09 09:21:06 -07:00 |
|
Brad Davis
|
5efb960645
|
Ensure blending is enabled during starfield rendering
|
2015-04-09 09:18:53 -07:00 |
|
David Rowe
|
b2dd53ac43
|
Coding standard
|
2015-04-09 08:37:24 -07:00 |
|