Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 15:07:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35966 commits 25 branches 0 tags 1.1 GiB
Commit graph

35966 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
97454ae446 Update handControllerGrab.js 2015-12-01 14:32:59 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers 
Personal lasers in handControllerGrab.js
 2015-12-01 13:29:05 -08:00
James B. Pollack
780f93cfdb Merge pull request #6516 from imgntn/toytweaks 
Reduce pistol volume
 2015-12-01 13:16:39 -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
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Anthony Thibault
dde971cb4f Merge pull request #6514 from howard-stearns/update-ScriptableAvatar 
Update ScriptableAvatar
 2015-12-01 12:44:04 -08:00
samcake
b6530b8b30 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-01 12:37:13 -08:00
samcake
ff3ae85245 Separating the ui to get the url from the actual loading to maybe avoid playbackMaster.js crash? 2015-12-01 12:36:49 -08:00
Howard Stearns
455927204e Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix 
Avatar Sim Rate Display fix
 2015-12-01 12:09:07 -08:00
Seth Alves
b8d800f5b8 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-01 11:59:10 -08:00
Howard Stearns
8f7f3eed6e ScriptAvatar now gets the .fbx joints: 
Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx.
  Because models now really need the preRotation, which is only in the avatar .fbx.
 2015-12-01 11:52:42 -08:00
Howard Stearns
ef32853d46 When AvatarData parses the .fst, store the (merged) .fbx filename. 
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
 2015-12-01 11:51:22 -08:00
Howard Stearns
6e15ae9d7d Update robot agent script to randomly select among all HiFi avatars, identified by name, and with a random turn from front. 2015-12-01 11:49:17 -08:00
Atlante45
70dd8ec19a Remove left/right relative pos/rot from c++ 2015-12-01 11:44:42 -08:00
Philip Rosedale
8e40889068 Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion 
possible fix for observers not seeing a held entity moving
 2015-12-01 11:41:08 -08:00
James B. Pollack
de100e5264 Merge pull request #6401 from ericrius1/rats 
Created exterminatorGame, which allows users to spawn a pistol and shoot rats
 2015-12-01 11:39:05 -08:00
Ryan Huffman
4d84362757 Fix ScriptEngine setting _isFinished when it shouldn't 2015-12-01 11:30:56 -08:00
James B. Pollack
77d66de7f3 Update masterReset.js 
add 0 before numbers
 2015-12-01 11:19:42 -08:00
James B. Pollack
0e4aaaceeb Update hiddenEntityReset.js 
add 0 before numbers
 2015-12-01 11:19:15 -08:00
Andrew Meadows
ab6367ff4e remove debug option for disabling physics updates 2015-12-01 11:13:01 -08:00
Stephen Birarda
557ab315d9 make resettable stats atomic 2015-12-01 10:51:52 -08:00
Seth Alves
7f95e1eec6 make sure observed held objects are active in bullet, disable equip spring action 2015-12-01 10:49:07 -08:00
Anthony J. Thibault
71f1be2b38 Avatar Sim Rate Display fix 
Division by zero on first update was causing the displayed
avatar simulation rate to be incorrect.
 2015-12-01 10:46:04 -08:00
Stephen Birarda
27227181f0 fix for infinite loop in OctreeeInboundPacketProcessor 2015-12-01 10:45:19 -08:00
Leonardo Murillo
ca8cd13c48 Checkpoint 2015-12-01 12:32:31 -06:00
Atlante45
db0083ab83 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-12-01 10:25:07 -08:00
Stephen Birarda
05862eff00 add fire sounds to assets JSON 2015-12-01 10:22:42 -08:00
Seth Alves
2c886658ba Merge pull request #6507 from birarda/es-deadlock 
don't persist the octree if it never loaded
 2015-12-01 10:11:53 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
Stephen Birarda
7dbf29821a don't persist the octree if it never loaded 2015-12-01 10:00:25 -08:00
Leonardo Murillo
418b9c8fea Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-01 11:57:38 -06:00
Seth Alves
11f18c3ada also make sure the holder doesn't end up with a static-in-bullet held object 2015-12-01 09:52:51 -08:00
ericrius1
d80bfc0af6 more gravity for spraycan 2015-12-01 09:41:04 -08:00
Ken Cooke
a725c8b12e Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-01 09:12:24 -08:00
Ken Cooke
e25e6b5003 Test script with sliders for all reverb parameters 2015-12-01 06:44:56 -08:00
Sam Cake
921cd94c07 Finally a more stable api and playback use case 2015-12-01 00:15:12 -08:00
Seth Alves
e62eb08301 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 21:38:02 -08:00
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
samcake
196f7e71c4 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-30 18:35:04 -08:00
samcake
1b197987ec MOnday spent on improving the Agent/Clint coordination, but still bugs 2015-11-30 18:34:40 -08:00
ericrius1
880aed0e6b fixed missing brace 2015-11-30 18:29:20 -08:00
Atlante45
b64dfc7e99 Merge branch 'baseball' of github.com:Atlante45/hifi into baseball-test 2015-11-30 18:27:35 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Atlante45
d0e1ec3a86 Fix merge error 2015-11-30 18:26:04 -08:00
Atlante45
083205916f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-30 18:25:53 -08:00
Atlante45
4025504749 Fix merge error 2015-11-30 18:21:14 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00