Commit Graph

973 Commits (1bd8a67dcbc2645565a2b95fa1424ffd0eb8d538)

Author SHA1 Message Date
Cinder 5f608c0a23 OPEN-282 Use pthreads for TLS on mac 2014-11-19 08:01:28 -07:00
Oz Linden ae60558141 merge changes for STORM-2060/STORM-2076 2014-08-21 08:34:39 -04:00
NiranV 887510c335 Changed: Updated contributions file. 2014-08-20 16:07:01 +02:00
Oz Linden 014a5fa513 merge changes for STORM-2040 2014-08-18 11:56:39 -04:00
NiranV bca5c1ed79 Changed: Updated contributions file. 2014-08-15 22:41:10 +02:00
NiranV 9d406f69cc Changed: Updated contributions file. 2014-08-14 03:27:13 +02:00
Oz Linden 210ff45bd6 corrected contributions.txt for OPEN-217 2014-08-06 17:42:29 -04:00
Oz Linden 7ede86c97a merge changes for STORM-2031 2014-08-06 16:18:45 -04:00
Oz Linden 7062026da4 merge changes for STORM-2030 2014-08-06 16:17:55 -04:00
Oz Linden 129c2db2d2 merge changes for STORM-2040 2014-08-06 15:34:08 -04:00
NiranV b746d40678 Changed: Updated contributions file. 2014-08-01 20:17:05 +02:00
NiranV b5ac12d7b9 Changed: Updated contributions file with BUG-372 and BUG-1179. 2014-08-01 01:51:42 +02:00
NiranV 0a120f75c3 Changed: Updated contributions file. 2014-08-01 00:37:58 +02:00
NiranV 60c51f9bc4 Changed: Contribution file and updated it with all new STORM jira's that were fixed. 2014-07-31 07:27:52 +02:00
NiranV 048be2eec3 Added: STORM-2040 tag to NiranV Dean's name. 2014-07-26 14:10:28 +02:00
NiranV 009a3028ef Added: NiranV Dean to contribution list. 2014-07-25 10:17:01 +02:00
Oz Linden 8192a3c5b2 merge changes for STORM-2034 2014-07-21 10:00:09 -04:00
Oz Linden 2b731d5f06 merge changes for STORM-2037 2014-07-16 13:46:47 -04:00
Whirly 4cba2c4457 BUG-6659 On the Edit tab of the build menu, clicking the area in between the full bright checkbox and the materials drop down box opens the color picker. 2014-07-12 11:19:05 +01:00
Cinder e3a27586f1 STORM-2037 - Update fetchKeywordsFileresponder to use latest LLHTTPClient::responder changes 2014-07-09 09:10:10 -06:00
Cinder 8d2e0fb3a0 STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting 2014-06-20 13:43:31 -06:00
Cinder 984353d7ca STORM-2036 - Fix trying to parse caps too early by adding a callback to check region caps when they haven't already been received 2014-06-20 11:02:50 -06:00
Jonathan Yap 89837f3852 STOMR-2034 XML adjustments and a bit of code cleanup 2014-06-06 14:56:11 -04:00
Jonathan Yap 4fffc8c8e4 STORM-2031 Display issues with Top colliders/Top scripts floater
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
2014-05-13 12:30:29 -04:00
Jonathan Yap 3b95bffedd STORM-2030 Forgot to add entry to contributions.txt 2014-05-12 16:55:17 -04:00
Oz Linden 9353868d91 merge changes for STORM-1831 2014-04-23 11:53:05 -04:00
Oz Linden 6c8bddca3d merge changes for STORM-1915 2014-04-22 16:01:45 -04:00
Oz Linden b4ca93cadc merge up to 3.7.6-release 2014-04-22 13:05:26 -04:00
Oz Linden cd382d08c8 add Cinder Roxley to contributors for STORM-1831 2014-04-22 13:04:36 -04:00
Oz Linden d60519d253 merge changes for STORM-2007 2014-03-18 10:46:52 -04:00
Oz Linden c617a2aa33 merge changes for STORM-1966 2014-03-18 09:10:19 -04:00
Oz Linden 51e04f8866 merge changes for open-209 2014-03-14 14:54:45 -04:00
Oz Linden a64b1d0d30 merge changes for storm-2007 2014-03-14 14:34:06 -04:00
Oz Linden 56d1db4875 merge changes for storm-1920 2014-03-14 14:19:36 -04:00
Ricky Curtice e9116575bf OPEN-209: Corrected all instances of trigraphs in the code.
Trigraphs can cause some real special headaches.  The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
Oz Linden 54bc8b10ee merge changes for storm-2018 2014-03-11 16:43:00 -04:00
Oz Linden 529edff468 restore the relevant fixes for STORM-2011 2014-03-11 14:03:38 -04:00
Oz Linden 2b4d3fff70 back out STORM-2011 due to conflict 2014-03-10 15:46:49 -04:00
Jonathan Yap 2d6314f93f STORM-2018 Group invite fails to let you join groups when groups maxed even when you leave group 2014-03-07 12:50:08 -05:00
Oz Linden 208d9a2d21 merge changes for storm-2010 2014-03-06 14:55:11 -05:00
Oz Linden 43eae43798 merge changes for storm-68 2014-03-06 13:01:12 -05:00
Oz Linden 9185f1e256 merge changes for storm-2008 2014-03-06 08:30:47 -05:00
Oz Linden a373a7442c merge changes for 3.7.2-release 2014-03-04 13:15:43 -05:00
Oz Linden ef794e7ffc merge changes for storm-2015 2014-03-04 11:55:42 -05:00
Oz Linden 413d29d3ee merge changes for bug-1044 2014-03-04 11:22:19 -05:00
Ricky Curtice fe2801fc63 STORM-2017: Added translatable help text to rotation.
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.

While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate.  I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
Oz Linden fbdbea1b18 merge changes for 3.7.2-release 2014-03-03 17:01:19 -05:00
Oz Linden ce284c28d8 merge changes for 3.7.2-release 2014-03-03 15:43:55 -05:00
Oz Linden a5e56067c2 merge changes for 3.7.2-release 2014-03-03 15:36:34 -05:00
Oz Linden 55ceeae752 merge changes for storm-2008 2014-03-03 15:29:32 -05:00