Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 16:54:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24734 commits 71 branches 56 tags 1.2 GiB
Commit graph

24734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Levin
6a987fdaf5 now conforming to coding standards 2015-05-04 16:40:04 -07:00
Eric Levin
e097950277 added axis and angle helper methods to Quat class- script user can now get normalized axis and scalar angle from a quaternion 2015-05-04 15:22:10 -07:00
Seth Alves
5cd1c6fd23 Merge pull request #4762 from samcake/orange 
Everquest standard controls
 2015-05-04 14:09:42 -07:00
Stephen Birarda
3f5b3a2b74 Merge pull request #4760 from birarda/master 
remove an unused variable
 2015-05-04 17:08:35 -04:00
Sam Gateau
b36775e781 After a very long debate it's clear that we shouldn;t have change the a and d keys behavior, so we bring them back but with a twist, now RIghtButton + A or D strafe right and left making the controller equivalent to everquest, world of warcraft 2015-05-04 13:57:40 -07:00
Stephen Birarda
31bbf15a55 remove unused variable 2015-05-04 11:30:56 -07:00
Stephen Birarda
6312d8643b Merge pull request #4759 from ericrius1/dice 
changed dice script to only play sound locally on collision, to avoid ev...
 2015-05-04 14:27:09 -04:00
Stephen Birarda
a039d5f28c Merge pull request #4753 from samcake/orange 
Introducing UserInputMapper
 2015-05-04 14:26:51 -04:00
Seth Alves
5daaa89cce Merge pull request #4747 from birarda/avatar-mixer-throttling 
improve domain-settings, tweak avatar-mixer sending
 2015-05-04 11:12:00 -07:00
Sam Gateau
fad623ae48 ANd really add the 2 files we need 2015-05-04 10:47:33 -07:00
Stephen Birarda
14fa89858e use epsilon constant in MovingMinMaxAvgTests 2015-05-04 10:45:26 -07:00
Stephen Birarda
87e586dfe6 remove a stray space 2015-05-04 10:42:58 -07:00
Sam Gateau
936eefd4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-04 10:41:32 -07:00
Sam Gateau
c7153bcc14 fixing commetns from review 2015-05-04 10:40:11 -07:00
Stephen Birarda
fb7646b02b add a QDebug for failed conversion in fromString 2015-05-04 10:32:49 -07:00
Stephen Birarda
aeb04cf9c3 use existing numerical constant in Avatar 2015-05-04 10:28:28 -07:00
Eric Levin
d930c942ff changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect 2015-05-04 10:16:50 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
7eb965f24f Merge pull request #4756 from thoys/patch-4 
Fix for RealSense menu item
 2015-05-04 12:46:25 -04:00
Stephen Birarda
96b75b57fe Merge pull request #4754 from Atlante45/fix_local_injector_on_win 
Fix local injector modifying system volume
 2015-05-04 12:45:06 -04:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Stephen Birarda
efb4d34598 Merge pull request #4755 from Atlante45/quiet_compiler 
Quiet compiler
 2015-05-04 12:43:13 -04:00
Thijs Wenker
9a6e442b25 Fix for RealSense menu item 
This was missed while moving to the new MenuWrapper class.
 2015-05-04 18:07:48 +02:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Clément Brisset
6b04ceffba Merge pull request #4752 from sethalves/quiet-compiler 
Quiet compiler
 2015-05-04 15:09:13 +01:00
Atlante45
1dcc2f7988 Fix local injector modifying system volume 2015-05-04 15:53:58 +02:00
Sam Gateau
3921156978 fix end of line 2015-05-04 01:09:25 -07:00
Sam Gateau
b7bacccce7 Fine tunning on windows 2015-05-04 00:54:54 -07:00
samcake
8e65ce34d1 FINe tune the scales for the Mac Book 2015-05-03 23:47:43 -07:00
Sam Gateau
116e29ae57 adjust the timer for touch event to work around the missing touch begin / touch end 2015-05-03 18:40:55 -07:00
Sam Gateau
ae14396fd7 adjust the key mapping for mac book and the scales 2015-05-03 18:03:27 -07:00
samcake
d2e61dba05 Make the nw mapper work for th einputs 2015-05-03 17:34:39 -07:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Philip Rosedale
d7cc76e48b Merge pull request #4735 from jherico/menu_fix 
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
 2015-05-02 00:35:49 -07:00
Philip Rosedale
0f22b9beb8 Merge pull request #4741 from sethalves/box-stacking-1 
move common debugging rendering into a new class
 2015-05-02 00:34:44 -07:00
Brad Hefta-Gaub
6c4a4d0cdc Merge pull request #4749 from samcake/temp1 
Fix the dark objects rendering in porto and apartment due to the tga texture files not loaded correctly
 2015-05-01 17:39:17 -07:00
Brad Hefta-Gaub
c8cbaa2fc0 Merge pull request #4746 from huffman/update-zone-image 
Update add-zone icon in edit.js
 2015-05-01 17:34:34 -07:00
Brad Hefta-Gaub
417810c683 Merge pull request #4744 from huffman/show-zone-boundaries 
Add draw zone boundaries bool
 2015-05-01 17:34:15 -07:00
Stephen Birarda
0dbc4780ab use numerical constants header from LeapMotion 2015-05-01 17:18:35 -07:00
Stephen Birarda
8a3853f1d0 Merge pull request #4745 from sethalves/dont-crash-on-null-sessionid 
session id can be null.  don't crash
 2015-05-01 20:08:52 -04:00
Stephen Birarda
c273ea7d46 Merge pull request #4748 from sethalves/shutdown-harder 
try harder to make sure all the assignment-client children stop
 2015-05-01 20:08:29 -04:00
Stephen Birarda
455b91c2a5 add back string header for memset 2015-05-01 17:06:39 -07:00
Seth Alves
9f1cb2a4e5 fix kill/terminate order 2015-05-01 16:56:39 -07:00
Stephen Birarda
19a95cb25a remove string header that is not needed 2015-05-01 16:56:32 -07:00
Stephen Birarda
ddb08da4b7 include cstdlib for std::abs in AudioNoiseGate 2015-05-01 16:54:23 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Seth Alves
23c44500d8 no magic numbers 2015-05-01 16:45:04 -07:00
Sam Gateau
f9802a1072 IMprove the message 2015-05-01 16:39:25 -07:00