Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
31382b7e12
|
add a message for Win32 users to generate the MSVC GnuTLS import library
|
2014-04-09 17:41:18 -07:00 |
|
Stephen Birarda
|
3d071e85d5
|
link GnuTLS to the assignment-client
|
2014-04-09 17:37:23 -07:00 |
|
Stephen Birarda
|
17d2e14f0f
|
find correct parent include folder for gnutls
|
2014-04-09 17:33:41 -07:00 |
|
Stephen Birarda
|
8b23addc47
|
prepend the gnutls library with lib for windows find
|
2014-04-09 17:31:11 -07:00 |
|
Stephen Birarda
|
35519e07dc
|
quote dashed library name to potentially fix find on windows
|
2014-04-09 17:27:37 -07:00 |
|
Stephen Birarda
|
d54c21cdf1
|
fix path suffixes for gnutls headers
|
2014-04-09 17:23:13 -07:00 |
|
Stephen Birarda
|
03bb2573d1
|
look in bin folder to find GnuTLS on windows
|
2014-04-09 17:18:34 -07:00 |
|
Stephen Birarda
|
1c861fbecb
|
resolve conflicts on merge with upstream master
|
2014-04-09 15:36:15 -07:00 |
|
AndrewMeadows
|
89c2812551
|
Merge pull request #2631 from birarda/master
move repo over to Apache 2.0 license
|
2014-04-09 15:34:00 -07:00 |
|
Stephen Birarda
|
11d8d0596a
|
fix ModelUploader header after move
|
2014-04-09 15:15:43 -07:00 |
|
Stephen Birarda
|
c208af2246
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-09 15:10:48 -07:00 |
|
Stephen Birarda
|
3fe5af1505
|
update boilerplate and include guards for other new files
|
2014-04-09 15:08:56 -07:00 |
|
Stephen Birarda
|
5a79079c09
|
fix boilerplates in new DTLS files
|
2014-04-09 15:03:56 -07:00 |
|
Stephen Birarda
|
3f84f36d60
|
add proper boilerplate to GnuTLS find module
|
2014-04-09 15:00:57 -07:00 |
|
Stephen Birarda
|
7dec499b79
|
fix accidental changes to Audio.cpp
|
2014-04-09 14:52:01 -07:00 |
|
Stephen Birarda
|
d4f2c9e631
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-04-09 14:40:14 -07:00 |
|
Stephen Birarda
|
49a9653399
|
Merge pull request #2619 from Atlante45/master
Moved ModelUploader to interface + New error messages
|
2014-04-09 14:38:36 -07:00 |
|
Atlante45
|
7578b282e2
|
CR
|
2014-04-09 14:12:11 -07:00 |
|
Atlante45
|
b05b5a1c7b
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-09 14:11:22 -07:00 |
|
Stephen Birarda
|
973fb95c9d
|
Merge pull request #2630 from AndrewMeadows/scripting
Expose MyAvatar.sessionUUID to JS
|
2014-04-09 13:07:37 -07:00 |
|
Andrew Meadows
|
698e3783e0
|
fixing formatting
|
2014-04-09 13:06:29 -07:00 |
|
Stephen Birarda
|
a33263ec22
|
Merge pull request #2594 from Forceflow/master
GLEW detection on Win32 fix
|
2014-04-09 13:03:00 -07:00 |
|
Andrew Meadows
|
7304049f83
|
update boiler plate to abide by new standard
|
2014-04-09 12:55:29 -07:00 |
|
Clément Brisset
|
184718318c
|
Merge pull request #2634 from stojce/19548
#19548 Modify icons in Interface "mirror"
|
2014-04-09 12:32:04 -07:00 |
|
Stephen Birarda
|
29f8ed3c09
|
manually fix Plane include guard since regex did not catch
|
2014-04-09 12:03:57 -07:00 |
|
Stephen Birarda
|
ae4b8348a2
|
fix header include guards via regex
|
2014-04-09 12:03:17 -07:00 |
|
Stephen Birarda
|
0a9c7e3d74
|
add an include guard to Stats
|
2014-04-09 11:35:20 -07:00 |
|
Andrew Meadows
|
4b306401af
|
use slot to change AvatarData::_sessionUUID
|
2014-04-09 11:32:52 -07:00 |
|
Stephen Birarda
|
ced5e72d39
|
add date to capsule shape
|
2014-04-09 10:46:36 -07:00 |
|
Stephen Birarda
|
2d755adfc0
|
repairs to good code blown away by regex
|
2014-04-09 10:46:20 -07:00 |
|
Stephen Birarda
|
11c235a29e
|
fixes to source files for code remove in regex replace
|
2014-04-09 10:16:56 -07:00 |
|
Stephen Birarda
|
86d236faef
|
repairs to date and author name in RearMirrorTools
|
2014-04-09 10:13:06 -07:00 |
|
Stephen Birarda
|
d2c6ea238e
|
repairs to starfield headers
|
2014-04-09 10:10:00 -07:00 |
|
Stephen Birarda
|
b5a641d60f
|
add back Util code blown away in merge
|
2014-04-09 10:04:19 -07:00 |
|
Stephen Birarda
|
b8bfe325a0
|
add back code blow away in regex replacements
|
2014-04-09 10:03:26 -07:00 |
|
Stephen Birarda
|
f969e050cd
|
add apache license to shader headers
|
2014-04-09 09:59:05 -07:00 |
|
stojce
|
7b26317eaf
|
Merge branch 'master' of https://github.com/worklist/hifi into 19548
|
2014-04-09 18:55:17 +02:00 |
|
stojce
|
ce85e67a42
|
Modify icons in Interface "mirror"
|
2014-04-09 18:54:59 +02:00 |
|
Stephen Birarda
|
619e9d7cd3
|
more header repairs caught via find
|
2014-04-09 09:52:00 -07:00 |
|
Stephen Birarda
|
c9b58c0ee9
|
fix headers in h files in tests, fix Andrew's dates
|
2014-04-09 09:49:47 -07:00 |
|
Stephen Birarda
|
cb402e3eb3
|
run apache header script on tests
|
2014-04-09 09:46:43 -07:00 |
|
Stephen Birarda
|
6ce5a24460
|
missed copyright cleanups in apache header
|
2014-04-09 09:44:38 -07:00 |
|
Stephen Birarda
|
a65f8faea9
|
fix Plane header that was not caught
|
2014-04-09 09:36:13 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
974d8c0427
|
prepare header files for regex run against cpp
|
2014-04-09 09:35:05 -07:00 |
|
Stephen Birarda
|
fbd2066b0c
|
more apache licensing for cmake files
|
2014-04-09 09:25:34 -07:00 |
|
Stephen Birarda
|
067ea5b5b6
|
add a missing space in company name in paintGun
|
2014-04-09 09:22:19 -07:00 |
|
Stephen Birarda
|
4a398494b1
|
ensure spacing in company name for JS licenses
|
2014-04-09 09:21:54 -07:00 |
|
Stephen Birarda
|
9950845566
|
more apache licensing tweaks to JS files
|
2014-04-09 09:19:29 -07:00 |
|