19884 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bret Curtis	8811c7141a	Update before_script.msvc.sh ... taking nits into account :)	2018-06-29 15:14:23 +02:00
Marc Zinnschlag	a45d86bdf3	Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'	2018-06-29 12:55:55 +02:00
Marc Zinnschlag	f06dd39892	Merge remote-tracking branch 'upstream/master'	2018-06-29 12:52:54 +02:00
Bret Curtis	c2ff30c4d7	correcting from GH/AV feedback, testing on GL.	2018-06-29 09:33:51 +00:00
Bret Curtis	a532aef935	Update before_script.msvc.sh ... updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.	2018-06-29 11:31:37 +02:00
Bret Curtis	4c0e475092	Update before_script.msvc.sh ... Use powershell trick with boost_temp so there is little chance of collision.	2018-06-29 10:16:28 +02:00
Bret Curtis	bccd83c656	Use 1.67	2018-06-29 08:09:41 +00:00
Bret Curtis	bc830a9c45	use boost_temp	2018-06-29 08:00:54 +00:00
Bret Curtis	63bbc77ee7	try using the powershell trick from AnyOldName3	2018-06-29 07:51:45 +00:00
Finbar Crago	7ae388086b	Merge branch 'master' into fix_quickkey_segfalt	2018-06-29 12:34:53 +10:00
Thunderforge	72f6b1a693	Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"	2018-06-28 20:13:18 -05:00
Bret Curtis	3379eafd33	Update before_script.msvc.sh	2018-06-28 20:44:22 +00:00
Bret Curtis	3ceb9116de	Give pwd -W a try	2018-06-28 20:28:58 +00:00
Finbar Crago	ed71656ea6	fix updateActivatedQuickKey() crash ... keyboard numbers don't start at zero...	2018-06-29 01:58:57 +10:00
Bret Curtis	c4a4111b2e	Update before_script.msvc.sh	2018-06-28 15:33:32 +00:00
Bret Curtis	fb6ad9faec	try %TMP% ?	2018-06-28 15:23:56 +00:00
Bret Curtis	4ad3d66629	try using just ${TMP}	2018-06-28 14:18:58 +00:00
Bret Curtis	8be52d228e	Update before_script.msvc.sh ... small fixes	2018-06-28 15:12:26 +02:00
Finbar Crago	24d5fb09da	fix crash on simultaneous key presses	2018-06-28 22:55:02 +10:00
Bret Curtis	60ec340fa3	remove toolset_real, use just toolset, do proper comparison	2018-06-28 12:18:01 +00:00
Bret Curtis	71314f0c3a	Use boost 1.67 instead of 1.61	2018-06-28 12:03:52 +00:00
Bret Curtis	46575d8de7	Update before_script.msvc.sh ... 1.61 -> 1.67	2018-06-28 14:01:41 +02:00
Bret Curtis	660193ae1b	Update before_script.msvc.sh ... This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.	2018-06-28 13:59:23 +02:00
Bret Curtis	1c4363eaa6	Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.	2018-06-28 11:22:54 +00:00
Bret Curtis	7bf502dd02	Bash it out!	2018-06-28 11:09:27 +00:00
Bret Curtis	1061270ac0	Try using @TEMP@ instead of hard coding it.	2018-06-28 11:05:10 +00:00
Bret Curtis	45d77372a0	with 260 char path fixed, this should work.	2018-06-28 10:41:12 +00:00
Bret Curtis	2d70c94733	gather up everything with 7zip	2018-06-28 09:05:39 +00:00
Bret Curtis	f07d50e5bf	Merge pull request #1785 from akortunov/warnfix ... Fix some GCC warnings	2018-06-28 10:33:51 +02:00
Bret Curtis	102266d08d	Merge pull request #1784 from nikolaykasyanov/revert-sdl-get-attribute ... Revert "Retrieve SDL window settings instead of using magic numbers"	2018-06-28 10:28:49 +02:00
Bret Curtis	a8adb9374b	use quotes	2018-06-28 08:24:34 +00:00
Finbar Crago	d790a27060	Merge branch 'master' into fix_quickkey_segfalt	2018-06-28 18:16:00 +10:00
Bret Curtis	7cd0235fed	Try creating a zip and archiving it.	2018-06-28 07:56:40 +00:00
Andrei Kortunov	d9a1de0ec7	Do not use deprecated function	2018-06-28 11:13:32 +04:00
Andrei Kortunov	5455490ad2	Avoid fall-through in spell selection	2018-06-28 11:12:48 +04:00
Finbar Crago	80a3f0a0d4	switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers	2018-06-28 17:02:25 +10:00
Finbar Crago	335e2c5897	add keyData struct + general cleanup	2018-06-28 13:27:08 +10:00
Bret Curtis	83e23ee6fd	gather up artifacts and use all processors available	2018-06-27 20:45:51 +00:00
Nikolay Kasyanov	5fcb091127	Replace FIXME with a detailed explanation of the issue	2018-06-27 22:40:09 +02:00
Bret Curtis	f17426cbcd	give boost 1.67 a spin with msvc 14.1	2018-06-27 20:24:08 +00:00
Nikolay Kasyanov	9c78364c45	Revert "Merge pull request #1771 from Xenkhan/master" ... This reverts commit 9667dd051c, reversing changes made to f52e06fc19.	2018-06-27 22:19:09 +02:00
Bret Curtis	8511f2398a	try a set and call?	2018-06-27 16:53:27 +00:00
Bret Curtis	df23e0f857	Try calling it directly	2018-06-27 16:39:45 +00:00
Bret Curtis	bd602847b5	fix broken QT 5.7.0 link	2018-06-27 15:07:53 +00:00
Bret Curtis	59a4251a6a	try to extract boost higher up in dir, then move.	2018-06-27 14:36:20 +00:00
Bret Curtis	609d6a1b29	bad syntax	2018-06-27 14:05:05 +00:00
Bret Curtis	b6fc204dd3	be more aggressive about suppressing message boxes	2018-06-27 14:02:30 +00:00
Bret Curtis	f7e1083ba4	get more output from boost	2018-06-27 13:34:37 +00:00
Bret Curtis	da5d7afe22	Update .gitlab-ci.yml	2018-06-27 13:25:23 +00:00
Bret Curtis	6751a7991d	Update .gitlab-ci.yml	2018-06-27 12:36:12 +00:00