5900 Commits

Author SHA1 Message Date
andy5995
fc72932ca7
menu_state_custom_game:add FIXME comment 2018-02-11 04:49:49 -06:00
andy5995
af3ff60cb6 menu_state_connected_game:disable slots > max map players
This disables slots >= mapInfo.hardMaxPlayers from headless admin
control.

I forgot to check how the menu looked when connecting to a headless
server when I "completed" #13.
2018-02-11 04:40:46 -06:00
andy5995
bc8be56c77
remove IRC link [skip ci]
One dev room is enough.
2018-02-06 21:28:13 -06:00
andy5995
f703e6193e [#21]join running game:change value in for statement
This may  help with #21
2018-02-05 16:49:11 -06:00
Andy Alt
a8255e5c97
[closes #13] enhanced observer mode additions and cleanup (#45)
* additions and cleanup [skip ci]

* disallow observers to change their faction and team [skip ci]

* disable observer slots from admin control

* when checkboxObserversAllowed is toggled, update correctly

* Also adjusted the labels better

* when scenario is checked, observer mode is disabled and extra slots are
closed

* attempted to add a feature that would allow the admin to change to a
different slot (doesn't work yet)

* graphics still needs some adjustment

* host can not go to a slot > mapInfo.maxPlayers
2018-02-05 16:01:29 -06:00
andy5995
7caa602e46 make-binary-archive:renamed files so the script would work 2018-02-04 14:26:54 -06:00
andy5995
7fbac48394 make-binary_archive.sh:add error checking
Also changed references to zetaglest
2018-02-04 14:26:54 -06:00
Jammyjamjamman
4f29aaf470
Fixed a case typo in zetaglest server script (which fixes bug #50). [skip ci] 2018-02-04 16:38:57 +00:00
Andy Alt
30e063d4f1
Merge pull request #49 from ZetaGlest/revert_default_attack
unit.cpp:revert default right-click to move
2018-02-03 15:00:11 -06:00
andy5995
b03e62f57b
unit.cpp:revert default right-click to move
I think this will help until #48 is straightened out.

See Also: #8
2018-02-03 14:20:41 -06:00
Andy Alt
b6a891d6c1 types:reformat/style (#47)
`indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl` Merging @andy5995 's code reformatting.
2018-02-03 11:49:20 +00:00
andy5995
8f19404e7f
Cmakelists.txt:change filename to start_zetaglest_gameserver 2018-02-02 11:42:34 -06:00
andy5995
c4f3535cd9
add -Wall to build flags
This will output extra warnings that may be useful
2018-02-01 21:18:39 -06:00
andy5995
040ef8c895
remove git revision string
This will help speed up build-time when small changes are made.
2018-02-01 20:50:50 -06:00
Andy Alt
c0251145f8 when scenario xml file not present, don't err (#43)
* when scenario xml file not present, don't err

For ZetaGlest/zetaglest-data#30

* remove 'else' clause
Accepted @andy5995 's scenario browser improvement (does not throw major error if scenario is malformed).
2018-02-01 23:51:46 +00:00
andy5995
0f2bac434a
add Arch Linux dependency info (closes #17)[skip ci]
* Updated AUTHORS.md
* Added @biels
* Added @dafky2000

I removed myself from the other sections. As one of the project
maintainers, it can be assumed I contribute to other aspects. ;)
2018-02-01 16:37:34 -06:00
andy5995
8858e119bc
game_camera.cpp:add space between angle brackets 2018-02-01 14:08:19 -06:00
andy5995
7136acffc2
add space between right angle brackets
build fails on travis otherwise
2018-02-01 13:55:34 -06:00
andy5995
0cbb7d518a
game & ai:restyle/reformat code 2018-02-01 13:39:41 -06:00
Jammyjamjamman
38de15878d Added comments to buildCommand in commander.cpp . Also slightly changed a comment in unit_updater.cpp. 2018-02-01 14:52:51 +00:00
andy5995
acedc2bf3c
restyle/reformat 4 files
reformatted before I work on them
2018-02-01 01:03:00 -06:00
andy5995
494c68dc88
renderer.cpp:revert/uncomment throw statement
I commented this out to get rid of a warning. Perhaps unwise.
2018-01-31 23:49:06 -06:00
andy5995
87b85c9a50
change megaglest to zetaglest
* Among other minor name changes, this also puts "ZetaGlest" in the
window title bar
2018-01-31 23:48:00 -06:00
Andy Alt
0608f26385 glestkeys.ini:change some keys (#42)
* glestkeys.ini:change some keys

This corrects an error I made in
bf5a04be18f2b16b8a565acff4baabc5fbfed293

And T is now for team chat
H is for chat history (instead of "M")
Z is for HotKeySelectStoreUnit

* add comment
Squashed and merged Andy's hotkey changes.
2018-02-01 01:04:31 +00:00
Andy Alt
e6148d462e
README.md:Add link to mod content list in the data repo [skip ci] 2018-01-31 17:51:08 -06:00
MathuSum Mut
d5cd1ae1a7 Included MathuSum Mut and Keith Sammut
^_^
2018-01-31 15:19:18 -06:00
andy5995
70ec6b4269
CONTRIBUTING.md:add combined issue link [skip ci]
Combined issue link:

https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3AZetaGlest
2018-01-31 02:26:05 -06:00
andy5995
5588ab5d7d
ChangeLog:fix description, add link [skip ci] 2018-01-31 02:18:22 -06:00
andy5995
90a3fed71a
ChangeLog.md:noting recent changes [skip ci]
This notes recent changes that would be of most interest to regular
players
2018-01-31 02:13:31 -06:00
andy5995
25a4ead682
website_design.md:create doc, add link [skip ci]
* wrote an initial doc with info on how to make changes to the web sites
2018-01-28 21:23:29 -06:00
andy5995
a97d4c85c1 moved unit html site generate to zetaglest.github.io
I added these in this commit, on the web site repo:

04a619efa3
2018-01-28 20:45:15 -06:00
Jammyjamjamman
25bdead5e5 Some extra comments added to code. [skip ci] 2018-01-28 12:56:44 +00:00
andy5995
bf5a04be18 add hotkey value for "move"
This is needed now that
2c4fc340de
has been implemented
2018-01-28 03:36:51 -06:00
Jammyjamjamman
827c4c267d
Update README.md
Added missing command for trying the game without contributing
2018-01-28 01:47:32 +00:00
andy5995
57898f939a CONTRIBUTING.md:we are working on the develop branch [skip ci] 2018-01-27 16:16:28 -06:00
Jammyjamjamman
d96a63796e
Merge pull request #32 from Jammyjamjamman/save_upgrade_progress
Unit produce/ upgrade progress is now reset when completed or cancell…
2018-01-27 22:02:35 +00:00
Jammyjamjamman
a8fe68c7a9 Fixed the typo I created in a comment. 2018-01-27 21:52:12 +00:00
Jammyjamjamman
2e1b197c23 Unit produce/ upgrade progress is now reset when completed or cancelled instead of when it starts (which fixes issue #30). 2018-01-27 21:08:08 +00:00
Jammyjamjamman
0b3b562b35
Update unit.cpp
Added a missing bracket in a comment.
2018-01-27 20:11:08 +00:00
Jammyjamjamman
2c4fc340de Change the default command for attacking units to attack. 2018-01-27 13:42:18 -06:00
andy5995
018581a3d6 [incomplete] update macos build and config files [#25] [skip ci] 2018-01-26 15:08:50 -06:00
Jammyjamjamman
7e7fad529e Changed windows glest.ini to find the correct masterservers and user folders. 2018-01-26 15:23:06 +00:00
andy5995
d69afe16bc
menu_state_custom_game:correct spelling
* correct to updateControllers
2018-01-26 00:59:31 -06:00
andy5995
ec5346a2cd
html template:change title in head [skip ci] 2018-01-25 16:25:52 -06:00
andy5995
1327f06fa7
html template:add link to Discord [skip ci] 2018-01-25 16:15:52 -06:00
andy5995
071dbae41a
README:add link to faction/unit html docs [skip ci] 2018-01-25 16:05:33 -06:00
andy5995
af5a9beef6 tools:update files that generate html unit docs
This was needed for ZetaGlest/zetaglest.github.io#1
2018-01-25 16:03:07 -06:00
Jammyjamjamman
05b4e5e9a3 fixed build-mg script by making it no longer look for and update game data. Now it just gets the deps and builds the game. 2018-01-25 21:28:40 +00:00
andy5995
d52c3e1693
menu_state_connected/custom.cpp: add space between >>
Same problems as 71c9e59b6a9958a87a2b565d5a0424ba8eaba1ca
2018-01-25 14:30:00 -06:00
andy5995
71c9e59b6a
main.cpp:add space between >>
Attempt to fix failing build

https://travis-ci.org/ZetaGlest/zetaglest-source/jobs/333402071#L1426

Build passes on my system, but travis doesn't like it.
2018-01-25 13:40:41 -06:00