Commit Graph

321 Commits

Author SHA1 Message Date
Mark Vejvoda
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
4f1bee5aea - attempt to save and load scenario info in saved games 2012-03-26 06:48:58 +00:00
Mark Vejvoda
d502e95d9f - bugfix for saving / loading cell info, fixes the resource explored bug 2012-03-20 07:14:50 +00:00
Mark Vejvoda
fc6da7f924 - added a status message while replaying commands 2012-03-20 05:58:24 +00:00
Mark Vejvoda
05c35aa9f4 - a little cleanup for command replay 2012-03-20 05:23:32 +00:00
Mark Vejvoda
a7e45eb354 - added the ability to record all game command to a replay file. To test saving / loading games from a replay file, add this to glestuser.ini:
SaveCommandsForReplay=true
2012-03-20 04:53:26 +00:00
Titus Tscharntke
91dce63aac savegame screenshot has smaller size (configurable)/ screenshots are deleted too 2012-03-17 11:26:39 +00:00
Mark Vejvoda
1ac9aa6d3f - fixed xml loading via rapidxml for some scenarios that had embeddex xml comments in lua
- added automation abilities for automated testing with automated saved games
2012-03-17 08:20:17 +00:00
Mark Vejvoda
617344c97d - do not take screenshot when saving game on headless server 2012-03-17 04:19:17 +00:00
Mark Vejvoda
5584121aa7 - updated load game screen and added some missing language text 2012-03-17 03:32:20 +00:00
Titus Tscharntke
7f46cf2749 save a screenshot with every game save and show it in load menu ( you must have set screenshot type set to .jpg at the moment) 2012-03-17 01:32:18 +00:00
Mark Vejvoda
01f8f518b3 - saved games now go into saved folder 2012-03-15 22:09:11 +00:00
Mark Vejvoda
3eeb1ddea4 - added option to specify which game to load when loading a saved game.
- added a hotkey to save games any time during game play (F11). This saves files with a timestamp
- we now keep track of the last game the user saved and if commandline does not specify a game to load it uses the last saved game
2012-03-15 15:57:21 +00:00
Mark Vejvoda
fc125bec37 - added command groups and unit selection to save / load game info 2012-03-15 07:09:36 +00:00
Mark Vejvoda
d1dd79047e - no need for xerces anymore? All XML is now done by rapidxml by default (loading and saving) 2012-03-15 05:59:23 +00:00
Mark Vejvoda
7425dc8fdf - ALL XML loading will default to rapidxml, we now ONLY use xerces for saving the game (until i get time to implement xml save using rapidxml) 2012-03-14 22:48:46 +00:00
Mark Vejvoda
4bd6b53f9d - added insanely fast rapidxml as a supported xml engine to use. Currently its ONLY used for loading saved game xml and the currently class ONLY handles loading (not saving) xml's. 2012-03-14 21:52:13 +00:00
Mark Vejvoda
8d5de12d42 - added some particles to load game logic 2012-03-14 07:23:41 +00:00
Mark Vejvoda
5f95b08c17 - a ton more load game state now working (including commands) 2012-03-13 15:21:25 +00:00
Mark Vejvoda
485b74af8b - load game restore more game state 2012-03-13 00:00:10 +00:00
Mark Vejvoda
82cd1d3e9c - restore timeflow and gamecamera on load game 2012-03-12 23:40:54 +00:00
Mark Vejvoda
9271d7d7f6 - initial loading logic for loading of saved games.
- currently we always save the game during out of synch or on game quit.
- added a new commandline option to load the last saved game, this doesn't do much yet, just creates units in the map locations they were when the game was saved
./megaglest --load-saved-game
2012-03-12 23:08:22 +00:00
Mark Vejvoda
c5331b7e8a - initial work to save game state to XML. Current only saves when out of synch or game end occurs and saves to same folder as log files and file is called: megaglest-saved.xml
(Currently we store way too much info but this is a starting point)
2012-03-10 03:27:25 +00:00
Mark Vejvoda
8b7e2a7b9e - when searching for hud, loop until we find a file 2012-03-03 07:48:05 +00:00
Mark Vejvoda
3eba87727c - bugfixes for headless mode, map selection logic was broken for admin user
- during in game, if admin user disconnects, server re-assigns a new admin user so paused game can be unpaused by a new administrator
2012-03-03 04:33:39 +00:00
Titus Tscharntke
9870c13a6b GraphicMessageBox can handle multiple buttons now 2012-02-19 17:37:53 +00:00
Mark Vejvoda
3049c5e376 - attempt to fix using grouping hotkeys for AZERTY keyboards (so user can press shift + #) 2012-01-09 21:08:19 +00:00
Mark Vejvoda
50f1fa65ca - bugfix on battle screen when 8 players playing, last player is sometimes chopped off
- masterserver mode bugfix for map filter
- masterserver now outputs in-game stats to console every 10 minutes (can be adjusted via ini setting: GameStatsDumpIntervalSeconds=x where x is update interval in seconds
2012-01-06 06:55:27 +00:00
Mark Vejvoda
a1a0b9e79c - bugfix for not finding hud for scenarios with embedded techtree 2012-01-04 04:10:11 +00:00
Mark Vejvoda
ebba25b06f - updated so streflop can be totally ignored when that cmake switch is off 2011-12-16 06:24:21 +00:00
Mark Vejvoda
9852325da6 - fixed Martiño Figueroa's name in all copyrights in source code
- added copyrights to files that were missing it
2011-12-14 07:40:48 +00:00
Mark Vejvoda
f6dafcde3c - added stats on console for headless server when game exits 2011-12-02 17:27:13 +00:00
Mark Vejvoda
d33e1174a5 - bugfixes related to cppcheck report
- bugfixes found using valgrind (memory leaks)
2011-12-02 16:07:59 +00:00
Mark Vejvoda
7cf9c189b2 - disallow non compressed tileset downloads when client IP not on same subnet as host
- bugfix for LAN server broadcasting
- bugfix for empty message on player disconnect (now properly shows that player switched to AI mode)
2011-11-29 05:07:18 +00:00
Mark Vejvoda
c16cdad134 - more complete fix for debug render placement 2011-11-28 07:05:00 +00:00
Mark Vejvoda
cfe01253b9 fixed ambient sounds when rain is disabled. 2011-11-28 06:38:07 +00:00
Mark Vejvoda
1658306b59 - fixed debug output font position --> just for you james! 2011-11-28 05:54:31 +00:00
Mark Vejvoda
4e882796a1 - a bold attempt to push the socket read threads to read continuously to see if this is:
a) stable without causing out of synch
b) not too hard on the CPU
2011-11-25 17:01:35 +00:00
Mark Vejvoda
2a8c712b1a - more socket performance changes
- auto complete now works also in IRC chat, and tabbing loops through all matched names.
2011-11-25 09:12:53 +00:00
Titus Tscharntke
cbdde66999 we dont need to be too picky with translations which are mainly meant for logfiles 2011-11-04 01:12:05 +00:00
Mark Vejvoda
30e1f45cc7 - intro is now fully translatable and configurable (see english.lng file at the bottom for intro strings)
- added game loading text strings to language file
- ONLY load the font type we are using
2011-11-02 17:17:28 +00:00
Mark Vejvoda
33549e2b0b no longer show resource info in debug stats in game 2011-10-26 05:10:36 +00:00
Mark Vejvoda
c045f06f44 allow pause hotkey for network games 2011-10-26 04:13:14 +00:00
Mark Vejvoda
50adfb3305 - added ability to switch languages from nearly anywhere (and new hotkeys to do so):
CTRL+L shows language popup selection, CTRL+SHIFT+L toggles to next language automatically
2011-10-25 18:39:11 +00:00
Mark Vejvoda
2cecb2c3a0 fixed horrible UPNP bugs related to timing, where ports would be either NOT properly opened or not closed due to thread timing and no thread protection. 2011-10-23 00:55:34 +00:00
Mark Vejvoda
6863876359 bugfixes from transition to battle end and back to menu 2011-10-22 19:45:05 +00:00
Mark Vejvoda
5ee20018d8 d new way to manage the sound fade for game start/stop via optional ini: GameStartStopFadeSoundMilliseconds=3500 2011-10-21 22:42:59 +00:00
Mark Vejvoda
c305af8063 bugfixes when going from one scenario to another (sound fades ok now) 2011-10-21 20:57:42 +00:00
Mark Vejvoda
0a2a6794f3 cannot fade when transitioning scenarios until we change how sound files are used. 2011-10-21 20:06:18 +00:00
Mark Vejvoda
14736ddfb7 now fade out of music when starting game and fade out of music when ending game 2011-10-21 19:52:55 +00:00
Mark Vejvoda
c1eedabf84 - added current mouse xy in cell coords to debug stats 2011-10-07 03:48:07 +00:00
Mark Vejvoda
762699ef88 - bugfixes for passing from one scenario into another when keeping faction state 2011-10-07 03:25:17 +00:00
Mark Vejvoda
a7cfcc1d99 - added special placement code when carrying over units from one scenario to another 2011-10-06 22:19:58 +00:00
Mark Vejvoda
b126768d9c - updated scenario lua function to allow carry over of factions or not 2011-10-06 20:44:55 +00:00
Mark Vejvoda
2d42f59fe1 - added a new lua function to allow loading a new scenario from inside an existing scenario
loadScenario('capture_the_flag2')
2011-10-06 18:04:59 +00:00
Mark Vejvoda
e036d820d2 - bugfix, observer cannot join teams, and players cannot join an observers team 2011-10-05 16:02:26 +00:00
Mark Vejvoda
5a7a37a678 - bugfix 3dlists when showing keyboard menu in game (water was showing wrong) 2011-10-05 03:42:29 +00:00
Mark Vejvoda
22e28c323f - cleanup popup menu sizing so it looks more clean 2011-10-04 00:50:43 +00:00
Mark Vejvoda
bc5c32deb1 - initial attempt to add 'pause game' for network games. The following apply:
- only the server (or headless admin) can pause/resume a network game.
- to pause/resume press ESC in game and select the pause/resume button to toggle the state.
- chatting works while the game is paused. If clients want the game paused they should ask this in the chat window
2011-10-03 20:48:09 +00:00
Mark Vejvoda
d719e8e318 - in game popup menu now also allows viewing/changing keyboard setup
- now display (team) when chat text is intended only for team members
2011-10-03 00:36:28 +00:00
Mark Vejvoda
2a86cb4f7d - added support for proper quiting and console input/output in headless mode. Type: quit followed by return into the console to properly shutdown in headless mode. 2011-09-27 10:16:09 +00:00
Mark Vejvoda
26d0b71bd5 - turn off mouse and keyboard in headless mode 2011-09-26 04:26:44 +00:00
Mark Vejvoda
da57a589ba - more progress on masterserver, now the masterserver does not take a slot! 2011-09-24 21:07:15 +00:00
Mark Vejvoda
f0b795377b - when masterserver game is over go right back to custom game lobby 2011-09-24 20:22:47 +00:00
Mark Vejvoda
4df997d0ca - initial work for a headless server. Currently this code allows you to launch a server with the commandline option: --masterserver-mode
The first client that connects to the server is the administrator and is able to change most settings and launch the game. Still lots of work to do but this is a start.
2011-09-24 07:46:56 +00:00
Mark Vejvoda
d52924f214 - added new strings to language file 2011-09-21 08:00:00 +00:00
Mark Vejvoda
7d53df698a - added new in-game popup menu and new ability to switch teams in game (turned off by default in advanced settings) 2011-09-21 06:51:28 +00:00
Mark Vejvoda
8f0db3e30d - added new commandline option --map-preview=x where x is the mapname (without extension) 2011-09-16 00:34:14 +00:00
Mark Vejvoda
d44959d69c - phase 1 of cppcheck verbose fixes 2011-08-31 23:10:43 +00:00
Mark Vejvoda
3af608151e - bugfixes found from cppcheck 2011-08-31 19:44:19 +00:00
Mark Vejvoda
a7e08e3b55 - can disable mouse movement which scrolls the world camera. in glestuser.ini add:
MouseMoveScrollsWorld=false
2011-08-31 00:24:14 +00:00
Mark Vejvoda
c4cbdd86e3 - disabled will's visible quad code as i cannot get it to work when rotating around with the camera. Bugfix for normal camera visible quad so we don't get black spots when moving camera around. Bugfix for menu keyboard entry if we get a bad utf8 conversion character 2011-08-30 18:28:30 +00:00
Mark Vejvoda
a2e6f81a0d - added initial code from willvar for visible quad calc (but disabled for now till we have time to fix issues) 2011-07-23 23:22:30 +00:00
Titus Tscharntke
9ef8c82441 extra team color markers ( by default use * to toggle/switch on ) 2011-07-06 22:02:38 +00:00
Mark Vejvoda
852b4aa2d2 - bugfix for some hotkeys not working properly 2011-07-04 18:05:02 +00:00
Mark Vejvoda
d2c8cc0187 - bugfix for unit titles in special debug mode
- added support for png format for pixmap3d (Water) textures
2011-07-01 07:46:18 +00:00
Mark Vejvoda
ec15c81d12 - added a FPS cap (at 800 fps we will sleep for 1 millisecond) to avoid pinning the cpu for hardware that has fps which is too good. Also user can toggle fps view on any screen now 2011-07-01 02:50:20 +00:00
Mark Vejvoda
4b6bc7a4a7 - loads of changes in order to prepare for better input (not using char but SDLKey instead) 2011-06-26 01:55:08 +00:00
Titus Tscharntke
d246a08a6d switch for rain/snow ; multipliers visible ; server can set his state too 2011-06-20 23:48:22 +00:00
Mark Vejvoda
7ad8510894 - don't render hud in 'photo' mode 2011-06-13 23:28:24 +00:00
Mark Vejvoda
06999a8f88 - reworked fonts to now use 3d matrix positioning and render performance is much better.
*NOTE: Still need to deal with some letters getting partially chopped off in some cases.
2011-06-10 03:09:19 +00:00
Titus Tscharntke
ca75809f2d switch in options to show HUD or not ( if available ) 2011-06-09 22:54:45 +00:00
Titus Tscharntke
bc2c59a82a just put a hud.png in a faction dir and you got a HUD overlay 2011-06-09 00:59:03 +00:00
Mark Vejvoda
e34e70a0c8 - added code to merge duplicate sounds used in a techtree 2011-05-06 07:47:31 +00:00
Mark Vejvoda
6492832c35 - added initial validation code to warn about duplicate data used in factions 2011-05-05 19:21:50 +00:00
Titus Tscharntke
9ce83ed21b queued commands are displayed in a better way 2011-05-01 20:19:41 +00:00
Mark Vejvoda
0abca7fb7a - bugfixes for clicking outside of the map co-ordinates
- show up to 5 descriptions for queued items when producing
2011-04-27 22:35:45 +00:00
Mark Vejvoda
88a81a6993 - removed useless items in debug view
- removed some noise from verbose output
2011-04-13 18:45:27 +00:00
Titus Tscharntke
4df5e0266c camera movement fixed 2011-04-11 23:26:50 +00:00
Mark Vejvoda
5a6418ac60 - removed some debug statements to see if it will improve debug logging performance 2011-04-11 00:11:52 +00:00
Titus Tscharntke
daf8f42f7e real camera movement! 2011-04-10 21:38:29 +00:00
Titus Tscharntke
36ebfcf95e end game stats with better PlayingTime, tomreyns endgame color problem (maybe) fixed ,updated german lang file 2011-04-09 23:25:18 +00:00
Titus Tscharntke
6b63089612 pressed keys don't keep camera moving continously anymore ( has this side effects? ) 2011-04-08 22:49:10 +00:00
Mark Vejvoda
4a27e75891 - initial work to support multi-language text messages 2011-04-05 18:39:47 +00:00
Mark Vejvoda
4fb33d34ce - moved a few more strings into the language file 2011-04-05 14:59:48 +00:00
Mark Vejvoda
0fce64897e - added a few more things to end game stats as requested by ultifd
(now we can tell the difference between killed units and killed enemy units and final score is based on killed enemy units not all killed units)
2011-04-05 06:32:23 +00:00
Mark Vejvoda
cf706491e1 - added screenshot file format to options menu
- more cleanup from things discovered with valgrind.
- added an environment variable to use with openal so it is possible to specify which sound device to use if needed down the road
2011-04-02 21:17:17 +00:00
Mark Vejvoda
085cb7d543 - added a cancel button when loading a game for the server user only
- updated client side loading screen to show who the server is waiting for
- moved some more strings into the english language file
2011-03-31 18:13:02 +00:00
Mark Vejvoda
438bedd4fa - now show scenario logo files when user selects a scenario with a loading screen 2011-03-30 22:14:51 +00:00
Mark Vejvoda
4344a958d6 - changed game unload so it doesn't try to render on exit 2011-03-30 21:15:20 +00:00