4934 Commits

Author SHA1 Message Date
andy5995
bdef7fc6f3
remove code related to blocking lobby access
This is no longer used, and the related feature was removed in a commit
a few weeks ago
2018-02-14 01:08:13 -06:00
andy5995
c8726d7899
type_instances:reformat source
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
2018-02-14 01:03:04 -06:00
andy5995
3ff4f25766
game_util.cpp:add "-dev" to glestVersionString 2018-02-14 00:36:32 -06:00
andy5995
148315a2a0
unit.cpp:change default command to attack
We'll try this again... :)
2018-02-13 21:10:21 -06:00
andy5995
5caa88fe23
unit.cpp:reformat source
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
2018-02-11 21:56:36 -06:00
andy5995
964f6f4d02 game.cpp:reformat source
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
2018-02-11 21:37:07 -06:00
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
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
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
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
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
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
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
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
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
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
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
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
Jammyjamjamman
95c3ebbd10 modified AI code so that AI performs updates faster. 2018-01-23 02:32:39 +00: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
e928dbacb4
cleanup after removing submodules [skip ci] 2018-01-17 20:43:32 -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
45bccef4a9
change build target to "zetaglest"
* add dependency info to README
* rename script
* renamed windoze to windows

At some point, it will be better to split off the installation
instructions from the README.
2018-01-14 11:17:14 -06:00