6145 Commits

Author SHA1 Message Date
andy5995
e6efa4fbd5 Revert "g2xml.c:fix CWE-606:Unchecked Input for Loop Condition"
This reverts commit 5a49a4492e507d7a3313ac59af5b010084eda4fb.

Mathu is convinced this was a pointless and potentially detrimental patch ;)
2018-09-27 14:07:38 -05:00
andy5995
5a49a4492e
g2xml.c:fix CWE-606:Unchecked Input for Loop Condition 2018-09-27 13:52:18 -05:00
andy5995
62e3819d86 maps:allow zgm extension, use zgm by default in editor 2018-09-27 02:45:23 -05:00
mathusummut
5a041e4e36 Removed servers.ini from script 2018-09-27 07:45:19 +02:00
mathusummut
1b3a2d6613 Disabled double right-clicking 2018-09-27 07:42:15 +02:00
mathusummut
3aec9f891c Reversted tentative fix to double right-clicking 2018-09-27 00:53:20 +02:00
mathusummut
c180f81117 Double right-click fix test 2018-09-27 00:49:48 +02:00
mathusummut
e1f52a7ed8 Removed servers.ini 2018-09-27 00:48:42 +02:00
andy5995
7bf996e04b Revert "cmake:remove install directive for icons"
This reverts commit c4e7a1df240d69a1a56d39b132ecc79ca885dd10.

Icons are needed for the Windows build. They will therefore be removed
from data, where I had copied them to yesterday.
2018-09-26 17:33:31 -05:00
andy5995
c4e7a1df24 cmake:remove install directive for icons
The icons were moved to data.

https://github.com/ZetaGlest/zetaglest-data/tree/develop/others/desktop

I need to add the install directives to the cmake file in data, on the
condition that they only install if the editor and model viewer are
built.
2018-09-26 17:23:44 -05:00
mathusummut
1a47746356 Added return value to giveNetworkCommand 2018-09-27 00:22:41 +02:00
mathusummut
2ad935481e Fixed potential OOS 2018-09-27 00:13:16 +02:00
andy5995
d8e2bfa263
client_interface.cpp:use lang.getString for disconnect msg
This will help keep strings consistent, and easier to edit later
(hopefully). I'll add the string to data.
2018-09-26 16:59:27 -05:00
mathusummut
ed5b17abb8 Fixed cmake icon issue 2018-09-26 22:32:15 +02:00
mathusummut
b040a479bc Fixed potential command-ordering issue 2018-09-26 22:25:44 +02:00
mathusummut
5d250fb60b Fixed double right-click issue 2018-09-26 22:10:22 +02:00
mathusummut
04cb018d10 Updated Windows instructions 2018-09-26 10:57:46 +02:00
andy5995
db0ba2cc55
cmake:remove icon install, now in data repo
8fca3b1b25
2018-09-26 01:45:05 -05:00
andy5995
407774249d
.gitignore:remove rules for cmake and makefiles
They'd be included in the "build" rule
2018-09-26 01:44:20 -05:00
andy5995
64bcd0af37
CMake:more cleanup
@mathusummut can you update the comment regarding Win building at the
top of the main CMake file please

Signed-off-by: andy5995 <andy400-dev@yahoo.com>
2018-09-26 01:03:16 -05:00
andy5995
4e90adfd84
icons:moved to data repo
As part of
8fca3b1b25
2018-09-26 01:01:52 -05:00
andy5995
80a4d65ec0
Cmake:removing unix condition
I want to see how this builds on osx with the unix condition removed
2018-09-25 14:43:22 -05:00
andy5995
d5d295af70
Slackbuild files:initial commit (#211)
These will need editing before the release
2018-09-25 13:47:45 -05:00
andy5995
57dd66268f
cmake:add -x11 flag
Found this in a patch
http://slackbuilds.org/repository/14.2/games/megaglest/?search=megaglest
2018-09-25 13:45:00 -05:00
andy5995
be8a45bca0 cmake:use miniz if zlib isn't found 2018-09-25 13:26:33 -05:00
mathusummut
c04e75e19c Disabled streflop 2018-09-25 20:24:38 +02:00
mathusummut
3819da6d0b Fixed printf line 2018-09-25 10:11:16 +02:00
andy5995
2f5e6b6439
CMake:use external zlib if present 2018-09-25 02:07:33 -05:00
mathusummut
39310bad4d Code cleanup 2018-09-25 01:27:39 +02:00
mathusummut
98558d0177 Fixed unfinished building FOW bug 2018-09-24 15:19:05 +02:00
Andy Alt
0f26a90df7
core_data:improve playSound function
@Jammyjamjamman after playing with this code I started understanding better what you were trying to explain to me (months ago). I believe this will now work as intended.
2018-09-23 22:43:14 -05:00
mathusummut
e82c807491 Removed miniz size support warning 2018-09-23 15:05:24 +02:00
mathusummut
d7c63ed9dc Fixed potential null reference 2018-09-23 15:01:24 +02:00
mathusummut
dde3804f31 Fixed capitalisation of Disconnected message 2018-09-23 12:04:15 +02:00
mathusummut
934d7845c2 Fixed capitalisation of Server message 2018-09-23 11:58:06 +02:00
andy5995
d774a1d179
maint:addressing "strength" issue
@JoaoMarcosCSilva helps this project stay sharp!
2018-09-22 16:58:53 -05:00
andy5995
ccb507a3f4
core_data/maint:coding style, playSound 2018-09-22 14:19:49 -05:00
andy5995
3143d0c7b6
ircclient:remove unneeded join and leave message 2018-09-22 13:27:54 -05:00
mathusummut
801e8e0314 Changed network interrupt message 2018-09-22 12:50:21 +02:00
mathusummut
f33c8cd27b Test fix for rejoining 2018-09-22 11:10:11 +02:00
MathuSum Mut
3045e736ea
Improved code format spec 2018-09-20 23:44:09 +02:00
Andy Alt
a6f217f7c3
Update CONTRIBUTING.md
add case and indent info [skip ci]
2018-09-20 16:40:26 -05:00
Andy Alt
3d276092c2
Update CONTRIBUTING.md
add coding style info [skip ci]
2018-09-20 16:25:39 -05:00
mathusummut
3f750ee590 Attempts to recover from errors 2018-09-20 21:56:02 +02:00
mathusummut
8e5a8fe5ae Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-09-20 19:58:28 +02:00
mathusummut
5b0737190d Now handles lobby errors more gracefully 2018-09-20 19:58:12 +02:00
andy5995
c4404d4983 simulate_lag.txt:add doc for simulating lag
This may help with testing
2018-09-20 01:39:40 -05:00
mathusummut
d992eaa4bb Removed throw from client disconnect 2018-09-19 20:34:03 +02:00
mathusummut
820b1bf5fd Removed throw from client disconnect 2018-09-19 19:56:45 +02:00
andy5995
5c117d3b68 BUILD.md:typo (mk->mkdir)
[skip ci]
2018-09-19 11:11:26 -05:00