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
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
andy5995
d8dafe5015
a.cpp:remove stray char
2018-01-25 12:41:38 -06:00
Jammyjamjamman
04cddae679
Added comments describing how the AI works.
2018-01-25 11:59:27 +00:00
Jammyjamjamman
9be79400fb
Corrected newlines
2018-01-25 10:48:40 +00:00
Jammyjamjamman
925e0990f2
Added myself to contributions and Andy to areas I know he contributed ;-).
2018-01-25 10:48:01 +00:00
andy5995
643aff1aa3
glest_game/menu:reformat/restyle source code
...
* used 'indent -nut -i2 -bli0 -ppi 3 *`
2018-01-25 02:21:52 -06:00
andy5995
0f469061ec
glest_game/main:reformat/restyle source code [skip ci]
...
* used 'indent -nut -i2 -bli0 -ppi 3 *`
2018-01-25 02:21:15 -06:00
andy5995
201af4b890
AUTHORS, ChangeLog:add @onpon4, list new scenarios [skip ci]
...
* I also mentioned the enhanced observer feature in the ChangeLog,
noting that it's not completely finished yet.
2018-01-25 01:47:52 -06:00
andy5995
91517e2307
fixing grammar from 9e704ce [skip ci]
2018-01-24 22:11:27 -06:00
andy5995
9e704ce28a
CONTRIBUTING.md: add note about [skip ci]
2018-01-24 22:03:46 -06:00
andy5995
534d2ae466
review and minor edit to clone and build instructions
...
These are some minor changes I made after reviewing changes made by
@Jammyjamjamman in these commits
464860aa023e4089f4c6f108e019d66d60052581
38a9356e203c05e2aec5e346363dd2707782262b
f587c8548ff9d581ebf67082359a4e498ed45042
80af96b5cdf94fede7c357b592cd27647d68280b
Jammy, I wrapped some lines. I've been told by project maintainers that
when possible, keep lines in md files less than 79 chars or so. The
files render the same when viewed through GitHub, so it's more for
readability when editing.
You'll find though there are times to break those rules. ;)
(ping #13 )
2018-01-24 21:55:24 -06:00
Jammyjamjamman
80af96b5cd
Corrected BUILD.md
2018-01-25 01:30:59 +00:00
Jammyjamjamman
f587c8548f
Some more modifications to the clone instructions
2018-01-25 01:28:22 +00:00
Jammyjamjamman
38a9356e20
The game now looks for the data in a folder called 'zetaglest-data', adjacent to its repo folder.
2018-01-25 01:22:50 +00:00
Jammyjamjamman
464860aa02
Made changes to the AI; hopefully upgrades!
2018-01-24 12:48:39 -06:00
andy5995
31d91e8544
observers don't use a slot on maps [wip #13 ]
...
* This reverts part of 42541caab7d457d0c73f63ec6dc1e8816ceff704
* This fixes the bug from 42541caab7d457d0c73f63ec6dc1e8816ceff704
where if there 4 slots being used on a 4 player map, the game will crash
if an observer is in the 5th slot.
* The menu needs to be altered to accomodate the extra lines of text.
* There needs to be checks put in place so people in the extra slots can
only choose "observer" mode. If they choose a different faction, the
game will crash.
2018-01-24 02:40:44 -06:00
Andy Alt
42541caab7
[wip] change how observer mode works ( #13 ) ( #14 )
...
The positioning of the labels and text will need changing. I'm going to
ask @jammyjamjamman if he'll fix it up all nice and pretty.
* [wip] change how observer mode works (#13 )
* [wip] opens 10 slots on any map [observer mode]
* [wip]set start location for observers [skip ci]
* [wip] new observer mode works with no crashing
I need to clean up the code more though. I only did the bare minimum to
change the way observer mode works.
2018-01-23 21:00:32 -06:00
