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

2713 commits

Author SHA1 Message Date
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
Philip Rosedale
f04291ef65 Merge pull request #5408 from thoys/20626 
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
 2015-07-24 07:47:30 -07:00
Bradley Austin Davis
901dd77f05 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-23 18:11:25 -04:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Ryan Huffman
c17a603714 Fix model entity not showing up in list on creation 2015-07-23 08:42:29 -07:00
Brad Davis
3407fd48a8 Merge pull request #5363 from PhilipRosedale/master 
Birds will die if abandoned, ability to fly with birds
 2015-07-22 14:13:27 -04:00
Philip Rosedale
b7a4acaf87 changed to use new Vec3.toPolar() function 2015-07-22 10:06:08 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
bwent
5a8106a049 fixes in edit.js UI 2015-07-21 13:15:24 -07:00
Philip Rosedale
6c51c9e950 added ability to follow/fly with the birds 2015-07-21 12:18:52 -07:00
bwent
89eed589e2 Add Vec3 function to convert vec3 to/from euler angles 2015-07-21 11:08:53 -07:00
Thijs Wenker
5d74858500 edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key 2015-07-21 17:01:54 +02:00
Anthony J. Thibault
17220542d8 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 
Conflicts:
	examples/example/games/sword.js
 2015-07-20 15:22:19 -07:00
SamGondelman
4d3b08b5e3 modified sword.js to work with vive controllers 2015-07-20 14:52:49 -07:00
Stephen Birarda
54f618a502 Merge pull request #5361 from huffman/users-setting 
Update users.js to persist isMinimized value
 2015-07-20 09:01:31 -07:00
Philip Rosedale
45a229494b fix to correctly add to lifetime (it is always full lifetime since starting) 2015-07-20 08:40:12 -07:00
samcake
9ee93eb4d7 Merge pull request #5358 from bwent/keyLightDirectionFix 
fix keyLightDirection to display in degrees in edit.js UI
 2015-07-19 14:25:59 -07:00
Philip Rosedale
32a30c4963 Merge pull request #5344 from ericrius1/newSword 
updated sword script so users can grab sword with hydra to adjust rel…
 2015-07-18 15:45:43 -07:00
Philip Rosedale
66d61dc587 Add lifetime so that abandoned birds eventually die 2015-07-18 13:34:14 -07:00
Ryan Huffman
5ae1af0d62 Update users.js to persist isMinimized value 2015-07-17 16:33:24 -07:00
bwent
5ba82faa4b keyLightDirection displays in degrees in edit.js UI 2015-07-17 13:52:00 -07:00
Howard Stearns
c9658b2c13 Merge pull request #5354 from PhilipRosedale/master 
Sample script flockOfBirds.js with sounds and flocking behavior
 2015-07-17 13:15:08 -05:00
Philip Rosedale
ee435d9732 remove comment 2015-07-17 09:43:33 -07:00
Philip Rosedale
689b0e2571 Improve to run correctly on startup as AC 2015-07-17 09:41:48 -07:00
Philip Rosedale
db219905f3 re-use audio injectors, don't check if isPlaying immediately after starting play out 2015-07-17 00:30:31 -07:00
Philip Rosedale
5c29eb97ef remove debug 2015-07-16 23:32:40 -07:00
Philip Rosedale
cf9365e616 Add new sample script with flocking 2015-07-16 22:46:41 -07:00
ericrius1
220b54e5f7 added reference to correct zombie game script 2015-07-16 18:30:24 -07:00
ericrius1
66154d20e0 deleted unnessary log message 2015-07-16 13:38:39 -07:00
ericrius1
f7108ccff8 modified collision-hull model to not include the handle. This prevents the sword handle from pushing the brandishing avatar around, while still letting the sword sit in said avatar's hand in a more aesthetically pleasing manner than floating off in space 2015-07-16 13:27:59 -07:00
Philip Rosedale
62fca613a6 Merge pull request #5345 from huffman/fix-edit-highlight 
Fix bug where edit.js highlights an object after being turned off
 2015-07-16 11:34:01 -07:00
ericrius1
adbd995695 updated sword script so users can grab sword with hydra to adjust relative rotation of sword 2015-07-16 11:18:37 -07:00
Ryan Huffman
cf0940a65d Fix edit.js highlighting an object after being turned off 2015-07-16 11:07:01 -07:00
Seth Alves
934dcf4a8e Merge pull request #5335 from thoys/chess-fix 
Fixes chess game (pieces were dieing as soon as you dropped them)
 2015-07-15 16:31:11 -07:00
Andrew Meadows
a444d6a2a2 remove hungarian notation 2015-07-15 13:19:59 -07:00
Thijs Wenker
c24c6ad39f Fixes chess game (pieces were dieing as soon as you dropped them) 2015-07-15 19:56:01 +02:00
Seth Alves
9b37b83eb6 Merge pull request #5320 from AndrewMeadows/barium 
fix grab.js when using the spring action
 2015-07-14 11:02:42 -07:00
Howard Stearns
c49851cf03 Update sword script for current controller/physics behavior. 2015-07-14 09:33:08 -07:00
Andrew Meadows
69db9aa01a fix grab transitions between vert and horiz planes 2015-07-14 09:24:37 -07:00
Seth Alves
d44bb1a0d8 update javascript to use relative-to-entity line-point ends 2015-07-13 11:42:29 -07:00
Seth Alves
c56b2918a4 allow voxels.js to work on an empty voxel-space 2015-07-12 10:35:44 -07:00
Howard Stearns
c340d336dc Functional sword script: 
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
 2015-07-10 15:43:56 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Seth Alves
fa06f50841 fix header comment 2015-07-09 15:34:03 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Philip Rosedale
542a5f100a Merge pull request #5280 from BingShearer/airhockey 
Air Hockey UI Fix
 2015-07-09 10:04:21 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00