Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 07:05:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
42767 commits 71 branches 56 tags 1.2 GiB
Commit graph

42767 commits

Author SHA1 Message Date
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
samcake
dd189747f5 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-25 09:41:44 -07:00
Brad Hefta-Gaub
88ab52d340 Merge pull request from hyperlogic/tony/avatar-look-at-fixes 
Fixes for avatar eye tracking.
 2016-04-23 17:04:15 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request from AndrewMeadows/supress-spurious-logs 
reduce warnings about truncated kinematic timesteps
 2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
21b324e1f3 Merge pull request from birarda/new-default-av 
replace the default avatar with the being of light
 2016-04-23 08:42:00 -07:00
Anthony J. Thibault
c850880515 Head: compute _eyePosition properly. 2016-04-22 19:16:28 -07:00
samcake
f587398ca3 Adding support for plate carree 2016-04-22 18:00:22 -07:00
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee Fixing memory detection on OSX 2016-04-22 16:30:36 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Stephen Birarda
09a068e472 add back the avatar animation file new path 2016-04-22 13:53:39 -07:00
Stephen Birarda
132d9c3486 replace the default avatar with the being of light 2016-04-22 13:48:30 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e Merge pull request from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c962cfbda3 Merge pull request from zzmp/guard/obj-access 
Guard OBJ at operators
 2016-04-22 13:43:59 -07:00
Brad Hefta-Gaub
410bf3c95a Merge pull request from AndrewMeadows/faster-kinematics 
faster hifi kinematic motion calculations take-4
 2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Andrew Meadows
34d622e498 add warning about truncated kinematic timestep 2016-04-22 13:10:23 -07:00
Brad Hefta-Gaub
de17834dd1 Merge pull request from ctrlaltdavid/20887 
Don't display "Reveal Scripts Folder" control in HMD mode
 2016-04-22 13:04:07 -07:00
Brad Hefta-Gaub
f0659a985c Merge pull request from Atlante45/fix/pmtu-disc-fail 
Fix for path MTU discovery fail
 2016-04-22 12:24:44 -07:00
Seth Alves
e827a99222 Merge pull request from Atlante45/fix/settings-crash 
Fix crash on exit in Settings
 2016-04-22 11:46:30 -07:00
Seth Alves
4561962db1 Merge pull request from huffman/fix/asset-request-crash 
Fix AssetClient not properly cleaning up canceled requests
 2016-04-22 11:45:26 -07:00
Zach Pomerantz
498d8b8a63 Merge pull request from birarda/cmake-defs 
add definitions from cmake for each release type
 2016-04-22 10:10:48 -07:00
Zach Pomerantz
f9125d1175 Merge pull request from birarda/udt-fixes 
move debug for resource retry to when retry occurs
 2016-04-22 10:10:22 -07:00
Ryan Huffman
3b5b6a2609 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/asset-request-crash 2016-04-22 10:02:21 -07:00
Ryan Huffman
1416e397e4 Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash 2016-04-22 10:02:00 -07:00
Andrew Meadows
2bd83764e7 remove some debug cruft 2016-04-22 09:38:43 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216 set kinematic accel before stepping 2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8 correctg measured acceleration for kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
a3c66d8c91 reduce number of updates for fast-moving objects 2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd don't stop slow kinematic objs when sending updates 2016-04-22 09:38:43 -07:00
Andrew Meadows
afcf6d68a7 move deactivation thresholds to shared header 2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439 remove second-order term from kinematic motion 2016-04-22 09:38:43 -07:00
Andrew Meadows
8cbec06616 fix bug where kinematic objs pop on first step 2016-04-22 09:38:43 -07:00
Andrew Meadows
c8f0b0501a avoid active object update cycles 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Andrew Meadows
905c5398c4 add EntityItem::set/getTransformAndVelocities() 2016-04-22 09:38:43 -07:00
Andrew Meadows
771727890c more finely grained Bullet profiling 2016-04-22 09:38:43 -07:00
David Rowe
545d373a90 Display gap between consecutive selected entities 2016-04-22 13:29:53 +12:00
David Rowe
032b8a94a4 Change registration property's label 2016-04-22 13:22:57 +12:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00