Howard Stearns
|
c9658b2c13
|
Merge pull request #5354 from PhilipRosedale/master
Sample script flockOfBirds.js with sounds and flocking behavior
|
2015-07-17 13:15:08 -05:00 |
|
Philip Rosedale
|
ee435d9732
|
remove comment
|
2015-07-17 09:43:33 -07:00 |
|
Philip Rosedale
|
689b0e2571
|
Improve to run correctly on startup as AC
|
2015-07-17 09:41:48 -07:00 |
|
Philip Rosedale
|
db219905f3
|
re-use audio injectors, don't check if isPlaying immediately after starting play out
|
2015-07-17 00:30:31 -07:00 |
|
Philip Rosedale
|
5c29eb97ef
|
remove debug
|
2015-07-16 23:32:40 -07:00 |
|
Philip Rosedale
|
cf9365e616
|
Add new sample script with flocking
|
2015-07-16 22:46:41 -07:00 |
|
Philip Rosedale
|
62fca613a6
|
Merge pull request #5345 from huffman/fix-edit-highlight
Fix bug where edit.js highlights an object after being turned off
|
2015-07-16 11:34:01 -07:00 |
|
Ryan Huffman
|
cf0940a65d
|
Fix edit.js highlighting an object after being turned off
|
2015-07-16 11:07:01 -07:00 |
|
Seth Alves
|
934dcf4a8e
|
Merge pull request #5335 from thoys/chess-fix
Fixes chess game (pieces were dieing as soon as you dropped them)
|
2015-07-15 16:31:11 -07:00 |
|
Andrew Meadows
|
a444d6a2a2
|
remove hungarian notation
|
2015-07-15 13:19:59 -07:00 |
|
Thijs Wenker
|
c24c6ad39f
|
Fixes chess game (pieces were dieing as soon as you dropped them)
|
2015-07-15 19:56:01 +02:00 |
|
Seth Alves
|
9b37b83eb6
|
Merge pull request #5320 from AndrewMeadows/barium
fix grab.js when using the spring action
|
2015-07-14 11:02:42 -07:00 |
|
Howard Stearns
|
c49851cf03
|
Update sword script for current controller/physics behavior.
|
2015-07-14 09:33:08 -07:00 |
|
Andrew Meadows
|
69db9aa01a
|
fix grab transitions between vert and horiz planes
|
2015-07-14 09:24:37 -07:00 |
|
Seth Alves
|
d44bb1a0d8
|
update javascript to use relative-to-entity line-point ends
|
2015-07-13 11:42:29 -07:00 |
|
Seth Alves
|
c56b2918a4
|
allow voxels.js to work on an empty voxel-space
|
2015-07-12 10:35:44 -07:00 |
|
Howard Stearns
|
c340d336dc
|
Functional sword script:
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
|
2015-07-10 15:43:56 -07:00 |
|
Brad Hefta-Gaub
|
33016e2797
|
Merge pull request #5293 from jherico/bart
More profiling ranges and updated performance testing scripts
|
2015-07-09 19:10:45 -07:00 |
|
Brad Davis
|
446f800aee
|
More profiling ranges and updated performance testing scripts
|
2015-07-09 15:43:30 -07:00 |
|
Seth Alves
|
fa06f50841
|
fix header comment
|
2015-07-09 15:34:03 -07:00 |
|
Seth Alves
|
d197bf2a85
|
use palm rotation data in hold action
|
2015-07-09 12:18:32 -07:00 |
|
Philip Rosedale
|
542a5f100a
|
Merge pull request #5280 from BingShearer/airhockey
Air Hockey UI Fix
|
2015-07-09 10:04:21 -07:00 |
|
Howard Stearns
|
c8da325213
|
Fudge the offset so that operates only when using the mouse.
|
2015-07-08 16:59:54 -07:00 |
|
Bing Shearer
|
ba4049754a
|
Restored indentatioN
|
2015-07-08 16:53:55 -07:00 |
|
Bing Shearer
|
6080ec4509
|
Air Hockey UI now follows window border
|
2015-07-08 16:29:43 -07:00 |
|
Howard Stearns
|
6813a3afe1
|
Sword:
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
|
2015-07-08 15:27:45 -07:00 |
|
Howard Stearns
|
ef4620cabb
|
Add a button to create/toggle-away sword.
When brandished, display hit points (in overlay for this user).
|
2015-07-08 11:52:37 -07:00 |
|
Chris Collins
|
16e79cc85f
|
Remove lobby.js from the default scripts
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
|
2015-07-08 11:17:03 -07:00 |
|
Howard Stearns
|
11e52c8ae0
|
Baseline versions of fight club scripts.
|
2015-07-07 14:41:03 -07:00 |
|
Brad Hefta-Gaub
|
96fecd093d
|
Merge pull request #5237 from samcake/yellow
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
|
2015-07-06 15:41:58 -07:00 |
|
samcake
|
a8ddc71946
|
Merge pull request #5262 from bwent/cookies
Added checkbox functionality, double-click to reset panel
|
2015-07-06 15:09:16 -07:00 |
|
bwent
|
8b4398cd5a
|
Update cookies.js
|
2015-07-06 15:03:21 -07:00 |
|
bwent
|
2bdd2b8c2c
|
Update cookies.js
|
2015-07-06 15:02:51 -07:00 |
|
bwent
|
5d91f1be83
|
Removed header comments
|
2015-07-06 13:26:16 -07:00 |
|
bwent
|
93fbfcbff7
|
Added checkbox functionality, double-click to reset panel
|
2015-07-06 12:09:08 -07:00 |
|
samcake
|
f9562bedd9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-02 18:14:45 -07:00 |
|
Stephen Birarda
|
812b18c74e
|
Merge pull request #5205 from SeijiEmery/unit-tests
Unit tests
|
2015-07-02 20:58:09 -04:00 |
|
samcake
|
0c55130548
|
maybe i have solved the passing of the status
|
2015-07-02 17:31:29 -07:00 |
|
Seiji Emery
|
7ba03418fc
|
PR Fixes
|
2015-07-02 17:24:03 -07:00 |
|
Sam Gateau
|
8d8a902328
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-02 15:06:32 -07:00 |
|
Brad Hefta-Gaub
|
2a03f62bf2
|
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
Actions over wire and improved simulation ownership
|
2015-07-02 14:57:27 -07:00 |
|
Seth Alves
|
246861221c
|
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
|
2015-07-01 20:17:21 -07:00 |
|
Sam Gateau
|
d019ef4373
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-01 18:12:11 -07:00 |
|
Sam Gateau
|
e8b11f1198
|
Exposing the display Item Status to js to turn it on/off
|
2015-07-01 17:27:41 -07:00 |
|
Brad Davis
|
566842389b
|
Animation performance test script
|
2015-07-01 17:04:48 -07:00 |
|
Brad Hefta-Gaub
|
8ec3f7ea46
|
Merge pull request #5228 from DaveDubUK/walk-1.25
walk.js disable audio by default
|
2015-07-01 13:19:45 -07:00 |
|
Clément Brisset
|
52d1ae18cc
|
Merge pull request #5233 from SamGondelman/cameraMode
correct menu shortcut for mouselook
|
2015-07-01 11:15:31 -07:00 |
|
Seth Alves
|
33d9dc40f5
|
name stick
|
2015-06-29 16:08:50 -07:00 |
|
Seth Alves
|
2e5b25b5d8
|
include timescale in wire protocol ../../interface/src/avatar/AvatarActionHold.cpp
|
2015-06-29 14:34:26 -07:00 |
|
Sam Gondelman
|
0bf4c9dda2
|
correct menu shortcut for mouselook
|
2015-06-29 09:58:35 -07:00 |
|