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

9494 commits

Author SHA1 Message Date
Ryan Huffman
2ebca0a659 Add Grid3DOverlay 2014-11-11 09:50:25 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Stephen Birarda
a86ccfd603 Merge pull request #3725 from ZappoMan/entityScriptsAndEvents 
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
 2014-11-03 15:51:33 -08:00
ZappoMan
60182a78cb CR feedback 2014-11-03 15:42:40 -08:00
ZappoMan
2dae78b82c CR feedback 2014-11-03 15:40:09 -08:00
ZappoMan
bc329a6394 remove blank line 2014-11-03 15:34:30 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Andrew Meadows
92a6609ac0 simpler tuning system for walk velocities 2014-11-03 11:31:04 -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
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
AndrewMeadows
43a33730ea Merge pull request #3713 from ey6es/metavoxels 
Allow heightfield color/material layers to be of different resolutions than the height layer.
 2014-11-03 11:00:58 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
AndrewMeadows
b246af7511 Merge pull request #3712 from ctrlaltdavid/fix-log-file-eols 
Fix log file missing end of lines
 2014-11-03 08:44:23 -08:00
ZappoMan
4db5986625 support for url or text based scripts 2014-11-01 11:40:06 -07:00
ZappoMan
87a5423b35 support changing scripts on the fly and reloading them accordningly 2014-11-01 10:57:12 -07:00
ZappoMan
e8c694f02e args for more methods 2014-10-31 16:38:51 -07:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
David Rowe
ccc5e0d6ca Increase Interface's disk cache from default 50MB to 10GB 2014-10-31 10:06:43 -07:00
David Rowe
29eeeb3384 Fix log file missing end of lines 2014-10-31 09:24:50 -07:00
Andrzej Kapolka
8ce9521604 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 16:52:42 -07:00
Andrzej Kapolka
fd12c7a0d7 One more piece of the resolution puzzle. 2014-10-30 16:52:19 -07:00
ZappoMan
e78ac4c1d4 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 16:36:19 -07:00
ZappoMan
5e21701a5b fix possible deadlocks 2014-10-30 15:22:50 -07:00
ZappoMan
915a0d52d4 only remap textures on the render thread, fix deadlock, and improve handling of changes to textures 2014-10-30 15:01:59 -07:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8 Merge pull request #3706 from huffman/entity-tool-help 
Add edit entities help window
 2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Andrzej Kapolka
c46d0f4d56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 11:37:36 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Stephen Birarda
14f216e9c7 set imageURL in ImageOverlay when imageURL is changed 2014-10-30 10:05:31 -07:00
Stephen Birarda
45763a96d7 Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays 
Shadows to3 d overlays
 2014-10-30 09:21:25 -07:00
ZappoMan
2570caca40 move 3D overlay rendering into the render portion that supports lighting and shadows 2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub
e314fa1fc3 Merge pull request #3652 from ctrlaltdavid/19976 
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
 2014-10-29 20:46:12 -07:00
Andrzej Kapolka
754d1a2802 Another resolution fix. 2014-10-29 16:55:55 -07:00
Brad Hefta-Gaub
615664c8b3 Merge pull request #3692 from AndrewMeadows/inertia 
use Qt::AutoConnection for Avatar::setFoo() methods
 2014-10-29 13:52:02 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Andrzej Kapolka
37569dadd5 More resolution bits. 2014-10-29 13:00:32 -07:00
Brad Hefta-Gaub
333375ccae Merge pull request #3691 from AndrewMeadows/inertia 
smoother avatar motion at low velocities
 2014-10-29 12:54:58 -07:00
Andrew Meadows
9ddd05ca72 smoother avatar motion at low velocities 2014-10-29 12:13:07 -07:00
Stephen Birarda
5b3897f1cf Merge pull request #3690 from ZappoMan/rayPickSubMeshes 
Ray pick sub meshes
 2014-10-29 12:10:29 -07:00
ZappoMan
ac3a963eca fix build buster 2014-10-29 12:01:43 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00