Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 22:20:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21179 commits 72 branches 59 tags 1.2 GiB
Commit graph

939 commits

Author SHA1 Message Date
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
Atlante45
68430e1346 Moved GLCanvas to DependencyManager 2014-12-15 11:54:33 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -08:00
ZappoMan
6b39783de7 revert out the InterfaceConfig.h changes 2014-12-15 10:12:04 -08:00
ZappoMan
7d1081473e remove _textureCache 2014-12-15 09:42:35 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
Atlante45
738f23f326 Moved visage and dde over to DependencyManager 2014-12-14 22:30:13 -08:00
Atlante45
65094f2165 Update headers 2014-12-14 21:47:08 -08:00
Atlante45
1db3592d4c Switched meFaceshifto DependencyManager for Faceshift 2014-12-14 19:56:42 -08:00
Clément Brisset
14918ff86a Merge pull request #3952 from ZappoMan/HMDMode 
More HMD work - keep more dialogs from being moved to HMD
 2014-12-11 15:26:36 -08:00
ZappoMan
29672aec09 removing VoxelShader and PointShader which were both disabled 2014-12-11 13:55:10 -08:00
ZappoMan
c9bc95580d add support for generic windowWatcher that keeps dialogs from being moved to HMD display 2014-12-11 12:30:17 -08:00
AndrewMeadows
84e82cd03b Merge pull request #3947 from ZappoMan/HMDMode 
Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen
 2014-12-11 10:48:32 -08:00
ZappoMan
ec54b609df dry up code and make chat window avoid the hmd screen 2014-12-10 17:23:39 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Atlante45
8765d9a9b3 Mouse cursor modifications 2014-12-09 16:30:37 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
Atlante45
ee124f580d removed _mouse{X,Y} 2014-12-05 17:02:49 -08:00
Atlante45
4bc7e1a3e8 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-05 14:46:52 -08:00
ZappoMan
e68e3fe774 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:06:17 -08:00
ZappoMan
9753c82a3b get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-05 10:04:23 -08:00
ZappoMan
feab942375 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:01:16 -08:00
Atlante45
84da070901 Correct mouse position in occulus 2014-12-04 18:27:03 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request #3870 from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
Andrew Meadows
cda8ac85c1 EntityCollisionSystem moves to interface 
and interface connects EntityCollision system to EntityTree
 2014-11-26 12:15:24 -08:00
ZappoMan
e35242345c first cut at HMD Tools dialog 2014-11-25 09:26:24 -08:00
Andrew Meadows
47f2cbd73b merge upstream/master into andrew/inertia 2014-11-19 17:07:55 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
Andrew Meadows
388830c2a2 Merge branch 'bispinor' into inertia 
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0 rename PhysicsWorld to PhysicsEngine 2014-11-18 09:55:25 -08:00
Andrzej Kapolka
3f3eae9350 Adjusted distances for new avatar sizes. 2014-11-17 12:02:09 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Sam Gateau
43a6a0420b remove useless comments 2014-11-14 12:24:38 -08:00
Sam Gateau
cc78000641 introduce the concept of side thorugh out the rendering traversal 2014-11-14 11:22:11 -08:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Andrew Meadows
5eb606c44a merge upstream/master into andrew/inertia 2014-11-14 09:04:27 -08:00
Andrew Meadows
1a094f2b51 reorder PhysicsWorld and EntityTree in Application 2014-11-14 09:03:41 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8 Add tool window 2014-11-13 17:47:02 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
Andrew Meadows
1bed4eeb5b merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
 2014-11-13 10:53:23 -08:00
Andrew Meadows
14f49df44d Application gets a ThreadSafePhysicsWorld 2014-11-13 10:02:36 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Philip Rosedale
6af2b7aadf remove buckyballs and face shift lean driving (should be a script if desired) 2014-11-12 07:33:59 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrew Meadows
82d7b70ec9 add offset to physics simulation 2014-11-11 10:56:31 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby 
initial groundwork for lobby interface
 2014-10-28 08:48:33 -07:00
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
David Rowe
c6463abfb8 Prevent keys captured by script from being used as menu shortcuts 2014-10-25 09:22:30 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
ac269e16c0 start working on the target framerate control 2014-10-23 13:19:34 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
David Rowe
d3b37684cd Add VR display auto-calibration logic 2014-10-03 13:46:41 -07:00
Stephen Birarda
f27105100a have AddressManager know its current domain and current path 2014-10-03 10:29:02 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Andrzej Kapolka
467a9582c7 Somehow my reverting the ambient occlusion effect didn't take. 2014-09-15 13:29:03 -07:00
Andrzej Kapolka
d0f30dfd45 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 14:44:45 -07:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup 
initial transition to new metaverse API
 2014-09-12 13:45:40 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00