fd427f0ab9
merge changes for storm-1100
2011-05-19 12:26:57 -04:00
78cad51818
merge changes for STORM-1259 and STORM-1175
2011-05-19 12:07:41 -04:00
35f394cd63
merge changes for storm-859
2011-05-18 18:24:13 -04:00
7713a84777
merge changes for storm-1175
2011-05-18 09:48:46 -04:00
2de13f8070
merge changes for storm-1259
2011-05-18 09:46:28 -04:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
4d2a64c4a4
STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to see in 1.23
2011-05-16 16:34:26 -04:00
d7d94460d0
STORM-859 : Replacing winres.h with windows.h so that the viewer will build with-out
...
having to copy any files to the source tree when useing express versions of
Visual Studio.
2011-05-15 21:57:27 -04:00
66c078de5e
merge up to latest viewer-development
2011-05-13 13:28:51 -04:00
27fd0d1a93
storm-1100: merged many more updates and refinements to table, added tester and files to test with
2011-05-13 13:27:56 -04:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
ad0cb157fe
STORM-1175 Fixing close button, for Custom Port warning, in Preferences => Setup => Network.
2011-05-12 11:42:46 +01:00
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
86180db1f1
STORM-1236 snapshot: Please resize the text box or modify the text so that it fits.
2011-05-06 20:58:48 -04:00
0ca94ddec2
merge changes for open-61
2011-05-04 19:02:06 -04:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
95f41fbd9b
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Mac.
...
Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the
corresponding Mac file.
2011-04-25 13:46:31 +02:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
4906f4644f
OPEN-61 Adding locations that redistributable package installs msvc* files.
2011-04-21 22:11:48 +01:00
252cb50c38
merge changes for storm-1088
2011-04-20 20:21:55 -04:00
47b8d252ff
corrected issue in doc/contributions.txt
2011-04-20 07:13:53 -04:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
26b15973af
STORM-1088: fix loading of winmm.dll
2011-04-17 08:04:02 -04:00
af6133dfa5
merge
2011-04-15 14:13:57 -05:00
04f79f6358
STORM-956 Ability to mute dialogs by muting object (or object owner)
2011-04-15 13:13:15 -04:00
7577ec25a0
STORM-1095 FIX Chat preferences > font size should increase size of input text in the chat box.
...
Submitting on behalf of Jonathan Yap.
2011-04-14 00:52:40 +03:00
efa26485df
STORM-1128 Sort the results of using search in the World Map
2011-04-13 15:09:44 -04:00
88a7262340
merge changes for storm-1098
2011-04-12 20:38:04 -04:00
c857064af2
merge changes for storm-1101
2011-04-12 20:35:33 -04:00
3e7481064f
fix contributions.txt whitespace
2011-04-09 18:40:35 -04:00
ab483c6e7c
STORM-1147: fix skin-tight clothing
2011-04-09 17:10:09 -04:00
51b75b8832
merge changes for storm-1108
2011-04-08 17:34:49 -04:00
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
f41cbc0ac8
merge changes for storm-1094
2011-04-06 07:32:56 -04:00
3c5dc8b9d3
STORM-1098 : Made change to debug setting description for ShowNetStatus
2011-04-05 12:37:03 -04:00
ca186a6401
Parenthisized a #define to make it safer, adjusted some notes (and added a TODO) around some extremely obscure code that needs further attention but which is outside this scope.
2011-04-04 10:24:43 -07:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
8ccf3fbe3b
Automated merge up from viewer-development into mesh-development
2011-03-31 16:40:57 -04:00
a71e0b1862
pull latest changes from viewer-development
2011-03-30 17:37:19 -04:00
Oz Linden