Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21971 commits 29 branches 0 tags 1.1 GiB
Commit graph

7194 commits

Author SHA1 Message Date
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Andrew Meadows
5113258d72 Merge pull request #4279 from birarda/android 
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
 2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Stephen Birarda
e3475d4d7f Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-13 10:19:00 -08:00
Stephen Birarda
13fc0b1fcd fix AudioInjector debug line to be more clear 2015-02-13 09:36:16 -08:00
Stephen Birarda
6c25205856 fix audio cleanup and close action in Application 2015-02-12 13:35:22 -08:00
Stephen Birarda
ff6f8ea4a1 cleaner cleanup of AudioClient from RenderingClient 2015-02-12 13:14:30 -08:00
Stephen Birarda
5f4e3528c2 override seek to handle warning once stopped 2015-02-12 11:29:55 -08:00
Stephen Birarda
060b0bbfd6 tell injector it is not finished once restarted 2015-02-12 11:13:03 -08:00
Stephen Birarda
ea52cea5dd more cleanup for AudioInjector mem management 2015-02-12 10:56:40 -08:00
Stephen Birarda
7becf62ba9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub
fa5eebd93e Merge pull request #4269 from AndrewMeadows/thermonuclear 
ModelEntityItem gets _shapeType
 2015-02-12 10:06:01 -08:00
Andrew Meadows
7304585103 Merge pull request #4271 from huffman/fix-overlays-text-size 
Fix overlays text size
 2015-02-12 09:35:37 -08:00
Andrew Meadows
357dd963f3 Merge pull request #4273 from ZappoMan/bugfix 
fix the quad color being broken after rendering text
 2015-02-12 09:00:16 -08:00
Andrew Meadows
b4bd60e979 give TextEntityItem a box collision shape 2015-02-12 08:28:34 -08:00
Stephen Birarda
43e777163e use a QPointer to trigger delayed delete 2015-02-11 19:15:33 -08:00
Stephen Birarda
79674fb94f use a wrapper on audio injector for script ownership 2015-02-11 17:20:00 -08:00
Stephen Birarda
449719bc7c add option to restart a local audio injector 2015-02-11 16:58:30 -08:00
Stephen Birarda
f9174366dc fixes for new injector API in other scripts 2015-02-11 16:20:48 -08:00
Stephen Birarda
4894a5b414 better handling of cleanup for local injector 2015-02-11 16:11:55 -08:00
Stephen Birarda
0498c5c708 provide old ASI APIs in AudioInjector 2015-02-11 15:57:32 -08:00
Stephen Birarda
7b485829c4 cleanup AudioInjector memory management 2015-02-11 15:52:00 -08:00
ZappoMan
7a45b1bc96 fix the quad color being broken after rendering text 2015-02-11 15:50:04 -08:00
Andrew Meadows
9f59addbc2 merge upstream/master into andrew/thermonuclear 2015-02-11 13:35:28 -08:00
Andrew Meadows
8b34283d76 fix missing comma 2015-02-11 13:21:57 -08:00
Ryan Huffman
341e31a074 Remove extraneous initialized check 2015-02-11 13:08:11 -08:00
Andrew Meadows
4581802532 explicitly flag virtual functions as such 2015-02-11 13:03:22 -08:00
Andrew Meadows
bd1817817b restore order of PROP_USER_DATA 2015-02-11 12:59:59 -08:00
Ryan Huffman
51ff897ee5 Update Font to not setup GL until first draw 2015-02-11 12:59:12 -08:00
Brad Hefta-Gaub
9a7ed8055f Merge pull request #4267 from samcake/master 
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
 2015-02-11 09:45:29 -08:00
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
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
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
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
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
Sam Gateau
11beb51ec1 Clean up comments 2015-02-09 18:02:34 -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
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00
Stephen Birarda
5f7c4278b8 handle custom domain-server port if it is present 2015-02-09 13:01:38 -08:00