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

17726 commits

Author SHA1 Message Date
Zach Pomerantz
edf82c57ba Clean scripting thread deletion 2016-05-12 12:45:02 -07:00
Zach Pomerantz
13d602487f Remove guard over atomic in ScriptEngine::stop 2016-05-12 12:43:16 -07:00
Zach Pomerantz
820fdf09e2 Remove unused ScriptEngine::_wantSignals 2016-05-12 12:42:29 -07:00
Seth Alves
63073301ee try again to fix update logic 2016-05-12 11:16:42 -07:00
Seth Alves
ce3faa2916 fix logic in UpdateEntityOperator 2016-05-11 18:47:20 -07:00
samcake
d5a9d39edf Defaulting the color formats used in the rendering pipeline to sRGB 2016-05-11 18:01:19 -07:00
Anthony Thibault
8fecb51dde Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw 
Eye tracking bug fix and debug rendering improvements
 2016-05-11 17:41:49 -07:00
Zach Pomerantz
8db1f296de Check vector access in fbx reader 2016-05-11 15:17:59 -07:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type 
Don't expose raw pointer to the display plugin
 2016-05-11 14:49:22 -07:00
Brad Davis
ba357721bf Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements 
Fix for vive controllers sometimes not working
 2016-05-11 14:32:33 -07:00
samcake
80c80091e4 Cleaning up code 2016-05-11 11:12:39 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
Anthony J. Thibault
09a4e0eaa8 Fix for vive controllers sometimes not working 
* Fixed bug with input devices that where added, removed then re-added.
  The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
  by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
  Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
 2016-05-10 19:32:08 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Brad Hefta-Gaub
757eea16a6 Merge pull request #7809 from howard-stearns/hand-controller-pointer 
Hand controller pointer
 2016-05-10 16:37:26 -07:00
Zach Pomerantz
2d4fd783bd Rename Paint/Idle events to Present 2016-05-10 16:09:04 -07:00
Zach Pomerantz
dd6a4dd091 Make getPaintDelayUsecs threadsafe 2016-05-10 16:06:33 -07:00
Brad Hefta-Gaub
af6be7f5f3 Merge pull request #7845 from jherico/script_debug 
Enable script debugging
 2016-05-10 15:56:38 -07:00
Brad Hefta-Gaub
62b3c12d0f fix comment 2016-05-10 15:53:10 -07:00
Brad Hefta-Gaub
a17acc6f6b rename functions 2016-05-10 15:52:07 -07:00
Brad Hefta-Gaub
0eb2388f69 fix unix build buster 2016-05-10 15:00:50 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
Zach Pomerantz
783be53125 Trigger Idle from present Paint 2016-05-10 14:39:23 -07:00
Zach Pomerantz
c3f41cdd89 Add PAINT_DELAY_DEBUG log 2016-05-10 14:39:23 -07:00
Brad Davis
b117a4b8d7 Debugging menu destruction 2016-05-10 12:21:19 -07:00
Brad Hefta-Gaub
7958020f4e only expect the 5 essential servers 2016-05-10 12:07:21 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
df34b49b41 fix white space 2016-05-10 11:34:11 -07:00
Brad Hefta-Gaub
33c5cb519a cleanup firstRun with a common setting 2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c Merge pull request #7854 from zzmp/refactor/delayLoad 
Clean up resource cache's encapsulation of asynchronous loading
 2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
22f4beab1a on first run, go to home or entry 2016-05-10 10:45:57 -07:00
samcake
303cade547 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-10 09:56:05 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Andrew Meadows
db9a4d6b8f cleanup for code review 2016-05-10 07:49:11 -07:00
Seth Alves
68201746aa Merge branch 'master' of github.com:highfidelity/hifi into fix-stanard-library-include-some-more 2016-05-09 18:39:37 -07:00
Zach Pomerantz
09d879e19f Remove delayLoad 2016-05-09 18:09:48 -07:00
Zach Pomerantz
68731973d8 Keep locker when adding script engine 2016-05-09 18:04:38 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Zach Pomerantz
a0d80b9508 Fix hang on new script on shutdown 2016-05-09 17:32:25 -07:00
samcake
00f2e34aa9 Changing emissive to unlit 2016-05-09 17:18:07 -07:00
samcake
615f4028c4 fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays 2016-05-09 17:17:16 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Brad Hefta-Gaub
0de721e8f4 Merge pull request #7838 from zzmp/refactor/script-sleep 
Use sleep_until for ScriptEngine
 2016-05-09 15:58:22 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes 
Grab fixes
 2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
22081a8606 Merge pull request #7833 from zzmp/fix/scriptable-resource 
Fix prefetching
 2016-05-09 15:09:20 -07:00
Zach Pomerantz
7db082b915 Amend comment that was not a busy wait 2016-05-09 15:05:13 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Anthony J. Thibault
9821c276ad warning fix in release 2016-05-09 13:56:56 -07:00
Brad Hefta-Gaub
343bc2a747 Merge pull request #7841 from jherico/mac_oculus 
OSX Rift functionality
 2016-05-09 13:12:46 -07:00
samcake
37f16e9c86 Merging with master 2016-05-09 12:01:58 -07:00
Anthony J. Thibault
7f5296f566 Increased tolerance for near zero length vectors 
Also, replaced some magic numbers with constants.
 2016-05-09 11:53:09 -07:00
Brad Hefta-Gaub
312ea20e15 Merge pull request #7797 from zzmp/fix/cache-thread-safety 
Make ResourceCache::resetResourceCounters threadsafe
 2016-05-09 11:52:57 -07:00
howard-stearns
11ae685f04 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-09 11:50:07 -07:00
Brad Hefta-Gaub
ab0a77c82b Merge pull request #7830 from ZappoMan/removeusleeps 
switch OctreeSendThread and OctreePersistThread to use std::this_thread::sleep_for() instead of usleep()
 2016-05-09 11:47:40 -07:00
Brad Hefta-Gaub
39a4e38485 Merge pull request #7837 from samcake/hdr 
Fixing the bad color format for skymaps
 2016-05-09 11:47:02 -07:00
howard-stearns
af8d0dc280 Fix setReticlePosition and getReticlePosition to match. 2016-05-09 11:34:52 -07:00
samcake
0bfad4a549 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-09 11:33:47 -07:00
Chris Collins
91a5d82af5 Merge pull request #7826 from zzmp/perf/mipmap 
Defer mipmap gen to gpu
 2016-05-09 10:52:49 -07:00
Chris Collins
4f22e0ad5a Merge pull request #7828 from sethalves/show-other-sim-owner 
show with debug icons when someone else is the simulation owner
 2016-05-09 10:49:30 -07:00
howard-stearns
3f3233da66 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-09 09:26:28 -07:00
Brad Davis
335841bf0f Fix plugin loading on OSX 2016-05-08 23:35:18 -07:00
Anthony Thibault
cb5c7a3559 compile fix for macosx 2016-05-08 17:14:14 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00
Seth Alves
b0a5d8b719 make Script.include(/~/system/libraries/utils.js) work from web again 2016-05-08 08:45:58 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Seth Alves
4b1274cb0f Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Zach Pomerantz
173d2a590c Use sleep_until for ScriptEngine 2016-05-06 19:30:37 -07:00
samcake
1fec984ead fixing the linear COlor FOrmat flag 2016-05-06 19:07:07 -07:00
samcake
da75c27188 fixing bad color format assignment code and bad color format for the cubemaps 2016-05-06 18:57:19 -07:00
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -07:00
Clément Brisset
b234d94d25 Merge pull request #7832 from birarda/session-location 
repairs to user heartbeats
 2016-05-06 15:15:52 -07:00
Zach Pomerantz
3f4f10a27e Fix prefetch state changes 2016-05-06 15:08:45 -07:00
Brad Hefta-Gaub
6d97ad609b Merge pull request #7818 from zzmp/fix/colliding-fbx-paths 
Fix colliding fbx tex names
 2016-05-06 15:03:58 -07:00
Stephen Birarda
6f6221840e put back the correct metaverse API url in NetworkingConstants 2016-05-06 13:26:23 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Brad Hefta-Gaub
47f8adf187 Merge pull request #7824 from sethalves/avatar-id-reliable 
use reliable and ordered packets for avatar identity
 2016-05-06 11:32:05 -07:00
Brad Hefta-Gaub
fe14bc8e52 also switch OctreePersistThread to use std::this_thread::sleep_for() 2016-05-06 11:19:27 -07:00
Seth Alves
f80333ee9e fix indentation, move an early exit to earlier 2016-05-06 10:06:51 -07:00
Seth Alves
71738d4841 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-06 09:59:17 -07:00
samcake
8bad58749c Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-06 09:51:37 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -07:00
Seth Alves
aeebf7d9bf Merge pull request #7823 from Atlante45/fix/potential-it-invalidation 
Fix potential iterator invalidation
 2016-05-05 18:28:49 -07:00
Andrew Meadows
d1591e03b9 fix typo 2016-05-05 18:28:27 -07:00
Andrew Meadows
eeb100b62f use glm::isnan() instead of isnan() from math.h 2016-05-05 18:28:27 -07:00
Andrew Meadows
01950fba96 recover unused code that may prove useful someday 2016-05-05 18:28:27 -07:00
Andrew Meadows
64c2e2d175 remove warning about unused variable 2016-05-05 18:28:27 -07:00
Andrew Meadows
7d6424bdcc Head::render() was cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
2cbc771eba reorder data members, remove cruft, 744->616 bytes 2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Andrew Meadows
21fa294839 remove cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
d97bd2bc52 remove cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
Seth Alves
16a5030159 Merge pull request #7810 from zzmp/perf/usleep 
Improve CPU performance of Win32 usleep
 2016-05-05 18:23:31 -07:00
Zach Pomerantz
7f496ea069 Fix colliding fbx tex names 2016-05-05 17:54:00 -07:00
samcake
e306a24a1b INtroducing the unlit mode for fragments 2016-05-05 17:08:52 -07:00
Zach Pomerantz
6a6d6dd20f Defer mipmap gen to gpu 2016-05-05 16:34:02 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Seth Alves
96174468b3 use reliable and ordered packets for avatar identity 2016-05-05 15:27:30 -07:00
Atlante45
f65b15803a Fix potential iterator invalidation 2016-05-05 15:04:39 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e Fix avatars collision sounds 2016-05-05 14:55:28 -07:00
Seth Alves
cd934bab90 set _actionDataDirty when adding an action. 2016-05-05 14:16:13 -07:00
Zach Pomerantz
79c8001d7a Audit thread safety of ResourceCache 2016-05-05 11:17:38 -07:00
Seth Alves
ec50744aa1 Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data 
fix bug preventing sim ownership release
 2016-05-05 11:14:55 -07:00
Seth Alves
3c41df53e4 Merge branch 'ignore-echo-of-stale-data' of github.com:AndrewMeadows/hifi into grab-fixes 2016-05-05 11:00:55 -07:00
Andrew Meadows
967a67256e fix bug preventing sim ownership release 2016-05-05 10:52:53 -07:00
Seth Alves
0c794cac5d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 10:13:07 -07:00
Seth Alves
929d831212 Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data 
fix object position glitch of owned simulations on networks with long ping-time
 2016-05-05 10:11:02 -07:00
samcake
a78719bc85 Merge pull request #7813 from ZappoMan/fixRecursiveMutex 
fix recursive mutex in Entites.callEntityMethod()
 2016-05-05 10:06:58 -07:00
Seth Alves
f5be64ed96 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 09:52:33 -07:00
Seth Alves
24289b1e66 Merge pull request #7815 from birarda/stuck-assignment 
add warnings for socket error and unexpected state change
 2016-05-05 08:58:51 -07:00
Andrew Meadows
3202a723b8 remove warning about unused variable 2016-05-05 08:54:09 -07:00
Brad Hefta-Gaub
1df4cf4db0 Merge pull request #7812 from zzmp/fix/scripting-thread-dtor 
Properly shut down scripting thread
 2016-05-05 08:49:51 -07:00
Seth Alves
d76b8f2335 action->locallyAddedButNotYetReceived is unneeded with isMine available 2016-05-05 06:44:52 -07:00
Brad Hefta-Gaub
1e30ba43ea Merge pull request #7781 from zzmp/log/pipeline-flood 
Avoid missing pipeline log flood
 2016-05-05 00:15:10 -07:00
samcake
f1b236f3be adding the DeferredBUfferRead.slh 2016-05-04 18:51:35 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -07:00
Andrew Meadows
be9a572fb0 fix grab motion glitch on long-ping connections 2016-05-04 16:50:42 -07:00
Stephen Birarda
8a3336ae95 use the networking logging category 2016-05-04 16:31:12 -07:00
Seth Alves
91af732516 if we receive an update from the entity-server that doesn't include one of our actions, resend the action data 2016-05-04 16:30:38 -07:00
Stephen Birarda
effa2fc235 typo fix for comment 2016-05-04 16:28:26 -07:00
Stephen Birarda
7192ad301f add debug for socket errors and state changes 2016-05-04 16:23:40 -07:00
Andrew Meadows
8c7ee00849 Merge pull request #7808 from ctrlaltdavid/20904 
Increase maximum friction value from 0.99 to 10.0
 2016-05-04 16:11:43 -07:00
Zach Pomerantz
1553f532ba Specialize usleep for Win32 2016-05-04 15:40:53 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
Zach Pomerantz
526143b097 Improve perf of Win32 usleep 2016-05-04 13:36:07 -07:00
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
David Rowe
4b05d8ed95 Increase maximum friction to 10.0 - Bullet's maximum 2016-05-05 07:50:15 +12:00
Seth Alves
382a0c48da fix warning 2016-05-04 12:09:26 -07:00
Zach Pomerantz
56ec0e5db0 Abort infinite JS loops on quit 2016-05-04 12:02:08 -07:00
Seth Alves
b6918f59a6 remove extra qualification 2016-05-04 11:33:41 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
2c9608489f fix recursive mutex in Entites.callEntityMethod() 2016-05-04 10:01:20 -07:00
Zach Pomerantz
284feaf5d4 Properly shut down scripting thread 2016-05-03 20:29:31 -07:00
samcake
3c80767ec3 Adding the shadingMOdel read from the fbx material 2016-05-03 18:43:20 -07:00
howard-stearns
acc216726a Cleanup 2016-05-03 16:32:53 -07:00
howard-stearns
fdf9c0a217 Fix offset so that non-full-size window can be located anywhere on screen. 2016-05-03 16:26:45 -07:00
David Rowe
d1064bf5ea Increase maximum friction to 1.0 - bullet can handle it 2016-05-04 10:58:33 +12:00