Commit Graph

103 Commits

Author SHA1 Message Date
Mark Vejvoda
e4235cc551 - attempt to further stabilize joining in progress games 2013-02-27 06:46:42 +00:00
Mark Vejvoda
69925fb887 - bugfixes for joining network games 2013-02-19 04:53:24 +00:00
Mark Vejvoda
54c026bb3e - bugfixes for in game joining 2013-02-17 07:15:01 +00:00
Mark Vejvoda
b38f6b20a1 - updates to join in progress game, and now allow for switching slots 2013-02-16 10:07:36 +00:00
Mark Vejvoda
9d19ff2b57 - added the first draft of joining games in progress 2013-02-15 18:25:10 +00:00
Mark Vejvoda
5fd8b121a9 - allow for multiple preview / loading / hud textures for different resolutions 2013-02-11 23:43:30 +00:00
Titus Tscharntke
11cd3b4a17 now you can increase the speed step by step up to "FastSpeedLoops" 2013-01-31 12:36:51 +00:00
Mark Vejvoda
5d2066fdbb - added a new thread manager to try to see if it takes less CPU cycles while the thread controller waits for slaves to do their work. To enable the experimental thread manager set: EnableNewThreadManager=true 2013-01-10 21:16:28 +00:00
Mark Vejvoda
6b32c747b5 - fix end game stats if your team won it shows you as a winner. 2012-11-20 02:26:51 +00:00
Mark Vejvoda
505206059b - added new lua method for Muwuum:
void giveStopCommand(int unitId)
	bool selectUnit(int unitId)
	void unselectUnit(int unitId)
	void addUnitToGroupSelection(int unitId,int groupIndex)
	void recallGroupSelection(int groupIndex)
	void removeUnitFromGroupSelection(int unitId,int group)
	void setAttackWarningsEnabled(bool enabled)
	bool getAttackWarningsEnabled()
2012-10-17 20:15:50 +00:00
Mark Vejvoda
e63e634e1e - added a bit more lua and updated capture enemy flag 2012-10-13 07:33:33 +00:00
Mark Vejvoda
0180aa6bba - added new lua functions:
triggeredCellEventUnitId()
showMarker(int flashCount, int factionIndex, string note, string textureFile,Vec2i pos)

1. The first one can be called in a cell trigger event and tell you which unit triggered the event
2. The second flashes a position in the minimap
2012-10-13 05:06:53 +00:00
Titus Tscharntke
b9836685d8 Chat behaviour can be changed in options. Time display on/off via options too 2012-10-11 22:10:31 +00:00
Mark Vejvoda
ae5018c4dc - do not continuously throw errors in game 2012-10-02 06:20:39 +00:00
Mark Vejvoda
7c0e10684a - added lua functions to add / remove cell markers:
addCellMarker(0,'test from scenario!','',cellMarker)
param1=factionindex
param2=cell hint
param3=empty string
param4=cellPosition

removeCellMarker(0,{46,13})
param1=factionindex
param2=cellPosition
2012-09-25 07:05:52 +00:00
Mark Vejvoda
9e75b9144c - removed cell marker from popup menu and moved to hotkeys (f2 add f3 remove)
- added a new experiemntal feature called 'follow unit'. select 1 unit then press f4 and when the unit moves the camera tries to look from the units perspective. To turn this off select no unit and press f4.
2012-09-24 17:13:27 +00:00
Mark Vejvoda
1c211e4ce6 - lots of code cleanup from the cppcheck 2012-09-22 20:13:57 +00:00
Mark Vejvoda
b7f72be930 - added the ability for admin player to disconnect other network players in game from a new popup menu 2012-09-21 05:45:09 +00:00
Mark Vejvoda
6ea34ea46c - added cell hint text entry when placing cell markers (supports \n and \t for text formatting) 2012-09-20 04:10:34 +00:00
Titus Tscharntke
d217777f85 player end stats should show only players as laevers who left while game was running. ( feature not finished yet ) 2012-07-18 23:52:44 +00:00
Titus Tscharntke
46cc1f18aa no more camera (drag)move while giving commands via minimap. Only move camera if click started in minimap. 2012-07-15 09:50:44 +00:00
Titus Tscharntke
d10d5fc770 hopefully working implementation of mpfNoSelect from this discussion: http://glest.org/glest_board/index.php?topic=8165.msg82932#msg82932 2012-07-14 21:29:15 +00:00
Titus Tscharntke
0043511e0a less alpha for building ghosts, 'X' key for highlighting, no camera move while highlighting 2012-07-13 23:19:53 +00:00
Titus Tscharntke
73919c860d New quick highlight pointer for minimap ( we need another key for this, at the moment its "shift" ) 2012-07-13 21:50:34 +00:00
Mark Vejvoda
81cc68305c - added the ability to remove cell markers 2012-06-13 16:19:44 +00:00
Mark Vejvoda
943dcef9fe - first pass of VERY ROUGH crude implementation of 'cell markers'. Need to properly find icons, apply alpha to icon on the map and add support for notes when user hovers over the marker. 2012-06-12 20:37:00 +00:00
Mark Vejvoda
b6a4e33e7d - replaced calls to glgenlists and family as these gl calls are deprecated in newer opengl (and really did not do anything for us) 2012-05-24 06:16:54 +00:00
Mark Vejvoda
8fd436b612 - added new lua method to play video's in scenarios:
playStaticVideo
2012-05-22 06:17:56 +00:00
Mark Vejvoda
3b9f799d26 - it is now possible to explicitly specify which units should count towards victory conditions. In the unit's xml file add:
<?xml version="1.0" standalone="no"?>
<unit>
	<parameters>
               <!-- valid values are true or false for this optional parameter -->
		<count-in-victory-conditions value="false"/>
        </parameters>
</unit>
2012-05-03 20:25:35 +00:00
Mark Vejvoda
dbb116f250 - load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010) 2012-04-20 01:04:05 +00:00
Titus Tscharntke
ed201fa5d3 "save game" in ingame menu( I don't know how a quick "load last saved game" ould work from ingame menu :-/ ) 2012-04-13 23:13:02 +00:00
Mark Vejvoda
76c3fa1949 - fixed segfault when a unit is selected and they die (this is a long standing bug and not related to savegame) 2012-04-12 15:38:53 +00:00
Titus Tscharntke
6c12bfbec8 Improved resource object selection implementation which allows highlight effects now too.
Generally changed highlight effect to something more obvious
2012-04-04 00:30:16 +00:00
Titus Tscharntke
874b1a5049 In non network games the game is paused automatically if a menu/message is raised. I am not sure if I should do this for scenario messages too? 2012-04-01 18:23:26 +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
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
Titus Tscharntke
edd7f732ea alpha correction in options menu ( checkin with error included , which needs to be fixed! ) 2012-03-13 00:44:55 +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
246f4b326f - attempt to see if threaded client network receive improves performance (ThreadedNetworkClient=true to enable on a client) 2012-03-03 23:59:44 +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
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
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
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
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
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