Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 02:20:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36161 commits 72 branches 59 tags 1.2 GiB
Commit graph

115 commits

Author SHA1 Message Date
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Brad Hefta-Gaub
27d28900a4 Merge pull request #6580 from imgntn/parented_flashlight 
Update Flashlight to use Parenting
 2015-12-10 07:43:10 -08:00
Atlante45
17daff920c Fix all entities using relative grab pos/rot 2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a Fix bow offsets 2015-12-09 14:25:18 -08:00
Thijs Wenker
4a18b5ffe4 small update to have the bow shoot arrows with the creatorSessionUUID in the userData 2015-12-08 20:29:18 +01:00
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20:06 -08:00
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
James B. Pollack
e67f372bcf make pistol shoot differently and not alter controller mappings 2015-12-01 18:24:13 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
e6763c2208 Update bow's relative position 2015-12-01 15:03:25 -08:00
James B. Pollack
fb8316ff12 reduce pistol vol 2015-12-01 13:15:08 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes 
Toybox Tweaking
 2015-12-01 13:07:10 -08:00
James B. Pollack
b787e71587 Update doll.js 2015-12-01 13:06:30 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
ericrius1
90595949f1 moved exterminator game out of dry lake 2015-11-30 18:14:57 -08:00
ericrius1
8992f6bb44 moved pistol to toybox 2015-11-30 17:57:01 -08:00
James B. Pollack
7c12379ada fix release hand message 2015-11-30 17:00:40 -08:00
James Pollack
0625d4f4c2 remove debugging string 2015-11-28 23:40:58 -08:00
James Pollack
017ffb8f2e change way messages get sent to the hand disabler 2015-11-28 22:54:31 -08:00
James B. Pollack
b6a165d3ef Merge branch 'master' into bow 2015-11-27 11:41:21 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
James B. Pollack
50c1786e9b trigger changes and message debugging 2015-11-24 12:46:01 -08:00
James B. Pollack
2add609387 use new thingo 2015-11-24 12:12:01 -08:00
James B. Pollack
13e1042bfa use messages instead of hidden entities to disable beams 2015-11-24 10:37:08 -08:00
James B. Pollack
fd26427390 add pullback / pushfwd 2015-11-24 10:23:29 -08:00
James B. Pollack
0fd389b02f remove arrowTest 2015-11-23 12:53:58 -08:00
James B. Pollack
c22a07bba7 bow collisions, etc 2015-11-23 12:36:39 -08:00
James B. Pollack
aa2450d755 cleanup, debugging script 2015-11-23 11:15:36 -08:00
James B. Pollack
b6d0be0090 Merge branch 'master' into bow 2015-11-23 10:03:15 -08:00
James B. Pollack
8e81c3252a cleanup and mostly? working 2015-11-22 22:24:42 -08:00
James B. Pollack
aa832311f5 add beam disabler 2015-11-22 22:12:43 -08:00
James B. Pollack
3f4dee80d9 more cleanup 2015-11-21 02:32:54 -08:00
James B. Pollack
945243306b cleanup 2015-11-21 01:47:20 -08:00
James B. Pollack
f56c4ff575 still debugging 2015-11-20 21:14:28 -08:00
James B. Pollack
b2dd900cb2 rotate correctly 2015-11-20 18:12:06 -08:00
James B. Pollack
a65b3b9aaa collisions 2015-11-20 17:12:54 -08:00
James B. Pollack
06322b1d6b dont update prenotch for everyone 2015-11-20 16:30:05 -08:00
James B. Pollack
c6be37f63f lifetime 2015-11-20 16:10:39 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
James B. Pollack
c98bfca359 collisions 2015-11-20 15:41:50 -08:00
James B. Pollack
4efe31f158 work 2015-11-20 15:15:57 -08:00
James B. Pollack
49e815f3d6 Merge remote-tracking branch 'upstream/master' into bow 2015-11-20 14:33:26 -08:00
James B. Pollack
8a65c7a48f draw strings sooner, arrow force squared, disable grab on arrow 2015-11-20 10:26:41 -08:00
James B. Pollack
225909f8a1 play notch sound at right time 2015-11-19 19:25:51 -08:00
James B. Pollack
ea59e0887d more bow features and debug prep 2015-11-19 19:22:54 -08:00
James B. Pollack
670cca4eb7 fix sounds 2015-11-18 16:35:28 -08:00