Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 08:37:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26003 commits 71 branches 56 tags 1.2 GiB
Commit graph

26003 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Seth Alves
08902d0ec9 Merge pull request #5061 from jherico/skybox-jiggle 
Fix the skybox jiggle in the HMD
 2015-06-05 10:14:07 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
Seth Alves
2086a25f93 oops 2015-06-05 08:59:19 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Philip Rosedale
164df99f93 Merge pull request #5056 from ericrius1/paint 
marker ball now stays without mouse whether or not user is drawing
 2015-06-04 21:42:47 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Philip Rosedale
84c03b29ef Merge pull request #5055 from ericrius1/paint 
added redo and undo functionality to mouse component of paint script,…
 2015-06-04 21:15:11 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint 
added paint.js and line rider script. Users can paint lines with hydr…
 2015-06-04 20:52:23 -07:00
Philip Rosedale
ead1b63f05 Merge pull request #5050 from ericrius1/pointerFix 
updated pointer.js script to work with new line entity
 2015-06-04 20:44:03 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Philip Rosedale
6d29524610 Merge pull request #5052 from ericrius1/lineSanitization 
added sanitization for invalid line points data. Fixed bug where occa…
 2015-06-04 17:22:48 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00
Howard Stearns
407d3b6a6e Pitch is dependent on (largest dimension of) minimum bounding, not max. 
Adjust sound range of full volume.
 2015-06-04 14:23:51 -07:00
Howard Stearns
5cbb5dadca More perspicacious zero. 2015-06-04 14:21:12 -07:00
Howard Stearns
5727400b9a Sound toys script (in examples/soundToys.js) 2015-06-04 14:20:19 -07:00
Seth Alves
5e5bc497d9 remove debugging prints 2015-06-04 12:44:08 -07:00
Seth Alves
5f60ad3b51 put back unused variables as commented out -- there is a comment lower down that talks about them 2015-06-04 12:39:48 -07:00
Seth Alves
66ab3d455f use shared pointers to keep track of action objects 2015-06-04 12:29:05 -07:00
Seth Alves
8f19bad97d pull argument extracting code into EntityActionInterface 2015-06-04 11:39:15 -07:00
Seth Alves
14026667f5 script interface for creating an action now takes an action-type name rather than having a different call for each action 2015-06-04 10:55:32 -07:00
Seth Alves
9cae11cc3c clean up actions when DeleteEntityOperator's list is processed rather than as it's made 2015-06-04 09:55:25 -07:00
Seth Alves
57d85cece0 get rid of simulation back-pointer in actions 2015-06-04 09:41:32 -07:00
Howard Stearns
0b52f85c60 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume 2015-06-04 09:10:42 -07:00
Seth Alves
4414b67837 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-03 20:43:22 -07:00
Seth Alves
31bc106189 remove unneeded include 2015-06-03 20:43:11 -07:00
Seth Alves
d634663bb1 simple action is working. destructor sequense is still suspicous 2015-06-03 17:33:55 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor 
fix crash in ~OffscreenGlCanvas on linux shutdown
 2015-06-03 17:21:39 -07:00
Stephen Birarda
cf67d22ec7 Merge pull request #5036 from venkatn93/master 
Fixed snapshot bug. Snapshots now save and load ok
 2015-06-03 18:57:29 -04:00
Niraj Venkat
29a15453ac Visual studio tab issues fixed 2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1 Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Niraj Venkat
92248d23e7 more indentation changes 2015-06-03 14:59:07 -07:00
Andrew Meadows
b0ca2df3aa move API from PhysicsEngine to ObjectMotionState 2015-06-03 14:56:04 -07:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Andrew Meadows
8e61a10bcf compute collision group for entity 2015-06-03 14:22:48 -07:00
Andrew Meadows
ec0b4a956a move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
Andrew Meadows
a989998816 fix typo in comment 2015-06-03 14:13:30 -07:00