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

33636 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
113321184d if model RegistrationPoint doesn't match entityItem's, update it 2015-10-19 12:21:26 -07:00
Seth Alves
ac99005602 reverting a change to try to see sticking problem again 2015-10-19 12:13:08 -07:00
samcake
2cd6d7c8a5 Merge pull request #6110 from ZappoMan/textureMapHack 
ifdef out buggy texture map code
 2015-10-19 12:09:37 -07:00
Seth Alves
f96e9eb1e8 fuck you, const! 2015-10-19 12:04:55 -07:00
ericrius1
8c229d88a8 moving whitelist code out of octree 2015-10-19 11:59:44 -07:00
Seth Alves
46e5bf0435 take entity-server clock-skew into account when handling action expiration times 2015-10-19 11:59:03 -07:00
samcake
9ae1da371e Merge pull request #6108 from jherico/controllers 
Controllers Branch - Breaking up UserInputMapper, restoring some mappings
 2015-10-19 11:16:13 -07:00
Seth Alves
5c031a38c7 try another way of fixing held object snagging at slow velocity 2015-10-19 10:29:30 -07:00
Seth Alves
c5a5f26e6a try another way of fixing held object snagging at slow velocity 2015-10-19 10:27:35 -07:00
Seth Alves
2bdcb256d8 try another way of fixing held object snagging at slow velocity 2015-10-19 10:26:37 -07:00
Seth Alves
26dcaeb056 try another way of fixing held object snagging at slow velocity 2015-10-19 10:10:43 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
edd2ce27f8 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-19 09:59:37 -07:00
Brad Davis
1de811c754 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 09:59:03 -07:00
Seth Alves
fbe3cb9511 try another way of fixing held object snagging at slow velocity 2015-10-19 09:56:51 -07:00
Seth Alves
742e48b0c8 try another way of fixing held object snagging at slow velocity 2015-10-19 09:48:34 -07:00
Brad Hefta-Gaub
bddb0e1e7b ifdef out buggy texture map code 2015-10-19 09:43:08 -07:00
Brad Hefta-Gaub
c04cdc4964 Merge pull request #6109 from jherico/marge 
Fixing line endings and adding git attribute files
 2015-10-19 08:33:02 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Brad Davis
82c041d06a Adding git attributes file 2015-10-18 22:54:04 -07:00
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Hefta-Gaub
a75316f27b Merge pull request #6107 from jherico/controllers 
Move controller test to app
 2015-10-18 14:42:32 -07:00
Seth Alves
1f3b92577d update _model's location anytime it doesn't match the entity's location 2015-10-17 20:08:25 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
12583533d4 Merge pull request #6106 from ZappoMan/controllers 
remove dead code
 2015-10-17 14:53:53 -07:00
Brad Hefta-Gaub
fda8292fa6 remove dead code 2015-10-17 14:53:23 -07:00
Brad Davis
f4380da857 Merge pull request #6105 from ZappoMan/controllers 
[Controllers Branch] - various updates
 2015-10-17 14:28:34 -07:00
Brad Hefta-Gaub
8578b40236 get JS source functions working across threads 2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub
7956d737ab fix thread safety issue on JS based fliters 2015-10-17 14:08:21 -07:00
Seth Alves
353f92f1ba Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-17 13:09:52 -07:00
Brad Hefta-Gaub
7d48fe9187 don't include Standard device in Controllers.Hardware 2015-10-17 13:00:43 -07:00
Brad Hefta-Gaub
251a55b1fb rename hardware controllers to not have device ID in the name 2015-10-17 12:52:37 -07:00
Brad Hefta-Gaub
293b7c12e1 change join to makeAxis, fix some warnings 2015-10-17 12:46:05 -07:00
Brad Hefta-Gaub
e888391e7e Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:35:48 -07:00
Brad Hefta-Gaub
f90f0ed1f3 apply Huffman's feedback to Sam's PR 2015-10-17 12:34:32 -07:00
Brad Hefta-Gaub
fd5a5bb104 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:22:39 -07:00
Brad Hefta-Gaub
23839d7b45 Merge pull request #6103 from samcake/controllers 
Controllers : Adding support for load mapping from json URL
 2015-10-17 12:22:22 -07:00
Brad Hefta-Gaub
4289d54bd9 Merge pull request #6102 from Atlante45/master 
Fix particle bug by having lifetimes increase
 2015-10-17 12:21:47 -07:00
Brad Hefta-Gaub
75c59fad99 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:18:14 -07:00
Ryan Huffman
29a29d997d Merge pull request #6100 from imgntn/edit_better 
[Scripts] Edit.js - Add color bars below XYZ inputs to indicate world axis
 2015-10-16 22:17:37 -07:00
Atlante45
1da68e0214 Fix particle bug by having lifetimes increase 2015-10-16 18:11:22 -07:00
samcake
941f95c7d4 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 18:07:25 -07:00
samcake
20416455db Adding the loadMapping feature 2015-10-16 18:06:58 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
Brad Davis
1dcf03d61e Put standard 'makeinput' functions on the base class 2015-10-16 17:20:52 -07:00
Eric Levin
6738455a5a Merge pull request #6099 from ctrlaltdavid/20709 
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
 2015-10-16 17:12:18 -07:00