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

54394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
7acdc86644 Progress 2017-04-27 14:01:05 -07:00
Zach Fox
0860352caa Checkpoint before switching to crash duty 2017-04-27 14:01:05 -07:00
Howard Stearns
88c3b4d9d3 Merge pull request #10258 from howard-stearns/watch-for-announcements 
watch for announcements
 2017-04-27 14:00:39 -07:00
Howard Stearns
5d6e24b495 Merge pull request #10253 from howard-stearns/new-address-bar 
New address bar
 2017-04-27 14:00:24 -07:00
David Kelly
539cd96520 Merge pull request #10303 from davidkelly/dk/locationThreadingIssue 
Thread safety for sending location
 2017-04-27 13:30:38 -07:00
Andrew Meadows
5cf233db3a less labyrinth 2017-04-27 13:16:50 -07:00
Andrew Meadows
aa90a6bd02 use static methods for setting avatar debug options 2017-04-27 13:16:50 -07:00
Andrew Meadows
75b563d598 restore rendering of avatar receive stats 2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7 remove unused RenderArgs::_cameraMode hack 2017-04-27 13:16:50 -07:00
Andrew Meadows
00b05ed137 connect menu options to avatar render features 2017-04-27 13:16:50 -07:00
Andrew Meadows
823f3a73c6 remove commented out cruft 2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538 restore RecordingScriptingInterface to Application 2017-04-27 13:16:50 -07:00
Andrew Meadows
caf6a77baf repair bad merge during rebase 2017-04-27 13:16:50 -07:00
Andrew Meadows
2441536de3 remove Avatar dependency on AvatarMotionState 2017-04-27 13:16:49 -07:00
Andrew Meadows
aceac12398 use 'using' instead of 'typedef' 2017-04-27 13:11:57 -07:00
Andrew Meadows
010d1dfa22 remove Menu dependency from Avatar class 2017-04-27 13:11:57 -07:00
Andrew Meadows
6393972874 remove AvatarManager dependency from Avatar 2017-04-27 13:11:57 -07:00
Andrew Meadows
65682a914d remove cufty AvatarManager LocalLights feature 2017-04-27 13:11:57 -07:00
Andrew Meadows
4c212fb1e5 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-27 13:11:57 -07:00
Seth Alves
b0c12dd84a warn rather than crash if we get unexpected action data 2017-04-27 13:04:47 -07:00
Ryan Huffman
4b0bd80c27 Fix NetworkTexture not cleaning itself up on destruction 2017-04-27 13:03:42 -07:00
Ryan Huffman
d8e4604b18 Fix gpu access of ktx file not being thread-safe 2017-04-27 13:03:04 -07:00
howard-stearns
e4f259e630 back to non-fake data 2017-04-27 13:01:33 -07:00
Seth Alves
351cd54b42 remove debug print 2017-04-27 12:58:42 -07:00
howard-stearns
56196c03a3 pr review 2017-04-27 12:56:32 -07:00
Seth Alves
203a14f2a0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 12:56:11 -07:00
David Kelly
63468cc9e1 Thread safety for sending location 2017-04-27 12:20:56 -07:00
howard-stearns
97777a416d Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar 2017-04-27 12:02:02 -07:00
Ryan Huffman
149f87e734 Fix style in NetworkTexture 2017-04-27 12:01:55 -07:00
Ryan Huffman
42da429414 Fix NetworkTexture self possibly being null when attempting request 2017-04-27 12:01:37 -07:00
Chris Collins
9f688a08cd Merge pull request #10302 from Atlante45/new-master 
Pull stable back into master
 2017-04-27 11:51:46 -07:00
Philip Rosedale
f555291d92 Merge pull request #10296 from Triplelexx/21296 
21296 - Move two menu items
 2017-04-27 11:37:07 -07:00
samcake
69a90d6f86 work in progress 2017-04-27 11:24:09 -07:00
Atlante45
4e0780387f Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-04-27 11:20:18 -07:00
anshuman64
04f97431f4 Merge pull request #10287 from highfidelity/update-qt-win-build-guide 
Update Build Guides with Qt 5.6.2
 2017-04-27 10:59:16 -07:00
Anshuman Dewangan
521db82ed0 Use generic dir syntax 2017-04-27 10:56:56 -07:00
samcake
35e216ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-27 10:38:25 -07:00
Seth Alves
0435749f82 Merge pull request #10210 from volansystech/21200 
21200 Transfer from far-grab to near grab when close
 2017-04-27 10:32:10 -07:00
ZappoMan
829fa2b323 Merge branch 'master' of https://github.com/highfidelity/hifi into poseFilters 2017-04-27 08:17:59 -07:00
Seth Alves
68b59e4601 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b expose bullet slider constraint to javascript 2017-04-27 07:56:35 -07:00
Vladyslav Stelmakhovskyi
1916eafc41 Trigger rebuild 2017-04-27 16:02:47 +02:00
Sam Cake
d99f635880 still finding a good implementation for the compressed texel copy 2017-04-27 02:08:48 -07:00
Vladyslav Stelmakhovskyi
0d53b82326 Renamed EDIT to CREATE 2017-04-27 09:30:00 +02:00
volansystech
87ceebca82 Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-04-27 12:58:18 +05:30
Sam Cake
63c5eea26a merging with the new master 2017-04-26 22:39:46 -07:00
Chris Collins
6ecbaff56e Merge pull request #10297 from ZappoMan/retrySkeletonURL 
format and spelling changes
 2017-04-26 21:58:51 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
Chris Collins
df7cb09fe4 Merge pull request #10255 from ZappoMan/retrySkeletonURL 
Fix two cases for avatars stuck in T-Pose
 2017-04-26 21:38:19 -07:00
Chris Collins
b2870be25c Merge pull request #10256 from jherico/fix_stored_size 
Fix excessive copying when querying the size of a KTX backed texture
 2017-04-26 21:31:19 -07:00