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

35514 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
f06b5b05b3 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-01 15:14:58 -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
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
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
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
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
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
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
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
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
ericrius1
880aed0e6b fixed missing brace 2015-11-30 18:29:20 -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
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
ericrius1
efa2f44c90 Merge remote-tracking branch 'highfidelity/master' 2015-11-30 18:16:39 -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
ea831238e6 Merge pull request #6504 from imgntn/bubblemaster 
Update master reset scripts for Toybox to have parity with bubble wand
 2015-11-30 17:36:40 -08:00
Atlante45
6903cd4d8f Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-30 17:19:39 -08:00
Stephen Birarda
52dc2cf746 change the assets file to json 2015-11-30 17:17:06 -08:00
Atlante45
52fb711656 Move baseballCrowd to correct directory 2015-11-30 17:06:09 -08:00
Stephen Birarda
cba09beff4 add pop sounds (which don't require attribution) 2015-11-30 17:02:30 -08:00
James B. Pollack
8b7cfde02a Merge pull request #6505 from imgntn/boww 
Fix release hand message for bow
 2015-11-30 17:02:08 -08:00
James B. Pollack
7c12379ada fix release hand message 2015-11-30 17:00:40 -08:00
Stephen Birarda
c451ede051 add crowd noises to assets yaml 2015-11-30 16:59:13 -08:00
Stephen Birarda
4a80e72d14 complete attribution for removed files 2015-11-30 16:48:05 -08:00
Stephen Birarda
f7537e3dc3 add initial version of asset description 2015-11-30 16:44:14 -08:00
Howard Stearns
6f50d91208 Merge pull request #6461 from hyperlogic/tony/remove-joint-states 
Refactor of Rig and MyAvatar animation JavaScript interface
 2015-11-30 16:28:15 -08:00
Ryan Huffman
6fe370c4ef Remove old comment in firework.js 2015-11-30 16:02:00 -08:00
Ryan Huffman
0ed249f0e7 Update script path include in firework.js 2015-11-30 16:01:53 -08:00
Stephen Birarda
1b1efe53d9 fix for two space indentation in createBatButton.js 2015-11-30 15:59:12 -08:00
Stephen Birarda
c3f3639374 more spacing adjustments in ScriptEngine.cpp 2015-11-30 15:57:10 -08:00
Stephen Birarda
733665d722 fix spacing in baseballCrowd.js 2015-11-30 15:53:42 -08:00