Brad Davis
171b6d18d0
Merge branch 'master' into plugins
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2015-05-28 10:31:20 -07:00
Andrew Meadows
799a74baab
Merge pull request #4985 from jherico/hydra_hmd_fix
...
Fix mouse emulation picking and pointer positioning for the hydra
2015-05-28 08:16:44 -07:00
Brad Davis
e5bec42512
Fix mouse emulation picking and pointer positioning for the hydra
2015-05-27 23:36:00 -07:00
Andrew Meadows
4e073c77b3
Merge pull request #4978 from sethalves/fix-4973
...
recreate PR #4973 with some additional changes -- removed const keywo…
2015-05-27 21:11:28 -07:00
Andrew Meadows
c32ff497e8
Merge pull request #4982 from howard-stearns/unowned-object-sounds
...
Unowned object sounds
2015-05-27 21:07:49 -07:00
Seth Alves
6151a7cf1a
Merge pull request #4983 from AndrewMeadows/bispinor
...
fix for glitchy grabs and failure to take simulation ownership
2015-05-27 18:50:03 -07:00
Andrew Meadows
0a0eba8277
merge
2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c
Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix
...
Particle entities should avoid resetting simulation when setMaxParticles is called
2015-05-27 17:44:44 -07:00
Howard Stearns
05013a19f5
Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds
2015-05-27 16:28:29 -07:00
Howard Stearns
4fffe05b63
Play still sound for still objects and those just created in a script.
2015-05-27 16:25:11 -07:00
Brad Hefta-Gaub
5da3a9440e
Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples
...
[REQUIRES #4962 ] Remove global collision and update examples
2015-05-27 16:09:14 -07:00
Seth Alves
43dd8b3fb1
Merge pull request #4980 from ericrius1/pointer
...
Pointer
2015-05-27 15:37:24 -07:00
Eric Levin
07c8fb6c02
turned pointer and draw funcitonality off be default
2015-05-27 15:11:16 -07:00
Eric Levin
ca85401b77
added button so user can toggle pointer on/off
2015-05-27 15:08:52 -07:00
Seth Alves
1cdb36f7fb
Merge pull request #4974 from ctrlaltdavid/fix-c4351
...
Fix Windows C4351 build warning
2015-05-27 14:46:03 -07:00
Seth Alves
bfa0e9c234
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 14:44:23 -07:00
Seth Alves
968643a38c
Merge pull request #4977 from highfidelity/revert-4973-avatarInvokableFixes
...
Revert "removed const keyword from Q_INVOKABLE for avatar getter meth…
2015-05-27 14:21:24 -07:00
Seth Alves
ba0467aafe
Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"
2015-05-27 14:10:45 -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
Brad Davis
810db39233
Working on oculus rendering
2015-05-27 12:42:05 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -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
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -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
Brad Davis
e8868478d2
Merge branch 'plugins_pt3' into plugins
...
Conflicts:
CMakeLists.txt
2015-05-26 20:34:46 -07:00
Brad Davis
09085f1cd9
Working towards display plugins
2015-05-26 18:42:38 -07:00
Brad Davis
dd87707c7b
Merge remote-tracking branch 'upstream/master' into plugins
2015-05-26 18:36:12 -07:00
Brad Davis
b5e6b737c4
Working on display plugins
2015-05-26 17:32:41 -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
ae73e68f7b
Update header.
2015-05-26 13:27:37 -07:00
Howard Stearns
14990f29cb
Merge branch 'entity-events-in-normal-scripts' of https://github.com/howard-stearns/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:27 -07:00
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -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
