Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 12:00:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24391 commits 74 branches 59 tags 1.2 GiB
Commit graph

24391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
ac7b373231 Throttle rendering needs to ensure it's active context 2015-04-23 10:27:28 -07:00
Ryan Huffman
361bf7e441 Remove unnecessary print 2015-04-23 10:15:18 -07:00
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Atlante45
b340cd06bf Fix volume formula for capsules 2015-04-23 19:14:07 +02:00
Seth Alves
c21e06e7a7 don't pile things up at the origin during a load 2015-04-23 10:08:59 -07:00
Seth Alves
2ca592de8b fix logic with infectious simulation ownership 2015-04-23 10:02:29 -07:00
Ryan Huffman
78207f0d51 Make zones pickable in edit.js while control is down 2015-04-23 10:00:05 -07:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Ryan Huffman
30b9e16c1a Remove unused findRayIntersection from zoneOverlayManager 2015-04-23 09:52:21 -07:00
Ryan Huffman
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Ryan Huffman
b31f95a002 Fix cube rendering not working with transparency 2015-04-23 09:34:23 -07:00
Ryan Huffman
6612f9cb61 Fix key light properties in proeprties window 2015-04-23 09:33:58 -07:00
Ryan Huffman
ab261f4443 Update zone overlay to only be visible when edit is on 2015-04-23 09:33:33 -07:00
Ryan Huffman
af46ece9af Remove overlays.js include 2015-04-23 09:33:10 -07:00
Ryan Huffman
af93634fcb Merge branch 'master' of github.com:highfidelity/hifi into edit-zones 2015-04-23 09:32:37 -07:00
Ryan Huffman
5654e3abed Add zone overlay manager 2015-04-23 09:32:15 -07:00
Seth Alves
10e5378396 fix mangled if 2015-04-23 09:13:18 -07:00
Atlante45
51d99da29f Magic number 2015-04-23 17:50:26 +02:00
Atlante45
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
bda72025af Check mesh extend before going through triangles 2015-04-23 16:40:40 +02:00
Brad Hefta-Gaub
82d3302d1b Merge pull request #4644 from jherico/offscreen 
Working on new-UI implementations of address bar and login
 2015-04-23 07:17:45 -07:00
Atlante45
99fd590a90 Update compound shape geometry when async get 2015-04-23 16:05:06 +02:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +02:00
Atlante45
3a0b5f9d22 Register RenderableZoneEntityItem in EntityTreeRenderer 2015-04-23 15:34:03 +02:00
Atlante45
c91ca146d5 Add different shapes to zone example 2015-04-23 15:22:58 +02:00
Atlante45
15482d6a57 Don't compute shape for zones 2015-04-23 15:21:51 +02:00
Atlante45
fb4d1d3557 Fix compoundShapeURL reseting shapeType 2015-04-23 14:24:20 +02:00
Atlante45
f117941c8d Macro fixing 2015-04-23 13:25:14 +02:00
Atlante45
01f4f34911 Centralize contains standard cases 2015-04-23 13:04:59 +02:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Atlante45
3ebe72f025 Fix read macro 2015-04-23 12:12:42 +02:00
Seth Alves
9e96026c52 move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState 2015-04-22 21:36:36 -07:00
Brad Davis
eaaada908a Merge pull request #4674 from ZappoMan/ZoneVolume 
implement volume priority for zones
 2015-04-22 20:21:30 -07:00
Brad Davis
de179256d3 Kill all the whitespace 2015-04-22 20:19:19 -07:00
Brad Davis
eab4ad9ea9 More coding standard stuff 2015-04-22 20:16:41 -07:00
Brad Davis
44efcdf82a More coding standard 2015-04-22 20:08:49 -07:00
Brad Hefta-Gaub
67a12d8272 Merge pull request #4665 from ctrlaltdavid/dde-miscellaneous 
DDE miscellaneous
 2015-04-22 19:57:49 -07:00
Brad Davis
732e9723cd Messed up rename 2015-04-22 19:24:43 -07:00
Brad Davis
930ec7a6d8 One more 2015-04-22 19:22:10 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
Seth Alves
4ca076ed94 put PhysicsEngine::bump back in. some things get missed if we just set the one thing active 2015-04-22 18:53:49 -07:00
Seth Alves
d51f5a0ae8 remove commented out code 2015-04-22 17:22:37 -07:00
Seth Alves
5a7f8a2f5a git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table 2015-04-22 17:06:21 -07:00
Seth Alves
864f8cb3b3 fix comment 2015-04-22 16:10:25 -07:00
Seth Alves
96b4517e6e when removing something from bullet, attempt to wake up anything that was touching it 2015-04-22 16:05:31 -07:00
Seth Alves
07a848c9ce added bump call in physics engine for when an entity is deleted and may have something resting on top of it 2015-04-22 15:50:39 -07:00