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

24934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
ddec694393 Update add-zone icon in edit.js 2015-05-01 15:38:06 -07:00
Stephen Birarda
8037d383b1 remove extra debugging from AvatarMixer 2015-05-01 15:20:07 -07:00
Stephen Birarda
a7bff474e3 use JSONBreakableMarshal in AC monitor to get QJsonObject 2015-05-01 15:18:49 -07:00
Stephen Birarda
4b777f09e6 repairs to JSONBreakableMarshal for array values 2015-05-01 15:14:41 -07:00
Stephen Birarda
532bcc9376 complete initial algorithm for AM throttle 2015-05-01 14:56:40 -07:00
Seth Alves
560d89b38a session id can be null. don't crash 2015-05-01 14:56:03 -07:00
Andrew Meadows
42ec39c578 add ObjectMotionType::bump(), use in PhysicsEngine 2015-05-01 14:39:33 -07:00
Andrew Meadows
3c9474b736 non-phys kinematic objs move to EntitySimulation 
out of SimpleEntitySimulation
 2015-05-01 13:43:50 -07:00
Sam Gateau
66a1d1f597 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-05-01 13:38:38 -07:00
Sam Gateau
7874de9924 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-05-01 13:37:29 -07:00
Sam Gateau
1b558e7390 investigating the semi transparent textured bug 2015-05-01 13:37:04 -07:00
Howard Stearns
e0a4909b22 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-01 13:32:05 -07:00
Seth Alves
5390630497 Merge pull request #4743 from huffman/sphere-color 
Add support for changing sphere color in edit.js
 2015-05-01 13:17:46 -07:00
Ryan Huffman
8ed5284dfa Add drawZoneBoundaries get/set to EntitiesScriptingInterface 2015-05-01 12:52:59 -07:00
Ryan Huffman
51c2a8273e Add drawZoneBoundaries 2015-05-01 12:52:40 -07:00
ZappoMan
2128b7499e first cut at adding atmosphere properties to zones 2015-05-01 12:10:12 -07:00
David Rowe
e689b6a869 Remove leading Unicode control chars 2015-05-01 12:07:00 -07:00
samcake
1448ab21b6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-05-01 12:04:34 -07:00
samcake
c8e5b35de9 Fixing typo 2015-05-01 12:04:15 -07:00
Brad Hefta-Gaub
62ba82198c Merge pull request #4737 from samcake/temp1 
Fix the shadow Bug on Mac and the errors on shader compilation
 2015-05-01 12:01:00 -07:00
Seth Alves
4f483afd10 Merge pull request #4742 from huffman/osx-warnings 
Update compiler flags to produce warnings on non-gnu compilers
 2015-05-01 12:00:57 -07:00
Ryan Huffman
7f84b27880 Add support for changing sphere color in edit.js 2015-05-01 11:59:39 -07:00
Seth Alves
6139fc0d73 Merge pull request #4738 from huffman/entity-naming 
Add 'name' property to entities
 2015-05-01 11:58:30 -07:00
Stephen Birarda
7a2a391852 add script to move joints for av rate testing 2015-05-01 11:53:20 -07:00
Seth Alves
bd1f77b8f3 cleanups 2015-05-01 11:35:14 -07:00
Seth Alves
ea1ec0186e stop doing useless multiple inheritance 2015-05-01 11:31:58 -07:00
Ryan Huffman
0883bde1be Update compiler flags to produce warnings on non-gnu compilers 2015-05-01 11:29:23 -07:00
Ryan Huffman
c506c36d7c Fix initialized-out-of-order warnings for name property 2015-05-01 11:26:43 -07:00
Seth Alves
b47184de78 oops 2015-05-01 11:21:27 -07:00
Seth Alves
452d78805e oops 2015-05-01 11:20:50 -07:00
Seth Alves
b443ce5d3e oops 2015-05-01 11:20:34 -07:00
Andrew Meadows
c2d614b884 remove _movableButStoppedEntities 2015-05-01 11:19:01 -07:00
Seth Alves
a31e2dc309 oops 2015-05-01 11:18:56 -07:00
Seth Alves
3765ace7ef move common debugging rendering into a new class 2015-05-01 11:17:46 -07:00
Seth Alves
f3d1b964e3 Merge branch 'master' of github.com:highfidelity/hifi into box-stacking-1 2015-05-01 11:16:58 -07:00
Andrew Meadows
3031d55c8e merge upstream/master into andrew/nova 2015-05-01 11:03:51 -07:00
samcake
2bf7387723 Merge pull request #4733 from sethalves/box-stacking 
improve display of owned boxes and models when simulation-ownership debug menu is enabled
 2015-05-01 11:00:28 -07:00
Andrew Meadows
b023fe582a make things compile 2015-05-01 10:44:50 -07:00
Andrew Meadows
31ca5b9eef add EntityTree::_pendingDelete for delayed deletes 
for case where EntitySimuation needs time to remove pointers
 2015-05-01 10:43:58 -07:00
Sam Gateau
67b923eb89 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-05-01 10:42:39 -07:00
Stephen Birarda
67efa7796f use only AD rate for FRD adjustment 2015-05-01 10:38:32 -07:00
Brad Davis
1e2106e831 Whitespace removal 2015-05-01 10:36:03 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
00fd7208b5 Merge branch 'master' of github.com:highfidelity/hifi into box-stacking-1 2015-05-01 10:22:19 -07:00
Seth Alves
ef4e271732 Merge pull request #4739 from ericrius1/mouseGrab 
refactored grab script using velocity and spring force, and added lotsoblocks.js to quickly generate lots of physical blocks
 2015-05-01 10:07:25 -07:00
Eric Levin
3ee111d757 added script to generate a lot of physical blocks within a specified range 2015-05-01 09:56:21 -07:00
Howard Stearns
ee93e1d300 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-01 09:51:15 -07:00
Eric Levin
cac5fa1371 refactored grab script using velocity and spring force 2015-05-01 09:39:39 -07:00
Seth Alves
7ad6cf5c8f Merge branch 'master' of github.com:highfidelity/hifi into box-stacking 2015-05-01 09:19:37 -07:00
Ryan Huffman
73a5b8c4e2 Add support for 'name' to edit.js 2015-05-01 08:42:23 -07:00