Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 16:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22236 commits 75 branches 59 tags 1.2 GiB
Commit graph

22236 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
5975380892 Merge pull request #4266 from ZappoMan/bugfix 
fix color issues with quads
 2015-02-11 09:03:10 -08:00
Andrew Meadows
13c953494c Merge pull request #4264 from huffman/entity-resize 
Increase entity-resize timeout to 2 minutes
 2015-02-11 09:02:26 -08:00
Andrew Meadows
68c1e9ef71 Merge pull request #4260 from birarda/master 
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
 2015-02-11 09:02:18 -08:00
Andrew Meadows
d9b57de649 merge upstream/master into andrew/thermonuclear 2015-02-11 08:56:34 -08:00
Andrew Meadows
ac8db02029 add ShapeType to UI of entity properties editor 2015-02-11 08:54:35 -08:00
Andrew Meadows
b983f6fccf bump entity packet version 2015-02-11 08:52:49 -08:00
Andrew Meadows
ff27ab74ae expose _shapeType to script and server 2015-02-11 08:46:41 -08:00
Andrew Meadows
d89548312e manipulate the extents for SHAPE_TYPE_SPHERE 
The conversion from ShapeInfo to btShape MUST be reversable!
Otherwise we leak shapes in the ShapeManager class.
 2015-02-11 08:44:10 -08:00
Andrew Meadows
f4a4c9786c don't create shape for SHAPE_TYPE_NONE 2015-02-11 08:43:55 -08:00
Andrew Meadows
3239c259f9 remove commented out cruft 2015-02-11 08:43:19 -08:00
Andrew Meadows
123d73783b remove warning about unused variable 2015-02-11 08:42:36 -08:00
Triplelexx
e2f942c026 Coding standard fixes 
Corrected else format, removed additional comment to fit other
declarations and break block.
 2015-02-11 06:11:38 +00:00
Triplelexx
260f960ccc Indentation correction 
Indention was still incorrect I believe. 😢
 2015-02-11 03:49:28 +00:00
Triplelexx
837f8d71a4 Coding standard fixes 
Coding standard fixes

Indentation and space missing
 2015-02-11 03:17:28 +00:00
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d fix color issues with quads 2015-02-10 17:35:27 -08:00
Triplelexx
7a3ad615a4 Merge remote-tracking branch 'upstream/master' into #20300 2015-02-11 00:25:06 +00:00
Triplelexx
84d7ae6b3a Change conditional limit to >= 
edge case
 2015-02-11 00:18:08 +00:00
Triplelexx
93366e068f Remove all references to AUDIO_METER_INSET 
further cleaning
 2015-02-11 00:16:40 +00:00
Triplelexx
d59ee7c561 Removed meter inset 
changes to bar color make the inset very visible
 2015-02-10 23:57:09 +00:00
Triplelexx
e473661568 Fix meter showing out of bounds 
add conditional check for exception when audioLevel is NAN.
 2015-02-10 23:55:56 +00:00
Ryan Huffman
6eca8610b6 Increase entity-resize timeout to 2 minutes 2015-02-10 15:54:04 -08:00
Brad Hefta-Gaub
3e8f7dc3da Merge pull request #4263 from huffman/text-size 
Increase size of text entity
 2015-02-10 15:04:32 -08:00
Triplelexx
8e0ac763eb Changed color of audio bar background 
Worklist mentions:
Additionally, change the color of the bar to #4CC1B8 / 76,193,184
 2015-02-10 22:41:43 +00:00
Ryan Huffman
9997ef1b97 Increase size of text entity 2015-02-10 14:23:00 -08:00
Stephen Birarda
542283b4b2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-10 12:25:12 -08:00
Brad Hefta-Gaub
d84398524b Merge pull request #4258 from ctrlaltdavid/fix-windows-windowing 
Fix maximized Windows window unintentionally changing to windowed
 2015-02-10 12:01:29 -08:00
Brad Hefta-Gaub
cf5fb49562 Merge pull request #4261 from Atlante45/reverb_memory_leak 
Reverb memory leak
 2015-02-10 12:00:54 -08:00
Brad Hefta-Gaub
c06ca24819 Merge pull request #4259 from huffman/update-entity-list-style 
Update entity list style
 2015-02-10 11:50:17 -08:00
Stephen Birarda
d2d7507903 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-10 10:53:53 -08:00
Stephen Birarda
53f58ad382 add possibility of desktop GVR build 2015-02-10 10:51:20 -08:00
Thijs Wenker
525fe7881e Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-10 19:45:39 +01:00
Atlante45
562b289c05 Fix warning 2015-02-10 19:25:38 +01:00
Atlante45
438978b855 Fix reverb memory leak 2015-02-10 19:25:12 +01:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Andrew Meadows
8a7f130c5b Merge pull request #4257 from ZappoMan/bugfix 
fix a couple of bugs
 2015-02-10 09:27:50 -08:00
Andrew Meadows
26b4882ddf Merge pull request #4254 from birarda/master 
handle custom domain port if returned via place API
 2015-02-10 09:26:53 -08:00
Ryan Huffman
39cc6c86ae Update selected entity color to have more contrast 2015-02-10 09:03:48 -08:00
Ryan Huffman
8d65caaaef Update entity list search input to be full width with margin 2015-02-10 09:03:21 -08:00
Ryan Huffman
7ac3bd3ee8 Add padding to buttons in entity list 2015-02-10 09:02:53 -08:00
Atlante45
e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-02-10 16:08:34 +01:00
David Rowe
45c0d0e6a9 Fix Windows --url command line parameter handling 2015-02-09 23:50:43 -08:00
David Rowe
4fa2b3a6e9 Fix maximized Windows window unintentionally changing to windowed 
This stops a maximized Windows window changing to being windowed when
you click on a menu item.
 2015-02-09 22:07:12 -08:00
Sam Gateau
11beb51ec1 Clean up comments 2015-02-09 18:02:34 -08:00
ZappoMan
2f981686fa fix bad colors on windows 2015-02-09 15:38:50 -08:00
Sam Gateau
23a54b17ce Clean up comments 2015-02-09 15:33:55 -08:00
Sam Gateau
871f9a849a CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:30:17 -08:00
Sam Gateau
ed8d433ad5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-09 15:27:06 -08:00
Sam Gateau
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00