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 |
|
Andrew Meadows
|
abb40ca080
|
cleanup: split stats dump out of stepSimulation
|
2015-04-14 09:00:36 -07:00 |
|
Sam Gateau
|
c34c5f6075
|
adding the Fremabuffer to be used for shadows and main rendering
|
2015-04-14 08:47:52 -07:00 |
|
David Rowe
|
f509d08378
|
Handle DDE already running
|
2015-04-13 23:12:13 -07:00 |
|
David Rowe
|
b7f7cebb80
|
Handle DDE stopping unexpectedly
|
2015-04-13 22:41:17 -07:00 |
|
David Rowe
|
3b6a35c38f
|
Merge branch 'master' into 20447
|
2015-04-13 17:22:34 -07:00 |
|
David Rowe
|
13c038879d
|
Don't repeat constant values
|
2015-04-13 17:13:03 -07:00 |
|
David Rowe
|
2c4f049851
|
Change OSX DDE program path per build system requirements
|
2015-04-13 17:11:27 -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 |
|
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 |
|