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

66138 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gondelman
815260933a
Merge pull request #12642 from gcalero/android_change_default_mode 
Change default mode to My View in Android
 2018-03-14 13:47:16 -07:00
Simon Walton
d67044f220 EntityScriptServer should wait for script engine to finish when stopping 
Script engine will still running and using EntityEditPacketSender,
which is owned by EntityScriptServer, which was destroyed.
https://highfidelity.manuscript.com/f/cases/11071/
 2018-03-14 13:32:48 -07:00
Gabriel Calero
04decfa89c Merge remote-tracking branch 'upstream/master' into android_change_default_mode 2018-03-14 16:49:41 -03:00
Sam Gondelman
ba0c273614
Merge pull request #12641 from SamGondelman/android 
Update gpu-gles based on TAA PR
 2018-03-14 12:41:24 -07:00
Cristian Luis Duarte
80abe1865a Remove unused variable thisPointConsumed 2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a make same changes to gles backend from taa pr 2018-03-14 12:09:59 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
Zach Fox
6647475f5c Wrong sign 2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Zach Fox
6d45d69ed8 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-14 09:54:16 -07:00
Zach Fox
70b3d0fe5f Merge branch 'filterBar' into commerce_upgrades_1 2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Sam Gateau
2487e34ee8
Merge pull request #12633 from SamGondelman/aa 
Fix HUD sphere rendering after TAA changes
 2018-03-14 09:26:25 -07:00
Seth Alves
21088cfbcc Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 09:00:21 -07:00
Seth Alves
b55282e46a Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 08:51:17 -07:00
David Rowe
c1e256a4f3 Remove unused methods 2018-03-14 13:58:00 +13:00
David Rowe
966d711e56 Fix Window.raiseMainWindow() 2018-03-14 13:38:48 +13:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
David Rowe
025d2807f4 Fix Window.setFocus() JSDoc 2018-03-14 12:59:27 +13:00
David Rowe
c8b4217a96 Fix Window.hasFocus() 2018-03-14 12:57:23 +13:00
Seth Alves
602bc37b1a oops 2018-03-13 16:39:56 -07:00
Seth Alves
271badfa62 provide an overlay property to control if the overlay is visible in the secondary camera view 2018-03-13 16:33:32 -07:00
Zach Fox
882e4d6b45 Parse the string that comes from the backend 2018-03-13 15:13:41 -07:00
Ryan Huffman
0a00227ce3 Update message for failed bakes inside of AssetServer.cpp 2018-03-13 15:03:20 -07:00
SamGondelman
3b877db992 fix hud sphere 2018-03-13 14:58:29 -07:00
Ryan Huffman
c555590e9b Enable support for baking JS files inside of the oven 2018-03-13 14:57:35 -07:00
Ryan Huffman
5448099a93 Fix baker CLI not correctly exiting on failure 
We previusly were exiting while still inside of the QApplication ctor,
before the event loop had been started. This fixes that by queueing up
the baking to occur after the ctor has completed.
 2018-03-13 14:57:04 -07:00
Ryan Huffman
6ed89fb9cc Cleanup asset server versioning changes 2018-03-13 14:52:35 -07:00
Ryan Huffman
df8a25cbdc Add warning to AssetServer.h to update bake version in .cpp 2018-03-13 14:52:35 -07:00
Ryan Huffman
9a7497c9ec Update AssetServer to check for baking disabled on startup 2018-03-13 14:52:35 -07:00
Ryan Huffman
0003a32701 Fix AssetServer not detecting missing bakeVersion 2018-03-13 14:52:35 -07:00
Ryan Huffman
99c3e6cf78 Remove unused _temporaryFilesCreated from TextureBaker 2018-03-13 14:52:35 -07:00
Ryan Huffman
e38ef699cc Remove BakingVersion.h 2018-03-13 14:52:35 -07:00
Ryan Huffman
8a89e8f9fb Remove BakedTypeInfo 2018-03-13 14:52:35 -07:00
Ryan Huffman
6f3155db32 Fix existing baked assets not being recognized 2018-03-13 14:52:35 -07:00
Ryan Huffman
6ac8cdecd1 Re-enable js baking 2018-03-13 14:52:35 -07:00
Ryan Huffman
091dae730b Add versioning to Asset Server 2018-03-13 14:52:35 -07:00
Ryan Huffman
11a3a86af3 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2018-03-13 14:49:26 -07:00
Ryan Huffman
bcbe55d751 Fix OBJ support in DomainBaker 2018-03-13 14:30:42 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr 
Fixes for missing avatar on record replays
 2018-03-13 14:10:10 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
86115a8578 Merge branch 'master' of github.com:highfidelity/hifi into filterBar 2018-03-13 13:42:13 -07:00
Zach Fox
a949208988 Design tweaks 2018-03-13 13:23:32 -07:00
Zach Fox
5563edd957 Focus fix; Switch to QQC2 2018-03-13 13:11:59 -07:00
Sam Gateau
2dde65d74f
Merge pull request #12631 from SamGondelman/aa 
Apply TAA to text and web entities/overlays
 2018-03-13 13:00:42 -07:00
Zach Fox
50e709c738 Add updates; drop shadow 2018-03-13 12:13:14 -07:00