Brad Davis
|
119f37a178
|
Working on SDK 0.6
|
2015-06-07 14:34:40 -07:00 |
|
Bradley Austin Davis
|
b56fbd4744
|
Working on SDK 0.6
|
2015-06-07 13:56:06 -07:00 |
|
Brad Davis
|
f614268667
|
Moving windows to SDK 0.6
Working on SDK 0.6 for windows
Working on SDK 0.6 for windows
|
2015-06-07 01:40:44 -07:00 |
|
Niraj Venkat
|
141ff70a60
|
Some changes to constants
|
2015-06-05 15:36:42 -07:00 |
|
Niraj Venkat
|
827d8bd854
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-05 13:33:41 -07:00 |
|
Niraj Venkat
|
a3f19e9d4c
|
Fixing title bar update on teleport
|
2015-06-05 13:33:14 -07:00 |
|
Seth Alves
|
b425cc6491
|
merge from upstream
|
2015-06-05 11:56:33 -07:00 |
|
Seth Alves
|
b0480af040
|
Merge pull request #5053 from AndrewMeadows/isothermal
fix crash during bogus reconnect on login
|
2015-06-05 11:38:23 -07:00 |
|
Seth Alves
|
aff582287d
|
use const references for arguments in action-related calls
|
2015-06-05 11:26:54 -07:00 |
|
Andrew Meadows
|
53fa6cf0b2
|
Merge pull request #5040 from jherico/web-entities-fix
Fixing web entity glow and 'back' behavior
|
2015-06-05 10:46:58 -07:00 |
|
Niraj Venkat
|
a2165e3a8a
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-05 10:42:20 -07:00 |
|
Seth Alves
|
28c034698f
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-05 10:41:20 -07:00 |
|
Seth Alves
|
c5143cdfa0
|
Merge pull request #5027 from AndrewMeadows/isentropic
cleanup around sending all "terse update" data whenever some of it changes
|
2015-06-05 10:41:06 -07:00 |
|
Niraj Venkat
|
c8236f867b
|
Address manager changes to support domain ID
|
2015-06-05 10:40:17 -07:00 |
|
Seth Alves
|
4e10c28b41
|
merge from upstream
|
2015-06-05 10:31:13 -07:00 |
|
Seth Alves
|
edb3622c85
|
Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
|
2015-06-05 10:26:28 -07:00 |
|
Seth Alves
|
51f5730e68
|
formatting
|
2015-06-05 10:05:11 -07:00 |
|
Seth Alves
|
eb912892dc
|
code review
|
2015-06-05 09:56:34 -07:00 |
|
Seth Alves
|
2086a25f93
|
oops
|
2015-06-05 08:59:19 -07:00 |
|
Seth Alves
|
086b9d404a
|
fix return-type in lambda
|
2015-06-05 08:59:08 -07:00 |
|
Andrew Meadows
|
9cb7cb314d
|
update minimum version support
|
2015-06-05 08:43:48 -07:00 |
|
Andrew Meadows
|
08b64666fe
|
Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
Smooth initial crash volume
|
2015-06-05 08:40:09 -07:00 |
|
Seth Alves
|
3dbf28b7b4
|
use lambdas to remove some repeated code
|
2015-06-05 07:33:39 -07:00 |
|
Seth Alves
|
b2db5f7fee
|
update grab.js to use pull-to-point action, various other fixes
|
2015-06-05 07:10:44 -07:00 |
|
Seth Alves
|
9a67f35b59
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-04 19:02:46 -07:00 |
|
Seth Alves
|
ba42b0dcc4
|
updateAction and deleteAction
|
2015-06-04 17:51:59 -07:00 |
|
Andrew Meadows
|
911baee8b8
|
fix for crash during bogus reconnect on login
|
2015-06-04 16:57:29 -07:00 |
|
Andrew Meadows
|
cd6bf9d461
|
cleanup comments
|
2015-06-04 16:56:14 -07:00 |
|
Eric Levin
|
5e15c14539
|
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
|
2015-06-04 16:45:32 -07:00 |
|
Howard Stearns
|
407d3b6a6e
|
Pitch is dependent on (largest dimension of) minimum bounding, not max.
Adjust sound range of full volume.
|
2015-06-04 14:23:51 -07:00 |
|
Howard Stearns
|
5cbb5dadca
|
More perspicacious zero.
|
2015-06-04 14:21:12 -07:00 |
|
Seth Alves
|
5e5bc497d9
|
remove debugging prints
|
2015-06-04 12:44:08 -07:00 |
|
Seth Alves
|
5f60ad3b51
|
put back unused variables as commented out -- there is a comment lower down that talks about them
|
2015-06-04 12:39:48 -07:00 |
|
Seth Alves
|
66ab3d455f
|
use shared pointers to keep track of action objects
|
2015-06-04 12:29:05 -07:00 |
|
Seth Alves
|
8f19bad97d
|
pull argument extracting code into EntityActionInterface
|
2015-06-04 11:39:15 -07:00 |
|
Andrew Meadows
|
6b03e671d8
|
remove comment cruft
|
2015-06-04 11:28:07 -07:00 |
|
Andrew Meadows
|
aff751b4e6
|
remove old debug assert
|
2015-06-04 11:26:35 -07:00 |
|
Andrew Meadows
|
0514736a3e
|
remove last of *InDomainUnits code
|
2015-06-04 11:24:10 -07:00 |
|
Seth Alves
|
14026667f5
|
script interface for creating an action now takes an action-type name rather than having a different call for each action
|
2015-06-04 10:55:32 -07:00 |
|
Andrew Meadows
|
6ea4c58319
|
material changes are an "easy" property to update
|
2015-06-04 10:22:01 -07:00 |
|
Seth Alves
|
9cae11cc3c
|
clean up actions when DeleteEntityOperator's list is processed rather than as it's made
|
2015-06-04 09:55:25 -07:00 |
|
Seth Alves
|
57d85cece0
|
get rid of simulation back-pointer in actions
|
2015-06-04 09:41:32 -07:00 |
|
Howard Stearns
|
0b52f85c60
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume
|
2015-06-04 09:10:42 -07:00 |
|
Seth Alves
|
4414b67837
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-03 20:43:22 -07:00 |
|
Seth Alves
|
31bc106189
|
remove unneeded include
|
2015-06-03 20:43:11 -07:00 |
|
Seth Alves
|
d634663bb1
|
simple action is working. destructor sequense is still suspicous
|
2015-06-03 17:33:55 -07:00 |
|
Brad Davis
|
a12fd5c3d0
|
Merge pull request #5023 from AndrewMeadows/bispinor
fix crash in ~OffscreenGlCanvas on linux shutdown
|
2015-06-03 17:21:39 -07:00 |
|
Brad Davis
|
7f0a7b4f7e
|
Fixing web entity glow and 'back' behavior
|
2015-06-03 17:15:50 -07:00 |
|
Andrew Meadows
|
b0ca2df3aa
|
move API from PhysicsEngine to ObjectMotionState
|
2015-06-03 14:56:04 -07:00 |
|
Andrew Meadows
|
8e61a10bcf
|
compute collision group for entity
|
2015-06-03 14:22:48 -07:00 |
|