Tim Felgentreff
|
6717c5d866
|
Merge branch 'master' of https://github.com/Wargus/stratagus.git
Conflicts:
gameheaders/stratagus-game-launcher.h
|
2016-11-27 11:06:10 +01:00 |
|
Tim Felgentreff
|
a86209366e
|
Fix a bug with quoted source paths on win32 extraction
|
2016-11-27 00:09:33 +01:00 |
|
Tim Felgentreff
|
8be2487fa9
|
sometimes, not having an 'extracted' file is a failure
|
2016-11-24 20:16:46 +01:00 |
|
Tim
|
7de49ce579
|
wait for the extraction process to complete on osx, and don't use file patterns, they don't work on Sierra
|
2016-11-23 15:53:46 +01:00 |
|
Tim
|
e75ecdba16
|
small fixes for osx
|
2016-11-23 14:40:45 +01:00 |
|
Tim Felgentreff
|
2d66889d9d
|
Revert "Update PPA URL [skip ci]"
This reverts commit 72bd86b003.
|
2016-11-21 17:24:58 +01:00 |
|
Tim Felgentreff
|
72bd86b003
|
Update PPA URL [skip ci]
|
2016-11-21 11:46:04 +01:00 |
|
Tim Felgentreff
|
3adbda9ae5
|
Fix version check and data path selection on win32
|
2016-11-21 10:32:34 +01:00 |
|
Tim Felgentreff
|
9d0235ec8c
|
support custom DATA_PATH also on windows
|
2016-11-20 19:27:07 +01:00 |
|
Tim Felgentreff
|
2c1cd02cd7
|
More fixes for win32
|
2016-11-20 19:00:35 +01:00 |
|
Tim Felgentreff
|
f05ceaa041
|
make WIN32 useable in macro if tests
|
2016-11-20 18:48:41 +01:00 |
|
Tim Felgentreff
|
86c444351f
|
fix compilation on win32
|
2016-11-20 18:21:53 +01:00 |
|
Tim Felgentreff
|
87f0e1de83
|
another round to make launcher more robust
|
2016-11-20 18:14:49 +01:00 |
|
Tim Felgentreff
|
edc22514ab
|
update gameheaders and dependencies
|
2016-11-20 17:12:54 +01:00 |
|
Tim Felgentreff
|
377cd580b3
|
Update stratagus-game-launcher.h
|
2016-11-20 00:07:29 +01:00 |
|
Tim Felgentreff
|
95660e6ba9
|
Include @andrettin's fix for regenerating wood. Fixes #136
|
2016-11-19 18:56:53 +01:00 |
|
Tim Felgentreff
|
57d63e9cd5
|
rename, concat, and ship our adapted tinyfiledialogs header
|
2016-11-19 15:17:58 +01:00 |
|
Tim Felgentreff
|
8b75dddc36
|
re-order definitions
|
2016-11-19 15:01:43 +01:00 |
|
Tim Felgentreff
|
d37b366456
|
Merge branch 'master' of github.com:Wargus/stratagus
|
2016-11-18 13:14:41 +01:00 |
|
Tim Felgentreff
|
47c26d6918
|
fix compilation on unix again
|
2016-11-18 13:13:18 +01:00 |
|
Tim Felgentreff
|
86e9820730
|
fix game launcher and extraction process for windows
|
2016-11-18 13:03:55 +01:00 |
|
mimooh
|
75700100c4
|
I checked and it worked for me with = operator, unsure about ^=
|
2016-11-17 22:44:24 +01:00 |
|
mimooh
|
036e0bbb47
|
Disable lua checksum for now. s/uint16_t/uint32_t/ doesn't fix the issue as I hoped.
|
2016-11-17 22:40:58 +01:00 |
|
Tim Felgentreff
|
3d84d37718
|
Merge /home/tim/Dev/stratagus/stratagus
|
2016-11-17 14:47:11 +01:00 |
|
Tim Felgentreff
|
6b03b5eedf
|
include tinyfiledialogs in game launcher, and use it to offer extracting data on first launch to a user directory
|
2016-11-17 14:46:19 +01:00 |
|
Tim Felgentreff
|
5b27976755
|
Merge branch 'master' of https://github.com/Wargus/stratagus
|
2016-11-15 00:55:13 +01:00 |
|
Tim Felgentreff
|
c5ba33f406
|
Fix compilation error
|
2016-11-15 00:54:09 +01:00 |
|
Tim Felgentreff
|
8ffc992f58
|
install metaserver on debian
|
2016-11-14 13:43:46 +01:00 |
|
Tim Felgentreff
|
8cd26ee2b9
|
Merge remote-tracking branch 'origin/master' into tim/metaserver
|
2016-11-14 13:37:37 +01:00 |
|
mimooh
|
135ceee025
|
Remove \r line endings before checksumming lua files, to sidestep issues when Windows git autoconverted line endings
|
2016-11-13 21:23:29 +01:00 |
|
mimooh
|
c19081e01d
|
be much more conservative with file checksums for now
|
2016-11-13 14:58:16 +01:00 |
|
Tim Felgentreff
|
7b5d402454
|
Remove \r line endings before checksumming lua files, to sidestep issues when Windows git autoconverted line endings
|
2016-11-11 18:51:38 +01:00 |
|
Tim Felgentreff
|
c9c4bc3731
|
To connect to the metaserver, try on all interfaces unless one was passed on the commandline
|
2016-11-11 18:22:26 +01:00 |
|
Tim Felgentreff
|
39aa96fb62
|
Fix guessing an external interface ip on windows and passing that to the metaserver
|
2016-11-11 15:10:51 +01:00 |
|
Tim Felgentreff
|
472dbc0a2d
|
determine external ip addresses, and advertise the first external interface to the metaserver
|
2016-11-11 10:11:32 +01:00 |
|
Tim Felgentreff
|
db04c640b1
|
remove now useless ntohs in metaserver
|
2016-11-11 01:24:00 +01:00 |
|
Tim Felgentreff
|
49263f688b
|
be consistent with passing around ports
|
2016-11-11 00:59:28 +01:00 |
|
Tim Felgentreff
|
7ca8ed6a80
|
be much more conservative with file checksums for now
|
2016-11-11 00:23:15 +01:00 |
|
Tim Felgentreff
|
c1b4bdb17d
|
fix conversion of port numbers
|
2016-11-11 00:14:38 +01:00 |
|
Tim Felgentreff
|
c3dae4bfee
|
allow not logged in access, fix udp register port
|
2016-11-10 23:46:42 +01:00 |
|
Tim Felgentreff
|
d04059ac25
|
add a function to create the game and send the udp stuff to the metaserver
|
2016-11-10 16:54:41 +01:00 |
|
Tim Felgentreff
|
b743ec9456
|
basic help
|
2016-11-10 15:25:33 +01:00 |
|
Tim Felgentreff
|
6557291c05
|
use metaserver to do a udp hole punch from the client to the server
|
2016-11-10 15:20:53 +01:00 |
|
Tim Felgentreff
|
991f71bc9a
|
cleanup some unused assignments found by clang's scan-build
|
2016-11-09 15:18:45 +01:00 |
|
Tim Felgentreff
|
fd902d8877
|
extend howtorelease info [skip ci]
|
2016-11-09 15:18:11 +01:00 |
|
Tim Felgentreff
|
3180e9f441
|
when warping the mouse in zoomed mode, we need to scale coordinates
|
2016-11-09 12:03:41 +01:00 |
|
Tim Felgentreff
|
72bb74076e
|
use -Z to pass a logical size to render the game at, scaling that up to the viewport size passed with -v
|
2016-11-09 11:55:24 +01:00 |
|
Tim Felgentreff
|
7a6094cbf8
|
Revert "trigger launchpad build". Not working right now and too tired to debug
This reverts commit 72b308b27b.
|
2016-11-09 00:44:09 +01:00 |
|
Tim Felgentreff
|
72b308b27b
|
trigger launchpad build
|
2016-11-09 00:08:05 +01:00 |
|
Tim Felgentreff
|
6922ff42d8
|
error on the default warnings
|
2016-11-08 23:50:55 +01:00 |
|