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

9903 commits

Author SHA1 Message Date
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -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
d84f57fafa merge upstream/master into andrew/thermonuclear 2014-11-26 12:18:19 -08:00
Andrew Meadows
cda8ac85c1 EntityCollisionSystem moves to interface 
and interface connects EntityCollision system to EntityTree
 2014-11-26 12:15:24 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
Brad Hefta-Gaub
b136f4c649 Merge pull request #3867 from AndrewMeadows/bispinor 
don't lookup entity by ID when deleting script
 2014-11-26 11:07:07 -08:00
Andrew Meadows
419e00cbdc fix typo from overwrite of gverb/readme.txt 2014-11-26 10:41:23 -08:00
Andrew Meadows
3262c9a8bd don't lookup entity when deleting script 2014-11-26 10:27:03 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw 
Update entity tools to draw grabbers in front
 2014-11-25 12:55:16 -08:00
Ryan Huffman
0b23b57e1e Update border comment in Cube3DOverlay 2014-11-25 12:43:01 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw 
Overlay Front Draw
 2014-11-25 12:27:21 -08:00
Ryan Huffman
2cb30c2157 Update color used for Cube3DOverlay border 2014-11-25 12:17:46 -08:00
Ryan Huffman
f8c8ed868e Update float that should be bool 2014-11-25 12:08:48 -08:00
Ryan Huffman
c5f2b3b588 Add borderSize to Cube3DOverlay 2014-11-25 12:05:13 -08:00
AndrewMeadows
450b365bb6 Merge pull request #3860 from ZappoMan/cleanupMenus 
remove spatial audio menu items
 2014-11-25 11:28:18 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
Ryan Huffman
4febc45b6a Add drawInFront to Base3DOverlay::getProperty 2014-11-25 08:44:38 -08:00
Ryan Huffman
925c2a8f6c Update array to use pointers 2014-11-25 08:34:44 -08:00
Ryan Huffman
8b982872c2 Add calls to Overlays::render3DFront() 2014-11-24 23:19:53 -08:00
Ryan Huffman
0b46e35f31 Add support for separate list of 3d overlays to be drawn in front 2014-11-24 23:19:17 -08:00
Ryan Huffman
1d865ace9d Add drawInFront property to Base3DOverlay 2014-11-24 21:16:29 -08:00
David Rowe
732ad8f993 Use valid font for Windows so that '-'s are displayed 2014-11-24 18:33:10 -08:00
David Rowe
01867e2459 Display "--" for ping values if not yet valid 2014-11-24 18:32:47 -08:00
Sam Gateau
1f10a44ae4 More typos in glsl 2014-11-24 15:38:12 -08:00
Sam Gateau
6a63099a0f Fixed syntax issues and review critics, put all the debugging code in a #define block 2014-11-24 15:24:20 -08:00
Sam Gateau
68e2df8fc2 add a emissive parameter value to the lightmap shaders 2014-11-24 14:35:42 -08:00
ZappoMan
08772bbae0 remove spatial audio menu items 2014-11-24 13:07:22 -08:00
Sam Gateau
f67b4b9ff4 clean out comments so the 2 rendering modes for entities work, scene batch or per model batch 2014-11-24 11:44:54 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
Sam Gateau
6591f4dac2 adjust lighmap shading equation 2014-11-24 11:18:21 -08:00
Sam Gateau
8b23a2cd1e adding the shader files for the lightmap case 2014-11-24 10:33:31 -08:00
Sam Gateau
1f22d5b493 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-24 10:05:39 -08:00
Philip Rosedale
137642f8a5 Merge pull request #3858 from ZappoMan/modelSceneRendering 
make render entities as scene the default
 2014-11-23 14:08:25 -08:00
ZappoMan
2e9a9bf5c2 make render entities as scene the default 2014-11-23 12:01:58 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
5ea6973fe7 fix isFacingAvatar for 3d text overlays 2014-11-23 10:53:03 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -08:00
Andrzej Kapolka
41eaf340c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-21 12:47:26 -08:00
Andrzej Kapolka
296718e2aa Removed redundant members, clarified class names, used better hash factors. 2014-11-21 12:46:24 -08:00
David Rowe
9e32b2c64e Suppress Windows C4305 compiler warnings in gverb includes 2014-11-20 20:58:31 -08:00
Andrzej Kapolka
87cc565c1a I believe this should be a better hash function for the voxel coordinates. 2014-11-20 18:16:57 -08:00
Philip Rosedale
e07f53d022 remove unused test audio filters 2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce simplify audio scope menu(s) 2014-11-20 19:34:56 -06:00
Andrzej Kapolka
2adb519193 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 17:34:51 -08:00
Philip Rosedale
9a9f6bc485 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 19:20:57 -06:00