Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 01:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36161 commits 73 branches 59 tags 1.2 GiB
Commit graph

36161 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20:06 -08:00
Clément Brisset
0be35ec6ea Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix 
MyAvatar.clearJointData bug fix
 2015-12-07 12:18:28 -08:00
Howard Stearns
289c8d6137 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 11:54:33 -08:00
Howard Stearns
fc1f312851 Merge branch 'fix-render-rate' into fix-sync-period-calc 2015-12-07 11:54:25 -08:00
Howard Stearns
2f27afd2e5 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-07 11:51:10 -08:00
Howard Stearns
b82b18fd2e Merge branch 'fix-render-rate' into correct-target-frame-rate 2015-12-07 11:50:57 -08:00
Howard Stearns
72ce46af59 Mac-only. 2015-12-07 11:46:36 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -08:00
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -08:00
Howard Stearns
8666cdd689 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate 2015-12-07 11:27:30 -08:00
Howard Stearns
17ecf9b6b7 debugging 2015-12-07 11:26:56 -08:00
Howard Stearns
8303b63491 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984 Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away). 2015-12-07 10:01:46 -08:00
Clément Brisset
390836b64e Merge pull request #6431 from huffman/proto-received-message 
Combine Packet and PacketList into ReceivedMessage on receiving end
 2015-12-07 09:58:52 -08:00
Brad Hefta-Gaub
3240c1dbfe Merge pull request #6577 from Atlante45/master 
Fix UNIX warnings
 2015-12-07 09:50:00 -08:00
Ryan Huffman
dd6c8cbe33 Remove verbose piggyback logging 2015-12-07 09:42:04 -08:00
Howard Stearns
34de4d67d8 DisplayPlugin::getLastSynchronizedElapsed 2015-12-07 09:32:12 -08:00
Howard Stearns
df413c0b14 Temporary debugging aids. 2015-12-07 09:31:06 -08:00
Atlante45
cdf621e8d0 Remove unnecessary moveToThread to remove warning 2015-12-07 09:11:41 -08:00
Anthony J. Thibault
fd4ed29405 MyAvatar.clearJointData bug fix 
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
 2015-12-07 09:03:40 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Ryan Huffman
c2049e5308 Fix udt-test to work with ReceivedMessage updates 2015-12-07 08:52:23 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00
Atlante45
18198cb6fb Fix missing override 2015-12-07 08:36:49 -08:00
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click 
No more right-click-move editing in edit.js
 2015-12-07 08:29:01 -08:00
Seth Alves
60b8e65520 get file dialog working on Linux 2015-12-07 06:03:58 -08:00
Seth Alves
f6b1ef85b3 remap entity IDs on export also 2015-12-07 06:03:47 -08:00
Seth Alves
f53571ac81 remap IDs on export, also 2015-12-07 05:41:34 -08:00
Seth Alves
96e9580473 change some more parameters back to being pass-by-reference, where it's safe 2015-12-07 05:30:19 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
Seth Alves
3cc423ca03 remap IDs when importing entities 2015-12-06 17:55:48 -08:00
Seth Alves
f0fb9966ad expose parent-joint-index to edit.js 2015-12-06 12:34:41 -08:00
Seth Alves
fff4e3e831 make SpatiallyNestable setters take values by reference 2015-12-06 12:01:30 -08:00
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Seth Alves
edc312199d rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit# 2015-12-06 06:16:47 -08:00
Seth Alves
50f5de3d83 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-06 05:44:32 -08:00
Seth Alves
9a80c4d681 call locationChanged on children of joints when joints change 2015-12-06 05:43:23 -08:00
Seth Alves
138125faab fix-up parentJointIndex in terse logging 2015-12-06 05:42:51 -08:00
Brad Hefta-Gaub
549059dd97 Merge pull request #6571 from imgntn/earthquakes_live 
Earthquakes Live 1.0: Visualization of USGS Earthquake Data for Past Day
 2015-12-05 19:09:05 -08:00
Howard Stearns
b008f2d35e Merge branch 'fix-render-rate' into correct-target-frame-rate 2015-12-05 17:51:58 -08:00
James B. Pollack
378b71d701 dont spin by default 2015-12-05 17:51:55 -08:00
James B. Pollack
7859241ad3 spin the earth for fun 2015-12-05 17:43:13 -08:00
James B. Pollack
906540272e disable collisions for now because of shapetype 2015-12-05 17:39:43 -08:00
Howard Stearns
188c477f7e Fix render rate. 
Depending on how the threads get assigned, the actual render rate (not just the stats) could be as little as a third of what is targetted.

That's because the code was insisting on an empty texture escrow before our update/render cycle could begin, and otherwise just waits for the next whole cycle.
On my MacbookPro, this was regularly giving a render average of 20fps instead of 60.
 2015-12-05 17:32:32 -08:00
James B. Pollack
30b32765b9 make earth grabbable to show parenting 2015-12-05 17:32:02 -08:00
James B. Pollack
ade32cbf61 remove collisions and add parenting 2015-12-05 17:30:38 -08:00
James B. Pollack
a899fe0e1b fix typo 2015-12-05 17:26:11 -08:00
James B. Pollack
945b5bd00f cleanup 2015-12-05 17:11:27 -08:00
James B. Pollack
d518def974 poll by default 2015-12-05 17:01:54 -08:00
James B. Pollack
7fc3d0f34e header 2015-12-05 16:58:50 -08:00