Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 17:00:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34261 commits 76 branches 59 tags 1.2 GiB
Commit graph

3915 commits

Author SHA1 Message Date
Stephen Birarda
804db537bf volume changes for crowd, bat avatar suppression fix 2015-11-03 16:11:13 -08:00
Stephen Birarda
8c0592caba add semicolons to createBatButton script 2015-11-03 14:52:40 -08:00
Stephen Birarda
501b905e7a change script URL for bat to HTTP 2015-11-03 14:25:38 -08:00
Stephen Birarda
06dbe2693a fix for created bat properties 2015-11-03 14:21:52 -08:00
Atlante45
f4b5933af4 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:21:39 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
Atlante45
1928753dda Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 18:14:53 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
Ryan Huffman
91a1378889 Clean up foul/strike in pitching.js 2015-11-02 16:09:51 -08:00
Ryan Huffman
1b673a99c0 Fix updating of distance/high score 2015-11-02 15:59:55 -08:00
Ryan Huffman
3cbcc6494f Update bat.js to lazy load the pitching machine 2015-11-02 15:34:42 -08:00
Ryan Huffman
def8294b60 Fix pitching machine not starting when enabled 2015-11-02 15:28:18 -08:00
Ryan Huffman
8b6db3b6c0 Add shouldRenderLocally to bat.js and fix findEntities 2015-11-02 15:13:07 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Stephen Birarda
bbf5991f9a resolve conflicts on merge with huffman/baseball 2015-11-02 14:14:36 -08:00
Ryan Huffman
f4531759be Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-02 12:25:51 -08:00
Ryan Huffman
b8d90ab28e Replace pitching.js include with relative path 2015-11-02 12:12:54 -08:00
Ryan Huffman
3820adf3f6 Add bat.js 2015-11-02 12:12:21 -08:00
Ryan Huffman
72775a7af8 Clean up pitching.js so the pitching machine code is separate 2015-11-02 12:12:05 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs 
Add functional.js library
 2015-11-02 11:10:19 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek 
Adding peek support for endpoints
 2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07: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
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Ryan Huffman
77e0023b43 Fix lifetime bug with first PolyLine in InfiniteLine 2015-10-30 16:31:15 -07:00
Seth Alves
cf83ca22bb change how kinematic objects get data back to entity when an action is active 2015-10-30 15:30:54 -07:00
Atlante45
b0650cc2c1 Remove accidentally commited file 2015-10-30 14:37:06 -07:00
Atlante45
bc552c772b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-30 14:05:40 -07:00
Seth Alves
b102081f2f upon release, set velocity after returning entity to being dynamic 2015-10-30 11:35:51 -07:00
Clément Brisset
317674c89a Merge branch 'grab' of https://github.com/sethalves/hifi 2015-10-30 11:13:56 -07:00
Brad Hefta-Gaub
b5fd3424b8 Merge pull request #6245 from EdgarPironti/controllers 
Fixed controllerExample.js parse error
 2015-10-30 11:10:08 -07:00
EdgarPironti
f887bbd45c Fixed controllerExample parse error 2015-10-30 11:06:20 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
James B. Pollack
846310f9fb Merge pull request #6208 from ericrius1/closePaintModel 
Added to the whiteboard model, and some bug fixes
 2015-10-29 17:05:20 -07:00
ericrius1
6bdf66534f light tweak 2015-10-29 16:53:03 -07:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
ericrius1
b6b71e7e76 increased range and intensity of light 2015-10-29 16:40:50 -07:00
Ryan Huffman
03a082383f Convert billboard display to feet and cleanup trails earlier 2015-10-29 16:10:17 -07:00
Ryan Huffman
8a29f4fc61 Add distances and billboard display to pitching.js 2015-10-29 16:09:33 -07:00
Clément Brisset
e818028043 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-29 15:53:44 -07:00
Clément Brisset
0ea2ca589b Merge branch 'physics-ccd' of https://github.com/huffman/hifi 
Conflicts:
	examples/libraries/walkApi.js
	examples/toybox/flashlight/flashlight.js
	examples/walk.js
 2015-10-29 15:47:14 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00