Commit graph

449 commits

Author SHA1 Message Date
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click
No more right-click-move editing in edit.js
2015-12-07 08:29:01 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Ryan Huffman
b122dad7ea Add begin and middle textures to InfiniteLine 2015-11-19 15:16:23 -08:00
Philip Rosedale
5b853ddf57 Merge pull request #6402 from sethalves/grab-equip
grab script bumper is an equip toggle
2015-11-17 20:15:26 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -08:00
Thijs Wenker
4c2c37acce Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-12 02:19:35 +01:00
Thijs Wenker
764af63ea9 remove Anchor entity from example and edit script, replace with invisible Box in example 2015-11-12 02:19:08 +01:00
Brad Hefta-Gaub
c4ad1d978b Merge pull request #6344 from imgntn/easystar
Adapt EasyStar A* Pathfinding Library and Add Example
2015-11-11 16:22:47 -08:00
Ryan Huffman
2a349620ee Fix walkSettings.js resolvePath calls 2015-11-10 11:37:59 -08:00
Ryan Huffman
e7e6c63c64 Fix edit.js resolvePath calls 2015-11-10 11:36:53 -08:00
Ryan Huffman
2ad4c5b9e2 Fix walkApi include paths 2015-11-10 09:38:40 -08:00
Ryan Huffman
29fd352169 Fix omniTool test module include path 2015-11-10 09:38:21 -08:00
Ryan Huffman
37d9d98594 Fix breakdance include paths 2015-11-10 09:37:53 -08:00
Ryan Huffman
53ca4c857d Fix relative include path in entityCameraTool.js 2015-11-10 08:52:37 -08:00
James B. Pollack
789f3231e1 easier bouncing 2015-11-09 19:18:19 -08:00
James B. Pollack
1ec70e8170 add physics to the ball and make it bounce 2015-11-09 19:10:11 -08:00
James B. Pollack
17814446ca Add example with entities, add tween.js 2015-11-09 17:11:09 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01:00
Eric Levin
8e039fe465 Merge pull request #6338 from imgntn/string_polyfills
Add More Methods to stringHelpers.js
2015-11-09 10:25:13 -08:00
Eric Levin
ceba1c4b02 Merge pull request #6340 from imgntn/usertiming
Adapt UserTiming library and Add Example
2015-11-09 10:25:04 -08:00
James B. Pollack
34d98cac5e Update usertiming.js 2015-11-06 22:12:03 -08:00
James B. Pollack
369eec2abd Update usertimingExample.js 2015-11-06 22:05:30 -08:00
James B. Pollack
4fbff5d667 Update usertimingExample.js 2015-11-06 21:39:53 -08:00
James B. Pollack
c4318bcbd3 add easystar lib 2015-11-06 17:38:53 -08:00
James B. Pollack
f478261ed0 cleanup 2015-11-06 16:21:53 -08:00
James B. Pollack
5893bfeb06 add user timing 2015-11-06 16:19:49 -08:00
James B. Pollack
f7d4a3821f add more methods 2015-11-06 15:42:56 -08:00
James B. Pollack
ced1a4899d promises 2015-11-06 15:10:23 -08:00
Thijs Wenker
de98a17ada - rename CameraEntityItem to AnchorEntityItem 2015-11-06 01:58:08 +01:00
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs
Add functional.js library
2015-11-02 11:10:19 -08:00
James B. Pollack
c67bfc8883 Merge pull request #6180 from huffman/line-js
Add js line library for drawing infinite poly lines
2015-10-30 17:47:31 -07:00
Ryan Huffman
77e0023b43 Fix lifetime bug with first PolyLine in InfiniteLine 2015-10-30 16:31:15 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Atlante45
1bebdc8e70 Fix scripts syntax errors 2015-10-27 12:11:27 -07:00
Ryan Huffman
2cd2af2b13 Add headers to line.js and lineExample.js 2015-10-27 09:49:52 -07:00
Ryan Huffman
983c551ce3 Clean up line.js and make lifetime settable 2015-10-27 09:13:16 -07:00
James B. Pollack
d78fe089f6 add mit license 2015-10-26 17:00:54 -07:00
Ryan Huffman
2abb6a2fd5 Clean up line.js 2015-10-26 16:45:58 -07:00
James B. Pollack
a1cd4a31cb fix typo 2015-10-26 16:41:03 -07:00
James B. Pollack
88a312f992 add functional js library... mmm, curry 2015-10-26 16:28:18 -07:00
Ryan Huffman
d6230fbed3 Remove trailing commas in line.js 2015-10-26 10:46:36 -07:00
Ryan Huffman
6b9b4d4e6e Add libraries/line.js 2015-10-26 10:44:39 -07:00
Brad Hefta-Gaub
4a19a14682 fix walkApi.js to detect hydra in official way 2015-10-23 17:53:34 -07:00
Brad Davis
56deef9d6e Moving omniTool to a route mapped input 2015-10-23 13:40:36 -07:00
Brad Davis
be148686a7 Fixing omnitool 2015-10-23 13:40:36 -07:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00