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

8406 commits

Author SHA1 Message Date
Andrew Meadows
f09a67af6c don't need temp variable 2015-04-24 13:26:26 -07:00
Andrew Meadows
79cb55eabc rename setJointStates() --> initJointStates() 2015-04-24 13:26:26 -07:00
Andrew Meadows
c4395e75bb cleanup and comments 2015-04-24 13:26:26 -07:00
Brad Davis
0a9398808f CR comments 2015-04-24 13:25:30 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Atlante45
a4f03f8b1c Zones use avatar position not view frustum 2015-04-24 22:16:21 +02:00
Seth Alves
902e84c711 sync 2015-04-24 13:10:38 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Seth Alves
a27f8f3f10 sync 2015-04-24 11:28:44 -07:00
Seth Alves
926694517f sync 2015-04-24 11:07:45 -07:00
Seth Alves
b40e78311b disable hack to notice that the server is sending the same thing repeatedly 2015-04-24 11:00:06 -07:00
Seth Alves
1b84be6e10 attempting to have visual indicator of simulatorID 2015-04-24 10:55:43 -07:00
Andrew Meadows
80d3f35b2e Controller disabled when not in physics engine 2015-04-24 09:57:22 -07:00
Seth Alves
6fdbce9ee3 oops 2015-04-24 09:29:57 -07:00
Seth Alves
c2422c2382 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-24 09:29:26 -07:00
Seth Alves
6d151ee3ed try a different way of identifying when to claim simulation ownership of a moving entity 2015-04-24 09:29:05 -07:00
Brad Hefta-Gaub
22ff2ba1b8 Merge pull request #4687 from Atlante45/zone_shape_edit_js 
Zone ShapeType/CompoundShapeURL in edit.js
 2015-04-24 09:08:56 -07:00
Atlante45
a26d9ef353 Fix ShapeType/String conversion 2015-04-24 16:49:18 +02:00
Atlante45
fff8b99d10 Fix keylight color 
Was an integer division producing a float
 2015-04-24 15:31:25 +02:00
Brad Davis
c0d562ed55 Merge branch 'offscreen' into m_and_m 2015-04-23 23:45:11 -07:00
Brad Davis
a4619c8e59 Merge branch 'master' into offscreen 2015-04-23 23:41:36 -07:00
Brad Davis
1d316a1872 Still working on menus 2015-04-23 23:41:09 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Seth Alves
cf0499e671 various physics-related experiments 2015-04-23 21:07:04 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
9a8207610d Bad merge 2015-04-23 14:23:15 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Andrew Meadows
0daaf20f01 Merge pull request #4675 from sethalves/detect-ballistic 
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
 2015-04-23 14:19:51 -07:00
Brad Davis
ae804357d8 Attempting to fix backspace issue in new UI 2015-04-23 14:10:54 -07:00
ZappoMan
5dddca37ca fix default shape of zones 2015-04-23 13:44:39 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
ad7293d4ad Merge pull request #4679 from jherico/offscreen 
Fix a couple of bugs with the new offscreen UI
 2015-04-23 12:45:51 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Brad Hefta-Gaub
945433be28 Merge pull request #4678 from sethalves/fix-pile-at-origin 
don't pile things up at the origin during a load
 2015-04-23 11:40:46 -07:00
Brad Davis
d0af5580c8 Fix mouse wheel and clickthrough bugs in offscreen UI 2015-04-23 10:28:03 -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
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -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
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 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
Seth Alves
7781808bea remove debug prints, fix a comment 2015-04-22 15:25:09 -07:00
Seth Alves
6678922f5c put back code for interface giving up simulator status when something stops 2015-04-22 15:09:56 -07:00
Seth Alves
3450597d70 remove some debugging prints 2015-04-22 15:03:23 -07:00
Seth Alves
92ceff1a03 clean up EntityItem constructors 2015-04-22 14:53:23 -07:00
Seth Alves
c30d742f7d experimenting 2015-04-22 14:22:09 -07:00
Seth Alves
36dbbd0c9d experimenting 2015-04-22 14:14:12 -07:00
Seth Alves
cd3ee39fcc experimenting 2015-04-22 13:42:04 -07:00
Seth Alves
69ee33a392 experimenting 2015-04-22 13:29:28 -07:00
Seth Alves
ee000f91ae experimenting 2015-04-22 13:27:19 -07:00
Seth Alves
27ed0c4a98 experimenting 2015-04-22 13:21:06 -07:00
Seth Alves
7382b0b19f experimenting 2015-04-22 13:17:20 -07:00
Seth Alves
a6750eafd8 experimenting 2015-04-22 13:03:59 -07:00
Seth Alves
dc30ca0210 experimenting 2015-04-22 12:51:29 -07:00
ZappoMan
fb4e334c70 implement volume priority for zones 2015-04-22 12:38:34 -07:00
Atlante45
287d625c52 Added RenderableZoneEntities class 2015-04-22 21:17:12 +02:00
Atlante45
99b3ef0d75 Move contain function to FBXGeometry 2015-04-22 21:17:12 +02:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
8dc98d86b5 Bump entities packet version 2015-04-22 21:16:03 +02:00
Atlante45
7f3be9c89b Add shapeType/compoundShapeURL to ZoneEntities 2015-04-22 21:14:10 +02:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
Atlante45
f3fcb749df Fix algorithm + add comments 2015-04-22 21:03:55 +02:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +02:00
Atlante45
8db9f80779 Reimplements "contains" for sphere and particles 2015-04-22 21:03:55 +02:00
Atlante45
dbf40afa47 Remove deprecated "*InDomainUnit" getter/setter 2015-04-22 21:03:55 +02:00
samcake
68a4a14b43 Merge pull request #4672 from ZappoMan/ZoneEntity2 
Implement Zone Entity
 2015-04-22 11:58:03 -07:00
Seth Alves
41166c1a42 allow entity server to time-out entity-simulation ownership rather than having interfaces give it up 2015-04-22 11:18:18 -07:00
Seth Alves
32673efc80 compute collision events inside lock to avoid a rare crash 2015-04-22 10:51:45 -07:00
Seth Alves
3f705f3172 keep track of the number of simulation steps each entity has been accelerated at nearly its gravity. if we get 4 in a row, start sending acceleration equal to gravity to the entity server, so it will include gravity in its estimates 2015-04-22 10:39:13 -07:00
Seth Alves
e334c456ea add a place to keep track of the number of simulation steps where acceleration was close to gravity for a given Entity 2015-04-22 10:13:13 -07:00
ZappoMan
19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-04-22 09:35:08 -07:00
Andrew Meadows
65825a4501 Merge pull request #4659 from ericrius1/collision 
Filtering triggering of collisions with contact type of "continue"
 2015-04-22 09:33:40 -07:00
Andrew Meadows
b2c67a7f33 Merge pull request #4639 from sethalves/acceleration-and-owner-in-wire-protocol 
simulation owner in wire protocol
 2015-04-22 09:20:44 -07:00
Seth Alves
cde64893af coding standard 2015-04-21 18:36:06 -07:00
ZappoMan
486ab044a0 use piggyback properties to save on property bit space 2015-04-21 15:16:46 -07:00
ZappoMan
8366dd02a0 remove RenderableZoneEntityItem class since zones don't render like other entities 2015-04-21 15:03:04 -07:00
ZappoMan
4ce451f984 wire up zone rendering again 2015-04-21 14:55:45 -07:00
ZappoMan
98350a47ad Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 2015-04-21 14:36:27 -07:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Sam Gateau
f54821f996 more details in the comments 2015-04-21 11:12:01 -07:00
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
ZappoMan
8ce4cb628a another attempt at zones starting from box 2015-04-20 18:18:01 -07:00
ZappoMan
a9c2a6e048 another attempt at zones starting from box 2015-04-20 18:17:21 -07:00
Seth Alves
64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 16:56:24 -07:00
Seth Alves
c49e2c1804 cleanups, diff minimization 2015-04-20 16:52:29 -07:00
Seth Alves
4a5631fca6 cleanups, diff minimization 2015-04-20 16:51:28 -07:00
Seth Alves
6107682658 handle ignoring simulation data echoed back to us differently 2015-04-20 16:36:56 -07:00
Seth Alves
23f1767634 cleanup 2015-04-20 16:13:28 -07:00
Seth Alves
d6c8bd94cf clean up some debugging prints 2015-04-20 15:59:33 -07:00
Sam Gateau
58c1827f69 bring back the glPushPop in transform legacy mode 2015-04-20 15:56:44 -07:00
Seth Alves
56b005a872 packets should be ignore if they contain local nodeID, not if local entity contains nodeID 2015-04-20 12:19:36 -07:00
Seth Alves
08d300afcd use a flag to indicate that simulation ownership should be grabbed 2015-04-20 11:49:10 -07:00
Seth Alves
88f289f3c1 small cleanup and some debugging prints 2015-04-20 11:19:48 -07:00
Seth Alves
fbff3627dc attempt to claim simulation ownership of entities the avatar crashes with 2015-04-20 11:13:51 -07:00
Seth Alves
f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 08:49:33 -07:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Seth Alves
b3cb9fe9a4 fix comment some more 2015-04-17 15:33:41 -07:00
Seth Alves
adfc82e169 remove commented-out code 2015-04-17 15:10:34 -07:00
Seth Alves
dac57c44da if measured acceleration is close to zero, send zero to entity server, else send gravity 2015-04-17 15:05:47 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Seth Alves
292ba20cf3 pull andrew's measure-acceleration branch 2015-04-17 11:35:12 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
Sam Gateau
525d1040ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-17 11:32:35 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
Seth Alves
07b9d73edf bump protocol version 2015-04-17 11:20:35 -07:00
Seth Alves
d90dec066c if an entity has no simulatorID, pull it out of list of entities with simulatorIDs 2015-04-17 11:12:13 -07:00
Seth Alves
32ced31f60 adjust logic related to claiming and releasing simulation ownership during scripted changes to entities 2015-04-17 10:57:00 -07:00
Stephen Birarda
64d17f101a obfuscate set access token from AM log 2015-04-17 10:44:01 -07:00
Seth Alves
3da2d1680d fix code that causes scripted changes to physics-related entity properties to claim simulation ownership 2015-04-17 10:41:11 -07:00
Seth Alves
deec577db6 if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race 2015-04-17 10:21:52 -07:00
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -07:00
Seth Alves
f77038c52d when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up 2015-04-17 09:37:48 -07:00
Seth Alves
639b9ef9ff Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-17 08:50:07 -07:00
Eric Levin
2b4d894ab3 moved the type computation inside the while loop so it is correctly computed each iteration 2015-04-17 08:17:58 -07:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00