Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33887 commits 2 branches 0 tags 1.1 GiB
Commit graph

33887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
85a975b1f4 Merge pull request #6185 from Atlante45/cmake 
Remove cmake debug code
 2015-10-26 14:54:01 -07:00
Seth Alves
7d9b566d0a Merge branch 'cmake' of github.com:Atlante45/hifi into fix-actions-ttl 2015-10-26 14:51:39 -07:00
Seth Alves
0dff037f56 fuck you, const! 2015-10-26 13:55:07 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
samcake
990764d855 Really fixing the MovingAverage class... 2015-10-26 13:29:13 -07:00
Ryan Huffman
913026280c Fix EntityTreeRenderer dropping contact end events 2015-10-26 13:02:39 -07:00
Ryan Huffman
837430329b Fix collision start/end in single physics simulation to be lost 2015-10-26 13:02:17 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
James B. Pollack
fc8184ffed add arcade sound 2015-10-26 12:25:51 -07:00
samcake
8e2c269cc0 doing the correct conversion for byte to normalize float... 2015-10-26 12:24:20 -07:00
Brad Hefta-Gaub
aaaee30032 Merge pull request #6183 from jherico/pingpong 
Fixing ping-ping entity script
 2015-10-26 12:20:08 -07:00
Atlante45
9bead94fae Remove cmake debug code 2015-10-26 12:07:12 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
samcake
a8872d065b MOve the movingAverage class to shared next to SimpleMovingAverage 2015-10-26 11:23:13 -07:00
Brad Davis
691e5f3be0 Remove new/old value division from endpoint::apply 2015-10-26 11:22:25 -07:00
samcake
ff57b73bd6 Creating the COlorUTils in shared to deal with all the standard color conversions 2015-10-26 10:53:21 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Brad Hefta-Gaub
c2663d5f96 Merge pull request #6179 from jherico/vive 
Adding Vive controller default mapping
 2015-10-26 10:50:14 -07:00
Brad Davis
f38303a9a5 Adding vive default mapping 2015-10-26 10:36:31 -07:00
samcake
ca30ce1ff0 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 10:08:16 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
a7547ef11e Adding hysteresis filter, moving filters to individual files 2015-10-25 16:44:43 -07:00
Brad Davis
d1854cab53 Merge pull request #6176 from ZappoMan/fixScripts 
fix frisbee.js to work with new API
 2015-10-24 17:26:57 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Davis
5bc736952a Function based endpoints should inhibit spamming with repeats of the same value 2015-10-24 16:26:29 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Davis
f61cf843bc Merge pull request #6172 from ZappoMan/fixScripts 
fix walkApi.js to detect hydra in official way
 2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub
0b99728575 Merge pull request #6175 from AlessandroSigna/controllers 
fix stick.js
 2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub
3a2328a887 Merge pull request #6173 from EdgarPironti/controllers 
Fixed sword.js
 2015-10-23 20:07:52 -07:00
AlessandroSigna
7f3f202567 fix stick.js 2015-10-23 18:23:15 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
42ac8c5769 Stariting to reorganize the keyLight porperties of the Zone Entity 2015-10-23 18:15:19 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
EdgarPironti
0d15182adb Fixed sword.js 2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub
4a19a14682 fix walkApi.js to detect hydra in official way 2015-10-23 17:53:34 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
2fba3c75e7 Merge pull request #6167 from jherico/c3 
Conditional support from JS
 2015-10-23 17:43:19 -07:00
Brad Hefta-Gaub
4817964739 Merge pull request #6166 from jherico/controllers 
Moving conditionals and endpoints out of UserInputMapper
 2015-10-23 17:40:54 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub
9aaef9aabd fix hydraPaint.js to use new API 2015-10-23 17:32:06 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Davis
d5425ac625 Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:24:03 -07:00
Brad Davis
0fdd32709f Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:22:46 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00