Commit graph

24246 commits

Author SHA1 Message Date
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
Triplelexx
722ac46668 Merge branch 'master' into myavatar-targetvelocity 2015-04-14 00:11:10 +01:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
2015-04-13 23:57:08 +01:00
Seth Alves
396f6b1987 mess with debugging prints 2015-04-13 15:22:54 -07:00
Andrew Meadows
86f89a1d6f fix bug where fly speed is limited to walk speed 2015-04-13 13:23:15 -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
Sam Gateau
534cbdfab0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-13 12:22:30 -07:00
Sam Gateau
51ce3129b9 connecting the dots for a framebuffer GLBackend, need to be tested 2015-04-13 12:22:08 -07:00
Seth Alves
e2af93db5f some debugging 2015-04-13 11:38:30 -07:00
Sam Gateau
05689c0413 Bringin the Framebuffer to GLBackend and refining the interface 2015-04-13 11:13: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
Sam Gateau
69484ad00b Creating the Framebuffer class and the companion Swapbuffer 2015-04-12 17:36:45 -07: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
David Rowe
d057573825 Set raindrops spinning 2015-04-09 19:38:15 -07:00
David Rowe
54c0aeaa03 Work around entities not always getting velocity set at creation 2015-04-09 18:57:58 -07:00
David Rowe
10ac6bc9ca Don't render overlay unless debug 2015-04-09 18:17:45 -07:00
David Rowe
54980f46a9 Set raindrops falling 2015-04-09 17:29:14 -07:00
David Rowe
66ea84977a Create raindrops at specified rate 2015-04-09 16:18:10 -07:00
David Rowe
00f42c1e6c Move to acScripts 2015-04-09 15:52:59 -07:00
David Rowe
e4e372b2a3 Create a raindrop with a lifetime 2015-04-09 15:51:19 -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
David Rowe
55b92f7d1e Circle of origin for rain 2015-04-09 15:18:31 -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