Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 12:07:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9740 commits 76 branches 59 tags 1.2 GiB
Commit graph

5298 commits

Author SHA1 Message Date
Andrzej Kapolka
8be17bf02a Attempting to get Visage building in on OS X. 2014-02-18 14:27:06 -08:00
Andrzej Kapolka
036230ec8d Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-18 13:59:31 -08:00
ZappoMan
5cf0ad46e7 Merge pull request #2000 from gaitat/master 
Worklist Job #19503
 2014-02-18 09:47:26 -08:00
Atlante45
710a960a35 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-18 09:37:54 -08:00
stojce
7621d70c24 use base class - replaced MyAvatar with Avatar 2014-02-18 08:11:59 +01:00
stojce
d36ced9b92 fixed misplaced #endif 2014-02-18 07:33:03 +01:00
Andrzej Kapolka
1d7f1afa5b Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-17 21:48:21 -08:00
stojce
6c2f3b687e removed unnecessary references 2014-02-18 01:50:55 +01:00
Jose Carlos
0ec554ec82 Added fadein and fadeout animations for display name 2014-02-18 00:49:26 +01:00
Jose Carlos
e7b54a9ef4 merged from master 2014-02-17 21:59:53 +01:00
ZappoMan
44b60c92a1 Merge branch 'master' of https://github.com/worklist/hifi into voxelnotshownbug 2014-02-17 12:41:13 -08:00
Atlante45
96a160bade Moved some code in ImportDialog.cpp for consistency 2014-02-17 12:35:42 -08:00
stojce
c57cae6437 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 21:20:42 +01:00
stojce
0df0c23c32 Windows build fix (3) 2014-02-17 21:14:28 +01:00
Andrew Meadows
48f28ecee7 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 
Conflicts:
	interface/src/Menu.h
	interface/src/avatar/Avatar.cpp
 2014-02-17 12:12:47 -08:00
ZappoMan
ab3e1af64d fix the sometime voxels don't show when you move bug 2014-02-17 12:02:11 -08:00
Andrew Meadows
bca50a5b70 Split render options for head/body collision proxy 
This makes the poor proxy shapes easier to see.
 2014-02-17 11:23:01 -08:00
stojce
677e6f5ce9 windows build fix (2) 2014-02-17 20:19:35 +01:00
Andrew Meadows
d635ffaaba Remove cruft: old avatar-avatar collision option 2014-02-17 10:40:32 -08:00
Andrew Meadows
6ce028bbab Simplifiy API for camera mode transitions 
Specify the "period" for the transition rather than the "rate".
 2014-02-17 10:27:33 -08:00
stojce
2ba7426757 windows build fix 2014-02-17 19:25:53 +01:00
stojce
9e7597a6ad bad merge fix 2014-02-17 19:06:55 +01:00
stojce
13485065a5 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 18:59:44 +01:00
Andrew Meadows
4848aa1d16 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-17 09:14:06 -08:00
Andrew Meadows
e4ef09e06d Helper method for adding avatar collision submenu 2014-02-17 09:12:38 -08:00
ZappoMan
dd0909659a Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-16 19:20:06 -08:00
Philip Rosedale
37e1c00828 Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop 
Automatically Adjust LOD
 2014-02-16 18:14:24 -08:00
ZappoMan
d101f19e40 removed bounds properties from Overlay so it only lives in Overlay2D 2014-02-16 13:39:01 -08:00
ZappoMan
78f4df912d added 3D line overlay support 2014-02-16 13:25:49 -08:00
Jose Carlos
73e0c0ccf5 Moving pow evaluation to const 2014-02-16 21:33:46 +01:00
ZappoMan
7c350b3acb add 3D sphere overlay support 2014-02-16 12:30:15 -08:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36:06 -08:00
Jose Carlos
a8f1f9a00a Added animation for fade out 2014-02-16 14:25:41 +01:00
ZappoMan
cb1c659e2e fix windows 2014-02-15 21:25:20 -08:00
ZappoMan
ef11865d24 implement text overlay support 2014-02-15 21:13:44 -08:00
gaitat
e30cf33a03 Fix for Worklist Job #19503 
Formatting errors
 2014-02-15 23:04:58 -05:00
ZappoMan
0a9f9a7c7a fix windows build 2014-02-15 19:20:08 -08:00
ZappoMan
37bb85fca6 tweaks to overlays 2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145 add support for detecting clicked on overlays 2014-02-15 17:45:42 -08:00
ZappoMan
1ddd856ca8 removed getProperties() which was not implemented 2014-02-15 16:31:09 -08:00
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -08:00
Jose Carlos
af48998cc7 Fixed position of display name: we take into account skeleton and head's height 
Saved opengl state in renderDisplayName
Moved display data to AvatarData
Unified static chat function for chat and display name
 2014-02-15 18:40:36 +01:00
gaitat
fcd44f5817 Fix for Worklist Job #19503 2014-02-15 08:16:05 -05:00
gaitat
eee839f423 Merge branch 'master' of github.com:highfidelity/hifi 2014-02-14 20:12:39 -05:00
Andrew Meadows
2d1218d304 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-14 16:34:32 -08:00
Andrew Meadows
335141049c Cleaning up collision check API's and re-enabling collisions with particles. 2014-02-14 16:33:19 -08:00
Andrew Meadows
b7352335f2 Adding collisions options to menu at a second location. 
And adding CollideWithParticle option which will be working soon...
 2014-02-14 16:31:53 -08:00
Jose Carlos
19cb20f0cd Added rect around the display name with proper size, paying attention to 
QFontMetrics data
Fully wired up the message sending and receiving from server
 2014-02-15 01:05:21 +01:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
Andrzej Kapolka
855bc19c5a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 15:36:13 -08:00
Andrzej Kapolka
af0d395751 Added sanity check for zero vertices. 2014-02-14 13:11:16 -08:00
Andrzej Kapolka
76142c92f2 Adjust offset when skipping parts that don't match the translucency setting. 
Closes #2001.
 2014-02-14 13:04:17 -08:00
Jose Carlos
04c59b825e merged from master 2014-02-14 20:52:22 +01:00
Andrzej Kapolka
f4b47ea443 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 11:09:35 -08:00
ZappoMan
8e284a55b1 Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-14 10:50:35 -08:00
stojce
0ddc475928 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-14 18:30:54 +01:00
stojce
d5b87fbe8a Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-14 18:28:34 +01:00
gaitat
58e773340a Worklist Job #19503 
Exposing the average audio intensity to javascript through the MyAvatar
object.
 2014-02-14 09:40:59 -05:00
ZappoMan
cd137b2b12 tweak to reload scripts 2014-02-13 21:00:20 -08:00
ZappoMan
9d841ce918 add Stop All Scripts and Reload All Scripts 2014-02-13 18:19:20 -08:00
Andrzej Kapolka
91fac4eebe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 17:38:23 -08:00
Andrzej Kapolka
1afd3ab712 Fixes for OS X warnings. 2014-02-13 17:07:57 -08:00
Andrzej Kapolka
1fba28d45e Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-13 16:51:44 -08:00
Andrzej Kapolka
b08d452749 Fix for head appearing at wrong position for a single frame. 2014-02-13 16:49:42 -08:00
Andrzej Kapolka
5f38c328d5 Removed debugging code. 2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d Add some hysteresis on the LOD switching to prevent rapid switching back 
and forth.
 2014-02-13 16:20:43 -08:00
Jose Carlos
b899834c54 Show "displayname" in correct position 
Show "displayname" when on mouse hover
Persistant displayname data
 2014-02-14 00:23:21 +01:00
ZappoMan
601c155303 correctly lock arrays on init 2014-02-13 14:46:59 -08:00
ZappoMan
ed7fa6e311 added back setupNewVoxelsForDrawing() on changeTree() 2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425 removed some debug 2014-02-13 14:33:23 -08:00
ZappoMan
caab3afb69 add menu item for auto adjust LOD 2014-02-13 14:26:30 -08:00
Andrzej Kapolka
ff01470850 Wait until each LOD level is actually requested before we start loading; 
before a level is loaded, try to use the closest already-loaded level.
 2014-02-13 14:25:01 -08:00
Andrew Meadows
50d864901e Improved comment about limitation of collision check. 2014-02-13 14:02:25 -08:00
stojce
ab4164a6df #19505 - Add domain & orientation parsing to hifi:// protocol handler 2014-02-13 22:44:10 +01:00
Andrzej Kapolka
684a43da64 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 13:40:17 -08:00
Andrzej Kapolka
6a39290bf5 Basic LOD switching based on distance to camera. 2014-02-13 13:37:29 -08:00
ZappoMan
3aba29b015 first working cut at recreateVoxelGeometryInView() 2014-02-13 13:26:31 -08:00
ZappoMan
cac67d7baa add proper readWriteLocks around the VBO arrays to preven random triangles 2014-02-13 13:06:45 -08:00
Andrew Meadows
439cbe3f87 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Hand.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-13 12:36:01 -08:00
Andrew Meadows
b75de42802 Making the lean recovery use more tuneable parameters. 2014-02-13 12:22:40 -08:00
Andrew Meadows
d9b50359a6 Hand-face collisions now work (sorta). 2014-02-13 12:21:28 -08:00
ZappoMan
e9259db944 Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop 2014-02-13 12:20:29 -08:00
stojce
08c8f47cd4 added SNAPSHOT_EXTENSION constant 2014-02-13 20:05:59 +01:00
ZappoMan
156fa6dc5a more tweaks, removed old clouds 2014-02-13 11:03:35 -08:00
ZappoMan
6d75efd2b0 tweaks to default menus for alpha, make Gravity false so we don't fall into abyss 2014-02-13 10:46:28 -08:00
Andrzej Kapolka
23169c098e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 10:27:36 -08:00
Andrew Meadows
312bc7521f Making arm restoration rate independent of FPS and easier to tune. 2014-02-13 10:04:58 -08:00
Andrew Meadows
9523ea7d03 Only do slaps for MyAvatar. 2014-02-13 10:03:39 -08:00
Andrew Meadows
e793c207f9 Minor whitespace removal. 2014-02-13 10:03:14 -08:00
stojce
fe6f5a341c Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-13 18:14:20 +01:00
stojce
e5072bc00f Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-13 18:12:40 +01:00
ZappoMan
5ad74a04f1 Merge pull request #1989 from PhilipRosedale/master 
Improved EditVoxels script, improve and cleanup noise reduction
 2014-02-13 00:14:40 -08:00
Philip Rosedale
50df17dc10 fix windows build buster 2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72 comment out debug 2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723 Adjustments to noise gate, commit to min sampling method 2014-02-12 22:53:46 -08:00
ZappoMan
20a6f4eea9 first cut at auto-LOD adjustment 2014-02-12 21:22:21 -08:00
ZappoMan
d6b71f19a8 fix voxel texture to work better with larger TREE_SCALE 2014-02-12 18:00:09 -08:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
stojce
0244ead5df fixed glm::quat initialization 2014-02-12 21:06:30 +01:00
stojce
f002cda1de Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-12 17:53:07 +01:00