19803 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bret Curtis	4d60fe5a76	reverting back	2018-06-30 06:10:26 +00:00
Finbar Crago	09c9bd34c3	cleanup more unnecessary struct keywords...	2018-06-30 12:43:50 +10:00
Bret Curtis	b8b07b52f0	try this...	2018-06-29 22:42:12 +00:00
Bret Curtis	4177fd04eb	Update before_script.msvc.sh ... Does it blend?	2018-06-29 21:08:42 +02:00
Bret Curtis	209359bbc3	Try this on for size...	2018-06-29 19:07:39 +00:00
Bret Curtis	78a3f95ee4	Update before_script.msvc.sh	2018-06-29 18:03:25 +00:00
Bret Curtis	2bf0d598cf	Update before_script.msvc.sh ... Wrap in quites	2018-06-29 20:01:35 +02:00
Capostrophic	6e9c08083d	Add missing empty attacker checks	2018-06-29 20:35:45 +03:00
Capostrophic	bccba24c40	Make unarmed creature attacks not affect armor condition (fixes #2455)	2018-06-29 20:18:28 +03:00
Bret Curtis	9b6ea0e89f	# because our CI VMs are not public, MRs can't use them and timeout	2018-06-29 15:15:29 +00:00
Bret Curtis	d3dfe17441	try limiting scope	2018-06-29 15:13:06 +00:00
Finbar Crago	69cd7031e7	Merge branch 'master' into fix_quickkey_segfalt	2018-06-29 23:46:36 +10:00
Finbar Crago	596be205c1	cleanup unnecessary struct keywords...	2018-06-29 23:43:51 +10:00
Bret Curtis	06216aa124	Update .gitlab-ci.yml	2018-06-29 13:36:00 +00:00
Finbar Crago	2722ca50fb	fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]	2018-06-29 23:32:05 +10:00
Bret Curtis	c474709127	Update before_script.msvc.sh	2018-06-29 15:26:11 +02:00
Bret Curtis	ca0f6fff4a	Update before_script.msvc.sh	2018-06-29 13:25:36 +00:00
Bret Curtis	dc48a46e50	Update before_script.msvc.sh	2018-06-29 13:22:07 +00:00
Bret Curtis	a6d6dd5995	updating for the nits	2018-06-29 13:17:19 +00:00
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