mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-24 22:51:27 +02:00
Code Issues Projects Releases Wiki Activity
6,300 Commits 1 Branch 32 Tags
768300e39593c2646f05c167dfa92bdd5d25182c
Commit Graph

6300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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

464860aa02

38a9356e20

f587c8548f

80af96b5cd

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 42541caab7
* This fixes the bug from 42541caab7
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
andy5995
ce3f792f94 change version to 0.8.01 (#3) 2018-01-23 13:13:15 -06:00
andy5995
147264d089 program.cpp:change if to #if 
changed some if statements to use a preprocessor directive.
 2018-01-23 00:30:22 -06:00
Andy Alt
2d73371f79 Merge pull request #19 from Jammyjamjamman/ai_speedup 
modified AI code so that AI performs updates faster.
 2018-01-22 22:55:14 -06:00
Jammyjamjamman
95c3ebbd10 modified AI code so that AI performs updates faster. 2018-01-23 02:32:39 +00:00
andy5995
930808c669 link to data-guidelines for contributing mods, scenarios, etc [skip ci] 2018-01-22 17:31:27 -06:00
Andy Alt
4e9ed100dc Merge pull request #15 from ZetaGlest/in_game_join 
menu_state_custom_game.cpp:enable ability to join a running game

I assume this will help with #5
 2018-01-21 01:29:12 -06:00
andy5995
185b56b8ea menu_state_custom_game.cpp:enable ability to join a running game 
If there are network slots open when the game starts, players can join a
running game.

From the game setup menu, select "advanced options" -> in-game join

Not sure how stable it is though.
 2018-01-21 01:27:25 -06:00
andy5995
014329f94b README.md:update 
* fixed formatting
* added link to screenshots
 2018-01-19 12:53:40 -06:00
andy5995
f7812910f4 expand documentation [skip ci] 2018-01-19 12:25:37 -06:00
Andy Alt
2008e7c98b Create CODE_OF_CONDUCT.md 2018-01-19 11:51:39 -06:00
andy5995
7fb3d3eec8 update data paths 2018-01-17 21:57:53 -06:00
andy5995
49882f998a git_update.sh:remove 2 repos from being pulled [skip ci] 
Only the 2 remaining repos are needed to try the game if you're not
using a fork

https://github.com/ZetaGlest/zetaglest-source#try-the-game-without-contributing
 2018-01-17 21:38:23 -06:00
andy5995
61738cc167 git_update.sh:fix [skip ci] 
This script is for people who clone the repo without forking

https://github.com/ZetaGlest/zetaglest-source#try-the-game-without-contributing
 2018-01-17 21:18:27 -06:00
andy5995
343b2c96b9 glest-dev.ini:change path to data [skip ci] 
The path to the data is now different

See:
https://github.com/ZetaGlest/zetaglest-source#try-the-game-without-contributing

https://github.com/ZetaGlest/zetaglest-source/blob/develop/CONTRIBUTING.md#set-up-the-repositories-locally
 2018-01-17 21:03:24 -06:00
andy5995
d9302993f8 CONTRIBUTING.md:formatting 2018-01-17 20:58:32 -06:00
andy5995
08952d0e9d CONTRIBUTING.md:improve instructions [skip ci] 2018-01-17 20:55:45 -06:00
andy5995
9f19b90ee1 CONTRIBUTING.md:update contributing instructions [skip ci] 2018-01-17 20:51:01 -06:00
andy5995
e928dbacb4 cleanup after removing submodules [skip ci] 2018-01-17 20:43:32 -06:00
andy5995
71ed57c5eb .gitmodules:remove 2018-01-17 20:15:00 -06:00
andy5995
92a98741f9 update link to server list (use https) [skip ci] 2018-01-17 16:18:55 -06:00
andy5995
ec62848392 AUTHORS.md:add @sexybiggetje [skip ci] 
Martijn was generous enough to submit
ZetaGlest/zetaglest-masterserver#3
 2018-01-17 14:46:41 -06:00
andy5995
8f77f6a231 README:add link to server list [skip ci] 2018-01-17 12:59:17 -06:00
andy5995
3976dc0f0a glest.ini:update with urls to ZG master server [skip ci] 2018-01-17 12:24:48 -06:00
andy5995
2370c12add docs: moved info about cloning forks to CONTRIBUTING 2018-01-16 16:24:41 -06:00
andy5995
c6d1d476d2 README.md: updated instructions for clone forks 
This will put data where glest-dev.ini is looking for it, and eliminate
the need of using --data-path when running ./zetaglest
 2018-01-16 15:06:36 -06:00
andy5995
41443d222c README:add Project goals 
@sexybiggetje and @dafky2000 recently asked me, "why the fork?" and
"What are the goals?"

So I hope this helps answer that question! :) Thank you for your
interest!
 2018-01-16 11:34:07 -06:00
andy5995
c55775fe7a glest.ini:change user data directory (resolves #2) 2018-01-15 15:49:50 -06:00
andy5995
bd6bcd194b ChangeLog.md: add note about e6e7c62 [skip ci] 2018-01-15 11:58:16 -06:00
andy5995
e6e7c620a3 menu_state_new_game.cpp: remove code that blocks players 
(closes #6)

This means "InternetGamesGamesAllowed" will not be used. Anyone can
enter the lobby even if they can't beat a 1.0 cpu.
 2018-01-15 11:54:50 -06:00
andy5995
d82463f215 CONTRIBUTING:add links to issue trackers [skip ci] 2018-01-15 10:37:34 -06:00
andy5995
fd0e8b8484 ChangeLog.md: add "Elves" faction [skip ci] 
Elves faction was added to data in ZetaGlest/zetaglest-data#6
 2018-01-14 21:14:58 -06:00
andy5995
13a1c734f3 osx: rename script 
* changes some references of mg to zg
 2018-01-14 15:24:31 -06:00
andy5995
409f0f2333 AUTHORS.md: created [skip ci] 2018-01-14 15:19:00 -06:00
andy5995
c900278926 CONTRIBUTING:add contact info [skip ci] 2018-01-14 14:19:03 -06:00