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

1078 commits

Author SHA1 Message Date
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
Andrzej Kapolka
c2b58c9781 Move deferred lighting into its own class. 2014-09-11 16:39:17 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera 
information.
 2014-09-10 15:51:10 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Brad Hefta-Gaub
a77739f31c Merge pull request #3369 from ctrlaltdavid/20007 
Code Review for Job #20007
 2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Andrzej Kapolka
0b2d0a0b07 Fix for mouse events. 2014-09-05 17:30:19 -07:00
Andrzej Kapolka
c2cd23a54c Mouse coordinate fix. 2014-09-05 17:07:37 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
Ryan Huffman
7d11994cce Add cursor hiding to gracefulControls.js 2014-08-14 22:37:23 -07:00
Bennett Goble
46007e2c56 Merge branch 'master' into 19616 2014-08-08 17:38:53 -04:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Atlante45
8d1438a44c Plugged in dde face tracker 2014-08-04 10:28:52 -07:00
Bennett Goble
b634f8d8c0 Merge branch 'master' into 19616 2014-08-03 14:08:09 -04:00
Bennett Goble
bd409f2de4 importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Ryan Huffman
a39a7e2356 Update exportModels implementation 2014-07-31 01:13:17 -07:00
Ryan Huffman
01737e18b2 Update LocalModelOverlay to work prorperly with translations 2014-07-30 19:06:10 -07:00
Ryan Huffman
06294b403b Add pasteModels 2014-07-30 18:31:58 -07:00
Stephen Birarda
363cef6d8a move satoshi costs to VoxelEditPacketSender 2014-07-30 17:33:37 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Zu
2d921924bf added: Cara Face Tracker 
added: decode cara udp packets
added: head rotation
added: hook into hifi interface
 2014-07-25 16:52:29 +08:00
Thijs Wenker
9d5c81bd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed 
function state killed my frame rate.  Also cleaned up some of the location
tracking.
 2014-07-22 18:03:13 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
wangyix
a7ef7647ed application stats tracking and packing updated; 2014-07-10 16:54:26 -07:00
wangyix
b4c9e51011 Audio now periodically sends downstream audio stats to audiomixer 2014-07-10 14:14:29 -07:00
Ryan Huffman
874b542c0c Add import/export/paste model functionality to editModels.js 2014-07-09 04:13:53 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
Atlante45
c5a997a567 Switched Application to NetworkAccessManager 2014-07-01 17:43:25 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
ZappoMan
d25ba66b21 more Models->Entities renaming 2014-06-26 17:04:10 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -07:00
Ryan Huffman
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Brad Hefta-Gaub
f2b2784fa9 Merge pull request #3045 from wangyix/edit_nack_pull 
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
 2014-06-18 15:02:40 -07:00
wangyix
29723d0ef3 changed octree data nacks to repeatedly nack missing seq nums 2014-06-18 13:36:54 -07:00
Ryan Huffman
7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
 2014-06-17 20:27:16 -07:00
Brad Hefta-Gaub
e8ba3c8bb1 Merge pull request #3019 from ctrlaltdavid/19769 
Code Review for Job #19769
 2014-06-12 17:31:53 -07:00
barnold1953
762751ef6a Store the last mouse move input type for application overlay 2014-06-12 10:47:11 -07:00
Ryan Huffman
5ef9e3b3c0 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
 2014-06-11 14:34:59 -07:00
Ryan Huffman
355fe01490 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/RunningScriptsWidget.cpp
	interface/ui/preferencesDialog.ui
	interface/ui/runningScriptsWidget.ui
 2014-06-11 13:30:47 -07:00
David Rowe
39e3deb9b9 Add menu item that toggles VR display mode 
Toggles the display mode if a Rift is found connected at program start.
 2014-06-10 15:03:07 -07:00
wangyix
d84beee3e4 VoxelPacketProcessor -> OctreePacketProcessor 
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
 2014-06-10 11:05:51 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Andrzej Kapolka
1eace78e47 Hide distances; they no longer need to be publicly visible. 2014-05-29 17:46:25 -07:00
Andrzej Kapolka
67921c474e Merge branch 'master' of https://github.com/highfidelity/hifi into cascade 2014-05-29 17:09:09 -07:00
Andrzej Kapolka
0b4484a153 Trying a different way of determining the cascade threshold distances. 2014-05-29 16:49:51 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
AndrewMeadows
b849c07faf Merge pull request #2945 from huffman/19725 
Code Review for Job #19725
 2014-05-29 09:06:43 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Ryan Huffman
8f6ad2faab Add 'Load default scripts' button to preferences 2014-05-28 15:27:50 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
barnold1953
5665e4d278 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f Made Overlay appear as flat image in front of camera in Oculus Rift. It 
needs to be a curved surface instead.
 2014-05-27 16:13:56 -07:00
Mohammed Nafees
5055b18a4b Merge branch master from upstream 2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d Added OverlayRenderer class and moved displayOverlay from Application to 
OverlayRenderer.
 2014-05-27 11:19:45 -07:00
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
c362731226 Add support to load script engines not based on a file 2014-05-26 09:57:37 -07:00
Kai Ludwig
7fb9e3a7e6 spaces instead of tabs. 2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532 _voxelFades needs locking. 2014-05-23 20:21:00 +02:00
Mohammed Nafees
ad49b5c2e1 Show OS notification when user is not logged in 2014-05-22 16:53:07 +05:30
Ryan Huffman
2eeb3f5f2f Update loadScript to optionally activate main window 2014-05-21 16:56:51 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Philip Rosedale
d54ff7a2cf Merge pull request #2869 from huffman/19630 
Code Review for Job #19630
 2014-05-16 16:00:05 -07:00
Ryan Huffman
b48b8aab12 Merge branch 'master' of git://github.com/highfidelity/hifi into 19630 
Conflicts:
	interface/src/Application.cpp
 2014-05-16 11:48:58 -07:00
Andrzej Kapolka
6dd08ca1bf Working on joystick support using SDL. 2014-05-15 17:09:28 -07:00
Ryan Huffman
21819ce3b4 Merge branch '19630' of github.com:huffman/hifi into 19630 
Conflicts:
	interface/src/Menu.h
 2014-05-15 14:37:05 -07:00
Ryan Huffman
7a3826b72a Add Node border display 2014-05-15 14:35:01 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Andrzej Kapolka
498f9e73ac Merge branch 'master' of https://github.com/highfidelity/hifi into priority 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-05-14 10:23:44 -07:00
Ryan Huffman
d59bedfa96 Fix running scripts not properly updated when done programmatically 
Add a slot to Application to receive ScriptEngine::finished signals.
Notify the Running scripts widget of stopped scripts so it can properly
move them to the recent scripts list.
 2014-05-13 22:25:08 -07:00
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00
Stojce Slavkovski
ac8d27ee3a Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-11 09:53:22 +02:00
Andrzej Kapolka
b9fecb8b92 Wait for scripts to finish before restarting them. 2014-05-09 14:34:13 -07:00
Stojce Slavkovski
863a8887d3 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-08 20:29:26 +02:00
Stojce Slavkovski
a1c31522ba Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-08 20:09:36 +02:00
Philip Rosedale
2797d0ab3b removed hand trying to follow mouse and other cruft 2014-05-08 00:09:07 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Stojce Slavkovski
852756e84d Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-02 19:03:11 +02:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Thijs Wenker
9667748156 - Style fixes 
- ScriptHightlighting qouting RegEx fix (  "hello" + " " + "world" // the text between two quote entities isn't red anymore )
 2014-05-01 21:07:46 +02:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
Thijs Wenker
7125b6ab8e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
 2014-04-30 20:08:11 +02:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Thijs Wenker
2ba39f951a Merge branch '19561' of https://github.com/thoys/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-04-29 22:07:03 +02:00
Thijs Wenker
fc2ed9f9fb Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 22:03:51 +02:00
Thijs Wenker
df14e1e6e4 Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 21:51:20 +02:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -07:00
Stojce Slavkovski
fc6d1b6575 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-24 22:48:57 +02:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Stojce Slavkovski
e9962241be Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-23 18:12:49 +02:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Thijs Wenker
9faee0d82d - Style 
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
 2014-04-21 21:37:49 +02:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Stojce Slavkovski
550cf6b8ea Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-19 18:05:01 +02:00
Brad Hefta-Gaub
16cd2ca5c3 Merge pull request #2680 from SydoxX/master 
URL scheme to go to location
 2014-04-18 15:34:12 -07:00
Thijs Wenker
d2d3937e08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-18 20:58:36 +02:00
Stojce Slavkovski
27c2255adf Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-17 20:52:30 +02:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
Thijs Wenker
b2e969d1c5 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-17 13:03:44 +02:00
Konstantin
fca4e2abba Update Application.h 2014-04-17 00:09:58 +02:00
Konstantin
d55fb60862 Added urlGoTo 2014-04-17 00:03:33 +02:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
Stojce Slavkovski
4d0ed5796e Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-12 08:45:23 +02:00
Andrew Meadows
5ac7be8945 merge upstream/master -> andrew/inertia 2014-04-11 12:20:00 -07:00
Andrzej Kapolka
d6534d6026 Tweak to zoom on pushback. 2014-04-11 11:10:22 -07:00
Andrew Meadows
a436b59971 save settings for change in: identity, position 2014-04-10 17:14:51 -07:00
Philip Rosedale
e08dfeae2a Merge pull request #2642 from Atlante45/persistant_script_location 
Persistant script location
 2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b Merge pull request #2636 from ey6es/faceplus 
Basic Faceplus integration, cleanup for handling the various face trackers.
 2014-04-09 22:13:34 -07:00
Atlante45
fad71266a1 Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location 2014-04-09 17:35:12 -07:00
Stephen Birarda
cf47418d58 remove the audio scope 2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741 Some QSettings cleanup + persistant script location 2014-04-09 17:08:50 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ead05c4d99 Tab fixes. 2014-04-09 15:22:53 -07:00
Andrzej Kapolka
cbfaf9709e Faceplus fixes. 2014-04-09 15:18:22 -07:00
Andrzej Kapolka
28d3eae12b Move Faceplus reading to its own thread to avoid blocking the main one. 2014-04-09 14:52:27 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
stojce
8d45a53af9 Merge branch 'master' of https://github.com/worklist/hifi into 19507 
Conflicts:
	interface/interface_en.ts
 2014-04-09 19:53:48 +02:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face 
trackers.
 2014-04-08 18:03:49 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Mohammed Nafees
ba7c696786 child like behaviour for the widget 2014-04-08 23:38:49 +05:30
Andrzej Kapolka
38022d2440 Fix for voxelizing models. 2014-04-04 00:33:33 -07:00
Atlante45
d3ce2c7640 Added undo/redo support to the client 2014-04-03 16:51:08 -07:00
Atlante45
42f47f5db2 Some alphabetical cleaning 2014-04-03 16:48:56 -07:00
Lucas Crisman
793179dc72 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-03 16:24:32 -03:00
Mohammed Nafees
f3121e1bf6 Removed the animation, placed UI elements according to mockup 2014-04-03 22:33:45 +05:30
Mohammed Nafees
2ef8277d0f Make the widget move and resize along with the main window 2014-04-03 18:04:26 +05:30
Atlante45
4a1687c023 Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
 2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
ZappoMan
ec9884833b first cut at reflections 2014-04-02 17:45:34 -07:00
Andrew Meadows
aad945c180 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:45:01 -07:00
Mohammed Nafees
0fa910c61f fix ubuntu build error 2014-04-02 16:16:23 +05:30
Mohammed Nafees
5e8bd8d050 Resolve conflicts 2014-04-02 13:00:48 +05:30