Andrew Meadows
|
aba539928d
|
fix grab glitches and failure to own simulation
|
2015-05-27 18:05:59 -07:00 |
|
Seth Alves
|
75a1d43bce
|
Merge pull request #4973 from ericrius1/avatarInvokableFixes
removed const keyword from Q_INVOKABLE for avatar getter methods such…
|
2015-05-27 13:58:58 -07:00 |
|
Seth Alves
|
29cb5ed126
|
Merge pull request #4967 from ericrius1/pointer
modified pointer script to allow users to draw on surfaces
|
2015-05-27 13:56:17 -07:00 |
|
Seth Alves
|
e016bc42a4
|
Merge pull request #4968 from ericrius1/blockWorld
added blockWorld script to generate floor of tiles and drop jenga blo…
|
2015-05-27 13:56:06 -07:00 |
|
Eric Levin
|
eb0f35e041
|
removed const keyword from qinvokables for avatar getter methods such as getVelocity
|
2015-05-27 11:44:37 -07:00 |
|
Howard Stearns
|
380723d1c5
|
Merge pull request #4970 from AndrewMeadows/thermonuclear
rewritten MassProperties with complete unit tests
|
2015-05-27 10:42:17 -07:00 |
|
Brad Hefta-Gaub
|
afb09e81a6
|
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
Entity events in normal scripts
|
2015-05-27 09:24:50 -07:00 |
|
andrew
|
2a6955ce12
|
fix windows build
|
2015-05-27 09:14:11 -07:00 |
|
Andrew Meadows
|
39d8244255
|
use highfideltiy style for class data member names
|
2015-05-26 22:59:29 -07:00 |
|
Andrew Meadows
|
708203089c
|
replace tabs with spaces
|
2015-05-26 22:53:57 -07:00 |
|
Andrew Meadows
|
efbb9b0238
|
rewritten MassProperties with complete unit tests
|
2015-05-26 22:48:45 -07:00 |
|
Eric Levin
|
3fb5476968
|
added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor
|
2015-05-26 16:46:01 -07:00 |
|
Eric Levin
|
579c62420d
|
added header to pointer script
|
2015-05-26 16:43:34 -07:00 |
|
Eric Levin
|
7194d4a4da
|
modified pointer script to allow users to draw on surfaces
|
2015-05-26 16:40:47 -07:00 |
|
Stephen Birarda
|
857552ae0b
|
don't hold back link event for account connect
|
2015-05-26 15:16:23 -07:00 |
|
Andrew Meadows
|
16e5710325
|
Merge pull request #4954 from ZappoMan/entitysmartpointers
EnitityItem smart pointers
|
2015-05-26 14:05:03 -07:00 |
|
Howard Stearns
|
3a7a290094
|
Uglify conditional returns. :-)
|
2015-05-26 11:38:36 -07:00 |
|
Howard Stearns
|
5608892a15
|
Remove obsolete comment.
|
2015-05-26 11:16:11 -07:00 |
|
Howard Stearns
|
bbdf9f1d9f
|
Remove changingEntityID.
|
2015-05-26 11:14:23 -07:00 |
|
Seth Alves
|
92c55d69ba
|
Merge pull request #4944 from AndrewMeadows/bispinor
avatar-avatar collisions work again
|
2015-05-26 10:36:54 -07:00 |
|
ZappoMan
|
c4f96b09a2
|
sam's feedback on shared pointers in master
|
2015-05-26 09:55:28 -07:00 |
|
ZappoMan
|
c92e7bed87
|
andrews CR feedback
|
2015-05-26 09:44:02 -07:00 |
|
Howard Stearns
|
069e6237cc
|
Noop change with more declarations, in hopes of convincing MSVS how lambdas work.
(Hey, it's worth a try...)
|
2015-05-25 16:52:14 -07:00 |
|
samcake
|
ffca6a6502
|
Merge pull request #4935 from sethalves/sam-model-fixes
fixes Sam made in my branch while trying to get a mesh to render
|
2015-05-25 16:39:25 -07:00 |
|
Howard Stearns
|
1b134d60d5
|
Fix typo that messed up the otherEntity for collisions.
|
2015-05-25 15:46:55 -07:00 |
|
Howard Stearns
|
599886079d
|
Restore blank line for minimum diff.
|
2015-05-25 11:33:12 -07:00 |
|
Howard Stearns
|
4266a99d78
|
Put the javascript methods on Script, not Entities, and other minimum-diff cleanup.
|
2015-05-25 11:28:33 -07:00 |
|
Howard Stearns
|
2b12f0bcd0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-events-in-normal-scripts
|
2015-05-25 08:47:14 -07:00 |
|
Brad Hefta-Gaub
|
c141f41cee
|
Merge pull request #4960 from Atlante45/undef_ref
Fix entityProperties.html undefined ref
|
2015-05-24 12:41:11 -07:00 |
|
Howard Stearns
|
a0d09c0a6d
|
Mulitple independent handlers for same entity/event.
|
2015-05-24 11:48:11 -07:00 |
|
Atlante45
|
18812ab25f
|
Fix entityProperties.html undefined ref
|
2015-05-24 19:21:04 +02:00 |
|
Howard Stearns
|
b884d3cf90
|
Handle all the signals.
|
2015-05-24 09:57:12 -07:00 |
|
Howard Stearns
|
1dd2b7275e
|
Simpler and more uniform version that handles all the standard entity-script events.
|
2015-05-23 18:11:05 -07:00 |
|
Howard Stearns
|
277f5ef3a4
|
Working experimental first version.
|
2015-05-23 13:35:35 -07:00 |
|
Brad Hefta-Gaub
|
8c0bf19536
|
Merge pull request #4956 from Triplelexx/particle-entityProperties
expose particle properties for editing
|
2015-05-23 12:02:16 -07:00 |
|
Brad Hefta-Gaub
|
4ffe573d0d
|
Merge pull request #4957 from Atlante45/master
Fix incorrect scale constants
|
2015-05-23 11:47:43 -07:00 |
|
Atlante45
|
9e121aa387
|
Fix incorrect scale constants
|
2015-05-23 20:13:14 +02:00 |
|
Triplelexx
|
9a29489784
|
expose particle properties for editing
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
|
2015-05-23 17:57:25 +01:00 |
|
Brad Hefta-Gaub
|
225021671a
|
Merge pull request #4950 from ericrius1/particleScriptName
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
|
2015-05-22 22:17:39 -07:00 |
|
Brad Hefta-Gaub
|
d7b2ca64cd
|
Merge pull request #4949 from sethalves/octree-send-thread-adjustments
entity-server sends initial planky more reliably
|
2015-05-22 22:17:17 -07:00 |
|
ZappoMan
|
76c5bd1ab7
|
verify that entityitem cleanup is happening correctly
|
2015-05-22 22:01:25 -07:00 |
|
ZappoMan
|
31021c1dfd
|
more work on smart pointers
|
2015-05-22 21:46:05 -07:00 |
|
ZappoMan
|
9fa9942861
|
more work on smart pointers
|
2015-05-22 21:45:57 -07:00 |
|
ZappoMan
|
8b78fc4190
|
EnitityItem smart pointers
|
2015-05-22 17:57:50 -07:00 |
|
Eric Levin
|
71c0aa4913
|
renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does
|
2015-05-22 15:33:38 -07:00 |
|
Seth Alves
|
32cc0eacfc
|
improve a debug print
|
2015-05-22 15:21:26 -07:00 |
|
Seth Alves
|
53fe41ef4d
|
improve a debug print
|
2015-05-22 15:11:56 -07:00 |
|
Seth Alves
|
945a84d24f
|
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
|
2015-05-22 15:01:43 -07:00 |
|
Andrew Meadows
|
603528eede
|
Merge pull request #4945 from ctrlaltdavid/fix-float-warnings
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 13:09:21 -07:00 |
|
David Rowe
|
a01830f8f8
|
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 12:32:02 -07:00 |
|