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

157 commits

Author SHA1 Message Date
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu 
Also did a bit of Header cleanup
 2015-01-18 07:14:52 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Stephen Birarda
79d214619d update lobby for new places API 2015-01-14 18:18:26 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
David Rowe
6c4932f9d0 Coding standard 2015-01-07 11:24:10 -08:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
369fdc5771 move audio toolbox into its own class 2014-12-16 15:24:57 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Stephen Birarda
3c6c37710d hook AudioScope to new Dependency Audio 2014-12-16 13:03:46 -08:00
Stephen Birarda
a9eaa4b9f7 more decoupling of Audio from Interface 2014-12-16 12:43:06 -08:00
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -08:00
DaveDubUK
7ab9dfbfe1 Window.nonBlockingForm-fix 2014-12-16 14:48:28 +00:00
DaveDubUK
9493440d32 Window.nonBlockingForm-fix 2014-12-16 13:33:10 +00:00
DaveDubUK
cd95f7bd23 Window.nonBlockingForm active status was not being tested correctly. Was causing unexpected fail on second attempt to show form 2014-12-16 13:20:11 +00:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
Stephen Birarda
1b48cf7f5a use DependencyManager for AddressManager 2014-12-15 14:54:20 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -08:00
ZappoMan
74a6fd5ca7 fix joystick pick 2014-12-09 20:03:00 -08:00
Atlante45
88a576f846 fix action events for gamepad; 2014-12-09 19:35:38 -08:00
Atlante45
7026af7b9a Centrilized Oculus interference in pickRay 2014-12-04 17:26:14 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -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
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Stephen Birarda
f9aed39352 don't try to open a joystick if controller is NULL 2014-11-11 18:17:24 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
3ec28f8e30 Add WindowScriptingInterface::doCreateWebWindow 2014-11-11 10:15:16 -08:00
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Ryan Huffman
bd61eba664 Remove unused include 2014-11-11 10:00:28 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00