Atlante45
ee5ebae89e
Code review
2014-04-08 10:22:50 -07:00
Atlante45
174f37f531
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed
Merge pull request #2615 from ey6es/master
...
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
2014-04-08 07:20:00 -10:00
Brad Hefta-Gaub
aad3085e08
Merge pull request #2611 from AndrewMeadows/avatar-speed
...
fix for sometimes slow avatar
2014-04-08 06:54:21 -10:00
Brad Hefta-Gaub
881383a5f2
Merge pull request #2609 from AndrewMeadows/avatar-interaction
...
More details in JS collision events
2014-04-08 06:52:04 -10:00
Brad Hefta-Gaub
247d8bc540
Merge pull request #2571 from birarda/ds-web
...
put servers alphabetically first in node list
2014-04-08 06:32:59 -10:00
Andrzej Kapolka
fa05a48270
Provide a means of supplying the joint mappings in the FST file so that agent
...
scripts can address joints by name. Closes #2526 .
2014-04-07 17:55:36 -07:00
Atlante45
46f0e78039
Erased deprecated code
2014-04-07 17:28:03 -07:00
Atlante45
d213cd7840
More work on Undo/Redo
2014-04-07 17:10:15 -07:00
Atlante45
d7b3c8b8fa
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-07 17:02:00 -07:00
Andrew Meadows
bf0eb69e2c
fix for sometimes slow avatar
2014-04-07 16:28:55 -07:00
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -07:00
Andrew Meadows
84d7e39d72
merge upstream/master into avatar-interaction
2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f
Add Collision metatype to JS script system
2014-04-07 10:03:10 -07:00
Stephen Birarda
5adcf68752
sort nodes on DS page by their uptime
2014-04-07 09:08:51 -07:00
Stephen Birarda
97a919a0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into ds-web
2014-04-07 08:45:51 -07:00
Andrzej Kapolka
72d09a5cbe
Merge pull request #2605 from AndrewMeadows/say-no-to-warnings
...
removing a warning about hidden virtual override
2014-04-04 16:00:57 -07:00
Andrzej Kapolka
10288bce35
Merge pull request #2604 from AndrewMeadows/oculus-with-thrust
...
fix #2567 thrust + oculus doesn't change body rotation
2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9
Merge pull request #2593 from Atlante45/display_models_metadata
...
Display models metadata
2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984
removing a warning about hidden virtual override
2014-04-04 15:18:12 -07:00
Atlante45
a0e70d0d2a
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-04 14:53:12 -07:00
Andrew Meadows
01c42c741c
fix #2567 thrust + oculus doesn't change body rot
2014-04-04 14:46:54 -07:00
Andrzej Kapolka
468a4b79fd
Merge pull request #2603 from ey6es/master
...
Increase the rate at which we increase detail and put a limit on the LOD
2014-04-04 14:41:17 -07:00
Andrzej Kapolka
3a125db1f8
Increase the rate at which we increase detail and put a limit on the LOD
...
multiplier so that it never takes more than about five seconds to return to
default detail. Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
2014-04-04 14:31:30 -07:00
Andrew Meadows
5e2b8bb2c3
connect SIGNAL to SIGNAL to avoid forwarding slot
2014-04-04 10:43:06 -07:00
Andrew Meadows
f6c98a1cc2
fix bug in gun.js: unplayed target delete sound
2014-04-04 10:40:55 -07:00
Clément Brisset
a57002038b
Merge pull request #2601 from Atlante45/error_or_success_model_upload_msg
...
Error or success model upload msg
2014-04-04 10:16:42 -07:00
Atlante45
d3ce2c7640
Added undo/redo support to the client
2014-04-03 16:51:08 -07:00
Atlante45
42f47f5db2
Some alphabetical cleaning
2014-04-03 16:48:56 -07:00
Atlante45
eb8cf15942
Merge branch 'error_or_success_model_upload_msg' of https://github.com/Atlante45/hifi into error_or_success_model_upload_msg
2014-04-03 16:19:41 -07:00
Atlante45
ba4ccc22ef
Changed FstReader name to ModelUploader
2014-04-03 16:19:33 -07:00
Atlante45
9166dea02e
Changed FstReader name to ModelUploader
2014-04-03 16:16:58 -07:00
Atlante45
3bb6d9b3b3
Added call back to model upload.
2014-04-03 16:07:25 -07:00
Leonardo Murillo
f25a8c5948
Merge pull request #2600 from Atlante45/master
...
Changed FstReader categories to place models in the right dirs
2014-04-03 14:06:59 -06:00
AndrewMeadows
4a98f9f159
Merge pull request #2485 from kordero/19498
...
Code Review for Job #19498
2014-04-03 12:58:47 -07:00
Atlante45
d15e12da77
Changed FstReader categories to place models in the right dirs
2014-04-03 12:25:50 -07:00
Lucas Crisman
793179dc72
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-03 16:24:32 -03:00
Andrzej Kapolka
6e53ecf6a0
Merge pull request #2598 from ey6es/master
...
Remove translations for now, but use correct translation keys for the on...
2014-04-03 11:55:36 -07:00
Andrzej Kapolka
840847cf54
Don't refer to the QM file.
2014-04-03 11:42:43 -07:00
Andrzej Kapolka
df4fd9df5f
Remove translations for now, but use correct translation keys for the only
...
translations we had (days/weeks/etc.)
2014-04-03 11:30:06 -07:00
Atlante45
df718c430a
Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
2014-04-03 11:20:24 -07:00
Stephen Birarda
cc199364e2
Merge pull request #2596 from ddobrev/master
...
Informed users who want to chat they have to log in first
2014-04-03 10:27:37 -07:00
Dimitar Dobrev
716858e6f6
Informed users who want to chat they have to log in first.
2014-04-03 20:09:54 +03:00
Brad Hefta-Gaub
829455c53f
Merge pull request #2595 from AndrewMeadows/avatar-interaction
...
Fix crash: don't simulate until geometry exists
2014-04-03 09:21:45 -07:00
Andrew Meadows
7a602aedd1
Fix crash: don't simulate until geometry exists
2014-04-03 09:06:49 -07:00
Atlante45
4a1687c023
Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:50:08 -07:00
Andrew Meadows
aad945c180
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:45:01 -07:00
Andrzej Kapolka
90a491849a
Merge pull request #2588 from AndrewMeadows/avatar-interaction
...
Avatar body-body collisions
2014-04-02 17:31:18 -07:00
