Commit graph

30536 commits

Author SHA1 Message Date
Brad Hefta-Gaub
53ae958c74 Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix
Fix for RenderableParticleEffectEntity crash.
2015-08-24 17:44:39 -07:00
Brad Hefta-Gaub
c6174ad88a Merge pull request #5647 from jherico/homer
Removing tabs from our javascript
2015-08-24 17:33:57 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -07:00
Lars Christensen
324f592719 updated FontAwesome to v4.4 2015-08-25 01:55:52 +02:00
David Rowe
b27d25b46e Implement crash option that retains only login and avatar information 2015-08-24 16:41:25 -07:00
Lars Christensen
110ba131a6 moved translation efforts into subdir 2015-08-25 01:36:19 +02:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Howard Stearns
476ca36460 final 2015-08-24 15:01:01 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
Stephen Birarda
fe591f61cc fix class rename in processConnectRequestPacket 2015-08-24 14:54:48 -07:00
Stephen Birarda
d57c1fc2d5 fix a typo in DomainGatekeeper comment 2015-08-24 14:50:18 -07:00
Stephen Birarda
7591a29c48 add back indentation to STATICALLY_ASSIGNED_NODES 2015-08-24 14:44:24 -07:00
Stephen Birarda
d2acf327dd fix NodeConnectionData discrepancy on request 2015-08-24 14:43:49 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub
6549e47dbc fix crash in Controller when asking for device name out of bounds 2015-08-24 14:35:19 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
David Rowe
110e7a773b Implement crash option that deletes Interface.ini 2015-08-24 13:36:03 -07:00
David Rowe
f6cf77ae68 Add Developer > Display Crash Options menu item
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
Seiji Emery
bd18951be8 fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/ 2015-08-24 13:13:24 -07:00
David Rowe
9c782f6a6d Display dialog of crash handling options at startup if Interface crashed
Default option and Esc continue without taking any action.
2015-08-24 12:45:35 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -07:00
Howard Stearns
57e4ff182d Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction-application 2015-08-24 11:27:52 -07:00
Seiji Emery
691cb48a08 Fixed to use standard shaders from render-utils 2015-08-24 11:26:56 -07:00
Anthony J. Thibault
47b8ab373c Fix for RenderableParticleEffectEntity crash.
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
Howard Stearns
484db87abc Set head pitch before making downstream eye corrections. 2015-08-24 11:10:29 -07:00
David Rowe
63ad972576 Write and delete "application is running" marker file 2015-08-24 11:09:41 -07:00
ericrius1
5fa27a7cf1 added back computeAndUpdate mmethod for particles, and now handling parsing old streams 2015-08-24 10:59:38 -07:00
David Rowe
07c9a0e2bb Add Developer > Crash Interface menu item 2015-08-24 10:48:58 -07:00
Brad Hefta-Gaub
275cdf9d8f Merge pull request #5581 from larsnaesbye/master
Preliminary da_DK translation of Interface
2015-08-24 10:36:30 -07:00
Brad Davis
78a08ed7c7 Merge pull request #5641 from thoys/20660
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
a8bbd8d43f Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators 2015-08-24 09:40:52 -07:00
Howard Stearns
bb91b17314 Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0 Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084 Added overload for renderDashedLine 2015-08-24 16:07:07 +01:00
Andrew Meadows
1d7d5071ae Merge pull request #5633 from howard-stearns/restore-body-indicators
Restore body indicators (e.g., lookAt vectors).
2015-08-23 15:46:57 -07:00
Brad Hefta-Gaub
0eaeb99064 Merge pull request #5640 from jherico/maggie
Fixing build problem with 3d connexion
2015-08-23 13:46:49 -07:00
Thijs Wenker
bbd6f25ff7 style fixes 2015-08-23 20:01:58 +02:00
Thijs Wenker
0f8cf80d45 Merge branch 'master' of https://github.com/worklist/hifi into 20660 2015-08-23 19:53:50 +02:00
Thijs Wenker
63f0173665 extend world boundaries 2015-08-23 19:52:29 +02:00
Brad Davis
b7237fb5ca Fixing build problem with 3d connexion 2015-08-23 09:32:58 -07:00
Howard Stearns
a1be458721 Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators 2015-08-23 09:30:16 -07:00
Nex Pro
53a63fed79 Changed constants red, green, blue and grey to uppercase as per style guide. 2015-08-23 17:16:23 +01:00
Thijs Wenker
748625399e "View -> World Axes" menu option 2015-08-23 17:59:58 +02:00
Thijs Wenker
b7f9bc13da Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-23 17:52:51 +02:00
Nex Pro
0ef2def56e changed default DASH_LENGTH and GAP_LENGTH to 1.0f 2015-08-23 16:52:12 +01:00
Thijs Wenker
9de35511fc Merge branch '20660' of github.com:thoys/hifi into 20660 2015-08-23 17:50:28 +02:00
Nex Pro
3e8970cc1e corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide. 2015-08-23 16:49:39 +01:00