Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 16:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34190 commits 75 branches 59 tags 1.2 GiB
Commit graph

3898 commits

Author SHA1 Message Date
Stephen Birarda
8cd41b9383 resolve conflicts on merge with huffman/baseball 2015-11-03 11:13:15 -08:00
Ryan Huffman
ccb25f4b63 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6 Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-03 11:10:14 -08:00
Atlante45
01bbd3665e Remove accidentally commited file 2015-11-03 11:06:21 -08:00
Atlante45
f2ff0b40f7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 11:06:19 -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
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
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
Stephen Birarda
d03a837263 resolve conflicts on merge with upstream master 2015-10-29 14:28:50 -07:00
ericrius1
020566b76a no deleting 2015-10-29 14:14:15 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
Ryan Huffman
a7517ff210 CP 2015-10-29 14:01:53 -07:00
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color 
Refactor the KeyLIght properties in their own group
 2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds 
Add Arcade Game Sound To Toybox
 2015-10-29 10:24:23 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
Stephen Birarda
2ecec2623c add a script for bat creation on button click 2015-10-28 17:03:25 -07:00