Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34470 commits 71 branches 56 tags 1.2 GiB
Commit graph

34470 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
samcake
25d67656e9 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 11:35:43 -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
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -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
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
samcake
2078c753ae Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 09:23:59 -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
Anthony J. Thibault
82b26b75f4 Code convention fixes 2015-11-09 08:14:27 -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
James B. Pollack
bf4320e5cc re-add this example 2015-11-06 22:55:33 -08:00
James B. Pollack
34d98cac5e Update usertiming.js 2015-11-06 22:12:03 -08:00
James B. Pollack
369eec2abd Update usertimingExample.js 2015-11-06 22:05:30 -08:00
James B. Pollack
4fbff5d667 Update usertimingExample.js 2015-11-06 21:39:53 -08:00
Clément Brisset
2c27d18922 Merge pull request #6282 from jherico/externals 
Runtime plugins fixes
 2015-11-06 19:30:40 -08:00
Clément Brisset
517ef7dfc8 Merge pull request #6336 from ericrius1/avatarMover 
Restores the avatar mover app after its loss in S3
 2015-11-06 19:30:24 -08:00
Brad Davis
e84f3af483 Merge pull request #6343 from Atlante45/sixense 
Sixense cleanup
 2015-11-06 17:50:12 -08:00
James B. Pollack
c4318bcbd3 add easystar lib 2015-11-06 17:38:53 -08:00
Atlante45
68a72b0f41 Bit of cleanup 2015-11-06 17:28:51 -08:00
samcake
cbeb56aba4 using the frameInterpolatorCOrrectly 2015-11-06 17:25:50 -08:00
Brad Davis
6122fa145d More PR feedback 2015-11-06 17:17:26 -08:00
Atlante45
137a2c1c48 Fix file headers 2015-11-06 17:15:34 -08:00
samcake
07fb3a0532 Merge pull request #6341 from howard-stearns/for-sam 
Make life easier for Sam.
 2015-11-06 17:13:22 -08:00
James B. Pollack
d8f169bd4e add collision sounds to bballs 2015-11-06 17:04:55 -08:00
Howard Stearns
314c11e8d4 Make life easier for Sam. 2015-11-06 16:59:46 -08:00
Brad Davis
37a9538f10 PR feedback, ensure destruction of shared objects 2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f Allow shared libraries to access core global objects 2015-11-06 16:57:31 -08:00
Brad Davis
0c60538952 Ensure that dependencies of runtime plugins are included in the DLL copy 2015-11-06 16:57:30 -08:00
Atlante45
6323728d7a Added perfect forwarding of arguments 2015-11-06 16:56:48 -08:00
Atlante45
d95709ee73 Added input plugins logging category 2015-11-06 16:45:23 -08:00
Atlante45
0a65bb145b Some more code cleanup 2015-11-06 16:44:28 -08:00
samcake
b1d5a36dc6 removing useless differences 2015-11-06 16:40:46 -08:00
samcake
bc852d8eab removing useless differences 2015-11-06 16:39:23 -08:00
samcake
7890aa6ec1 Merge pull request #6333 from jherico/rec2 
Adding clip serialization implementation, tests
 2015-11-06 16:38:39 -08:00
Atlante45
6ad20e417b Typo 2015-11-06 16:33:36 -08:00
Atlante45
e3b54f0272 Cleanup 2015-11-06 16:33:29 -08:00
Atlante45
503e03d4a8 Remove unused using 2015-11-06 16:33:22 -08:00
Atlante45
96aa5be457 Implement all Sixense methods for OS X 2015-11-06 16:33:16 -08:00
Atlante45
298ac650d8 Isolate sixense dynamic linking for OSX 2015-11-06 16:33:07 -08:00
samcake
5fb2c3ccd1 resolve merge conflict 2015-11-06 16:27:47 -08:00
samcake
4dbca68767 Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon 2015-11-06 16:24:19 -08:00
James B. Pollack
f478261ed0 cleanup 2015-11-06 16:21:53 -08:00