Commit graph

16512 commits

Author SHA1 Message Date
Tim Felgentreff
8a940b3a58 bundle osx libs 2016-01-07 16:08:43 +01:00
Tim Felgentreff
67331bd94c push default behavior is changing in git 2016-01-06 12:07:41 +01:00
Tim Felgentreff
6524d4bf6d Merge branch 'master' of github.com:Wargus/stratagus 2016-01-06 12:04:00 +01:00
Tim Felgentreff
b1cded7692 publish nightly binaries to github wiki 2016-01-06 12:03:08 +01:00
Tim Felgentreff
e2f91350a0 Update .travis.yml 2016-01-06 11:32:19 +01:00
Tim
68997a9233 on mac os x, build against local toluapp, so later rpath fixing works
Signed-off-by: Tim Felgentreff <timfelgentreff@gmail.com>
2016-01-05 15:27:36 +01:00
Tim Felgentreff
7b8962feb5 Merge pull request from marcelofg55/master
Fullscreen is toggled fine now on OSX
2016-01-05 11:48:59 +01:00
marcelofg55
b390aa16e8 Fullscreen is toggled fine now on OSX 2015-12-27 00:23:16 -03:00
Andrettin
4a530273aa Fix to issue which caused rescued units to get all upgrades regardless of what their new owner actually had 2015-12-26 13:13:26 +01:00
Tim Felgentreff
7946710bb8 Rather than ungracefully killing the audio thread, let the thread cleanup after itself 2015-12-25 02:21:06 +01:00
Tim Felgentreff
a6276c9d3c remove hack for wargus 2015-12-24 00:36:15 +01:00
Tim Felgentreff
05e38e8fc7 set the race for all human players 2015-12-23 19:17:56 +01:00
Tim Felgentreff
7ca62c6949 fix passing the race from ServerSetupState to GameSettings 2015-12-23 15:49:03 +01:00
Andrettin
9a9940e5b3 Fix to issue 2015-12-22 21:16:21 +01:00
Tim Felgentreff
6a52d38558 Merge pull request from Mailaender/patch-1
Fixed FSF address in license text
2015-12-20 17:54:25 +01:00
Tim Felgentreff
b4e8489dd3 Merge pull request from marcelofg55/master
Added thread on sound server
2015-12-20 17:44:38 +01:00
Marcelo
75429d6ebf Sound server now uses a thread to avoid mixing the buffers inside the sdl callback 2015-12-19 17:33:06 -03:00
Matthias Mailänder
2bced0e6d1 Update COPYING
latest version from https://www.gnu.org/licenses/gpl-2.0.txt
2015-12-19 19:00:56 +01:00
Tim Felgentreff
56ad4c7eda Merge branch 'master' of https://github.com/Wargus/stratagus.git 2015-12-13 23:25:58 +01:00
Tim Felgentreff
558ad55bb0 fix a potential bug when requesting supplies for queued AI things caused by re-arranging the queue 2015-12-13 23:20:07 +01:00
Tim Felgentreff
538e85041e Merge pull request from Wargus/tim/forgiving-walls
For incomplete wall tilesets, keep the current directionality if the new direction is missing
2015-12-10 18:25:16 +01:00
Tim Felgentreff
fca4f039ce For incomplete wall tilesets, keep the current directionality if the new direction is missing 2015-12-10 14:17:48 +01:00
Tim Felgentreff
80e8f274ad [skip ci] delete .bzr-builddeb 2015-12-09 10:25:14 +01:00
Tim Felgentreff
8527d5bbfc Rename .bzrignore to .gitignore 2015-12-09 10:24:15 +01:00
Tim Felgentreff
6034ff515d fix genversion if not running in git repo 2015-12-08 12:01:52 +01:00
Tim Felgentreff
4fb42250d3 and of course, if not using the m flag on fscanf, we need to pass char*, not char** 2015-12-08 11:45:01 +01:00
Tim Felgentreff
9a70b60ebd sudo is no longer required on Travis, switch to faster build infrastructure 2015-12-08 11:43:24 +01:00
Tim Felgentreff
31e8b89a14 forgot allocation 2015-12-08 11:41:11 +01:00
Tim Felgentreff
7c62bfaf95 m modifier isn't supported on Windows fscanf implementation 2015-12-08 11:38:07 +01:00
Tim Felgentreff
705ba176b7 update man page with current options 2015-12-08 11:10:57 +01:00
Tim Felgentreff
aa82e54b5f update documentation after move to Github 2015-12-08 10:55:16 +01:00
Tim Felgentreff
5345a4cdeb update genversion to use GitRev 2015-12-08 10:29:13 +01:00
Andrettin
86bb1e22c2 Added missing include 2015-12-04 18:44:45 +01:00
Andrettin
c17cf49fb6 Fixed quotation marks 2015-12-04 18:31:05 +01:00
Andrettin
b5d66547f7 Added autosave support, updated changelog, updated version to 2.4.0 2015-12-04 18:13:53 +01:00
Andrettin
bf514a2027 Merge pull request from Wargus/tim/lua-args
Allow passing a string as argument to the Lua startup file
2015-12-04 17:43:54 +01:00
Tim Felgentreff
08d1a8bf21 Merge pull request from KroArtem/master
Cleanup repo from maemo code
2015-12-04 16:50:54 +01:00
Tim Felgentreff
38ac614359 use default args instead of overloading 2015-12-04 15:38:33 +01:00
KroArtem
9c29a2dd63 removed all maemo stuff 2015-12-04 13:49:11 +03:00
Tim Felgentreff
13db0d48c9 be a bit more clever trying to find a custom lua startup file 2015-12-04 10:44:12 +01:00
Tim Felgentreff
6739208bbe allow passing arguments to lua scripts 2015-12-03 23:02:02 +01:00
KroArtem
358af4e537 start removing maemo support 2015-12-03 15:03:35 +03:00
Tim Felgentreff
9ea28e4cee [skip ci] Add links to packages 2015-12-02 13:46:50 +01:00
Andrettin
e518509305 Updated Debian changelog and made some spelling fixes 2015-12-02 13:33:57 +01:00
Tim Felgentreff
889cecc674 bump version and update urls for debian package 2015-12-02 12:52:12 +01:00
Tim Felgentreff
62d1dc4df5 Merge pull request from Wargus/tim/vs2015
Compile with VS 2015 with updated dependencies
2015-12-02 09:56:22 +01:00
Tim Felgentreff
7479cc5522 [skip ci] deploy windows installer from master only 2015-12-02 09:49:37 +01:00
Tim Felgentreff
3ab44693d8 build nsis installer on appveyor and release to github 2015-12-01 17:43:36 +01:00
Tim Felgentreff
9e43d695d2 updates to make compilation with vs 2015 work 2015-12-01 17:43:27 +01:00
Tim Felgentreff
fdd3fc232f fix a possible uninitialized variable return 2015-12-01 17:43:27 +01:00