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

8384 commits

Author SHA1 Message Date
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Seth Alves
2eebfb9cf1 merge from upstream 2015-04-25 12:50:16 -07:00
Seth Alves
d1d4b0f0ee merge from upstream 2015-04-25 12:50:00 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Seth Alves
81ff8a4448 count steps during which an EntityItem is moving but has no simulation owner. Once the count is high enough (how high is TBD), attempt to claim ownership 2015-04-25 07:17:21 -07:00
Seth Alves
48ec0c8339 formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner 2015-04-25 06:56:19 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Seth Alves
03706359f5 cleanups 2015-04-24 17:44:52 -07:00
Seth Alves
218393a2b3 rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken 2015-04-24 17:37:19 -07:00
Brad Davis
fdf2f8395d Bad lambda type 2015-04-24 17:28:43 -07:00
Brad Davis
eb02bdc67f Dangling function 2015-04-24 16:57:39 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Andrew Meadows
3ecf959b3e removed cached copies of damping and restitution 2015-04-24 14:50:37 -07:00
Seth Alves
2a8fbeca32 sync 2015-04-24 14:43:39 -07:00
Seth Alves
e7c6ee597a sync 2015-04-24 14:36:05 -07:00
Seth Alves
ea250c037a sync 2015-04-24 14:27:32 -07:00
Seth Alves
6b53fefebe sync 2015-04-24 14:21:59 -07:00
Seth Alves
fea8d84618 sync 2015-04-24 14:09:10 -07:00
Seth Alves
ad85837b5a sync 2015-04-24 13:44:34 -07:00
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
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