6219 Commits

Author SHA1 Message Date
MathuSum Mut
eeea66e28c
Merge pull request #253 from ronsailer/replace_menu_headers
updated headers in menu directory
2018-10-01 21:38:08 +02:00
Ron Sailer
d123ceb3fd updated headers in menu directory 2018-10-01 22:26:48 +03:00
mathusummut
a1dd099a3a Moved Blender script 2018-10-01 20:20:35 +02:00
mathusummut
721df48fe7 Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-10-01 19:26:52 +02:00
mathusummut
1a0cc7a912 Added Windows script 2018-10-01 19:26:39 +02:00
Andy Alt
5c001bef00
Update CONTRIBUTING.md
add star reminder

[skip ci]
2018-09-30 18:56:27 -05:00
Elliott Alexander
9c1699d6b9 added web site design category and added my name 2018-09-30 16:53:28 -05:00
mathusummut
70bc3b5873 Fixed Windows script 2018-09-30 22:19:57 +02:00
mathusummut
39ea0f4806 Clarified G3D documentation 2018-09-30 10:38:22 +02:00
mathusummut
91b96764a0 Clarified G3D documentation 2018-09-30 10:35:23 +02:00
mathusummut
6feb343eb3 Fixed errors in G3D spec and documentation 2018-09-30 10:30:08 +02:00
andy5995
aadf4c5e41
gl2xml:remove deprecated build options 2018-09-29 22:35:14 -05:00
andy5995
82acf58875 README.md:update main game description
[skip ci]
2018-09-29 21:40:21 -05:00
mathusummut
828542206f Fixed some snprintf warnings 2018-09-29 15:55:41 +02:00
mathusummut
c2dc745299 Removed gl2xml 2018-09-29 15:09:09 +02:00
Andy Alt
8d9d3d3d4e
README.md:add link to blog, remove info that's in FAQ
[skip ci]
2018-09-28 00:57:52 -05:00
mathusummut
c03a9b914a Test fix for OOS message 2018-09-28 00:14:18 +02:00
mathusummut
8c8b827588 Test fix for OOS message 2018-09-28 00:10:04 +02:00
mathusummut
8117d96c63 Fixed building-unit overlap bug 2018-09-27 23:54:45 +02:00
mathusummut
e5cc8044d0 Test for fixing OOS checks 2018-09-27 23:34:44 +02:00
mathusummut
3379702a92 Test for additional OOS checks 2018-09-27 22:51:49 +02:00
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