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

34549 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
7050139a56 Bit of code cleanup 2015-11-10 13:41:19 -08:00
Atlante45
765bca9a7b Work on hold action 2015-11-09 18:05:45 -08:00
Atlante45
b3cdee278a Different approach for bat positionning 2015-11-09 16:14:18 -08:00
Atlante45
67e70aca24 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-09 15:33:44 -08:00
Stephen Birarda
44ab236673 Fix include in bat.js 2015-11-09 15:33:23 -08:00
Stephen Birarda
244fd86d1e add semi-colons to bat.js 2015-11-09 15:31:53 -08:00
Atlante45
9fa6216dc0 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-09 15:18:12 -08:00
Ryan Huffman
4ab6536109 Fix Vive dynamic pointer cast compile error on Windows 2015-11-09 15:06:43 -08:00
Stephen Birarda
4986ff552c Merge branch 'master' of https://github.com/huffman/hifi into baseball 2015-11-09 14:38:29 -08:00
Stephen Birarda
b42dea4555 Merge branch 'master' of https://github.com/Atlante45/hifi into baseball 2015-11-09 14:38:24 -08:00
Atlante45
767a7a7f1e Fix warnings on OS X 2015-11-09 14:26:23 -08:00
Stephen Birarda
cea2e0fafd don't force location in continueNearGrab 2015-11-09 14:21:14 -08:00
Stephen Birarda
917b746a68 Merge branch 'baseball' of https://github.com/huffman/hifi into baseball 2015-11-09 14:04:39 -08:00
Ryan Huffman
f6df7e298e Merge branch 'script-path-resolution' into baseball 2015-11-09 14:03:10 -08:00
Stephen Birarda
962881ad31 use startNearTrigger and startFarTrigger for create button 2015-11-09 13:43:52 -08:00
Atlante45
3228ca6033 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-09 13:41:31 -08:00
Atlante45
dcf545f462 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-09 13:41:23 -08:00
Atlante45
b15054c1fb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:41:06 -08:00
Stephen Birarda
d65571ea41 use the birarda baseball script on the createBatButton 2015-11-09 13:36:20 -08:00
Stephen Birarda
9ec51d822e send the avatar to /baseball on bat pickup 2015-11-09 13:35:54 -08:00
Stephen Birarda
119a702ebd Merge branch 'baseball' of https://github.com/huffman/hifi into baseball 2015-11-09 13:34:30 -08:00
Atlante45
6a53021818 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:23:31 -08:00
James B. Pollack
4cb5e710a3 Merge pull request #6352 from imgntn/pinghull 
Fix compound shape link
 2015-11-09 12:20:52 -08:00
James B. Pollack
36dfe81fde fix link 2015-11-09 12:19:23 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266 Update script engine path resolution behavior 
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
 2015-11-09 12:04:17 -08:00
Ryan Huffman
a400d63960 Cleanup Baseball in pitching.js 2015-11-09 12:02:28 -08:00
Ryan Huffman
5d4ce6aefc Update include paths in pitching.js to be relative 2015-11-09 12:02:10 -08:00
Ryan Huffman
069284d8d1 Remove unused variable and print in pitching.js 2015-11-09 11:51:08 -08:00
Ryan Huffman
278c921a50 Clean up bat.js 2015-11-09 11:35:56 -08:00
Eric Levin
4b684c0e63 Merge pull request #6350 from imgntn/pongupdates 
Add New Collision Hull and Collision Sound to Ping Pong Gun
 2015-11-09 11:34:37 -08:00
James B. Pollack
1812444614 Merge pull request #6278 from ericrius1/particleSorting 
Added additiveBlending property to particle effect entity
 2015-11-09 11:32:44 -08:00
Atlante45
a5c7269096 Use make_shared 2015-11-09 11:30:53 -08:00
Ryan Huffman
38fcdc3eff Remove unused code from pitching.js 2015-11-09 10:59:46 -08:00
Ryan Huffman
661b2180f5 Update updateBillboard argument 2015-11-09 10:59:31 -08:00
Ryan Huffman
dad3ccb238 Cleanup pitching.js 2015-11-09 10:58:36 -08:00
Ryan Huffman
1b3d595d1e Add comment to PITCHING_MACHINE_OUTPUT_OFFSET_PCT 2015-11-09 10:58:18 -08:00
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -08:00
Ryan Huffman
b6d26862fd Add headers to baseball script files 2015-11-09 10:33:07 -08:00
Ryan Huffman
ec31504c11 Add detection of missing entity billboards in pitching.js 2015-11-09 10:30:21 -08:00
Eric Levin
8e039fe465 Merge pull request #6338 from imgntn/string_polyfills 
Add More Methods to stringHelpers.js
 2015-11-09 10:25:13 -08:00
Eric Levin
ceba1c4b02 Merge pull request #6340 from imgntn/usertiming 
Adapt UserTiming library and Add Example
 2015-11-09 10:25:04 -08:00
Ryan Huffman
20bdc7ee85 Rename getPitchingMachine to getOrCreatePitchingMachine 2015-11-09 10:10:59 -08:00
Ryan Huffman
30841169ee Move functions in baseball.js to utils.js 2015-11-09 10:04:19 -08:00
Brad Hefta-Gaub
53b231987c Merge pull request #6349 from jherico/marge 
Prevent sixense manager from triggering continuous reset
 2015-11-09 09:52:16 -08:00
Seth Alves
030bb71f19 Merge pull request #6337 from howard-stearns/fix-agent-avatar 
fix agent avatar animation
 2015-11-09 09:38:27 -08:00
Brad Davis
07be03dc7e Bad merge fix, PR feedback 2015-11-09 09:30:18 -08:00
Brad Davis
2ecc4f8a5c Prevent sixense manager from triggering continuous reset 2015-11-09 09:16:32 -08:00
Ryan Downe Karpf
78228da64a Merge pull request #6342 from imgntn/bballsounds 
Add Collision Sounds to Basketballs in Toybox
 2015-11-09 09:07:39 -08:00
James B. Pollack
f9f017b787 Merge pull request #6348 from imgntn/readdrightclick 
re-add right click example
 2015-11-06 22:56:35 -08:00