Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,644 Commits 1 Branch 0 Tags 27 MiB
30972bcddb
Commit Graph

1834 Commits

Author SHA1 Message Date
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
d088028685 bugfix player control listbox to properly be enabled / disabled 2011-10-26 02:36:00 +00:00
Mark Vejvoda
c6fe352da7 disabled 'grouped' commands to see if this is the cause of out of synch (try this out guys) 2011-10-26 00:30:58 +00:00
Mark Vejvoda
0b6dbdf411 ensure language toggle only happens outside of a render event 2011-10-25 22:40:28 +00:00
Mark Vejvoda
9848a6c529 - bugfix for windows compiling 2011-10-25 20:34:13 +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
Titus Tscharntke
aebe2aba24 reverted new game menu structure, as it is inconsistent 2011-10-23 10:55:54 +00:00
Titus Tscharntke
21760072a4 fixed name editing and cleanup 2011-10-23 10:49:36 +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
Titus Tscharntke
0e44925191 singleplayer / multiplayer section 2011-10-22 17:20:37 +00:00
Mark Vejvoda
927a0db45e try new intro song (edited so timing is better). Also added debug timer on intro screen, add the following to ini: ShowIntroTiming=true 2011-10-22 08:40:31 +00:00
Mark Vejvoda
9135b6155d fix legacyfont on intro and changed linux default legacy font to arial since helvetica is not working on ubuntu 2011-10-22 03:13:23 +00:00
Mark Vejvoda
e64bd1bf6e updated intro to add extra text and proper centering of text 2011-10-22 03:01:22 +00:00
Mark Vejvoda
d46354ed67 - fixed bug where we could not pick human player clicking right arrow 2011-10-22 01:02:29 +00:00
Mark Vejvoda
bd2206f51b bugfixes for headless mode (when admin picks things that server doesn't have).. added a 2 second delay timer for sending out changes 2011-10-22 00:19:38 +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
5ac681ca73 changed app exit sound fade to 1.75 seconds and allow it to be set via new optiona lini setting: ShutdownFadeSoundMilliseconds 2011-10-21 22:36:36 +00:00
Mark Vejvoda
b10c489418 just for you tomreyn (fade sound on application exit) 2011-10-21 22:07:34 +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
c6d4e898a0 small bugfix for handling morph commands in the UI (was not properly handling commandclass). Added validation to tell modders that we have a max if 6 morphs that can display in the UI 2011-10-21 16:04:21 +00:00
Titus Tscharntke
5e8e8ffc6c my fix ( I like it somehow .. :-D ) 2011-10-21 00:23:05 +00:00
Mark Vejvoda
35a5f44db0 bugfix for game name when not in headless mode 2011-10-20 23:44:01 +00:00
Titus Tscharntke
a58451333e headless servers have special game names 2011-10-20 23:27:39 +00:00
Titus Tscharntke
900f08e02f Configurable multiplayer game name 2011-10-20 22:30:09 +00:00
mnaumann
8a87d26863 Rearrange text block on grapic info menu (davidou) 2011-10-19 00:16:10 +00:00
Titus Tscharntke
c151f538b1 3 cycle resource warning instead of percentage warning / sailboat texture fixed in menu 2011-10-18 22:00:59 +00:00
Mark Vejvoda
e5c5e22c26 initial attempt to add a visual food low warning (consumable falls to 25% and balance is ticking down) 2011-10-18 15:41:37 +00:00
Mark Vejvoda
9d1617e045 display thread counts on app shutdown / ftp server startup and shutdown only in verbose mode 2011-10-18 14:01:55 +00:00
Mark Vejvoda
c40ca18966 - added commented out code for loading md5 models (and obj format models) on intro page 2011-10-18 07:10:19 +00:00
Mark Vejvoda
b30fdea0d0 only output error filename once 2011-10-18 02:11:55 +00:00
Mark Vejvoda
62f1ad0464 output to console before trying to write to error.log 2011-10-18 02:02:37 +00:00
Mark Vejvoda
dc4b367f69 - changed contact email address to bug report URL 2011-10-18 01:40:49 +00:00
Mark Vejvoda
d98e35f245 bugfix when shutting down after visiting internet menu 2011-10-18 01:29:08 +00:00
Mark Vejvoda
5b7329594c - merging in changes from weltall for macosx 2011-10-18 01:13:38 +00:00
Mark Vejvoda
26afb589a3 - code cleanup (removing / commenting uneeded items) 2011-10-17 20:56:11 +00:00
Mark Vejvoda
dac61b9f5d added some new cmake directives to optional turn off subprojects from the build process. The new cmake options include: 
BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS
BUILD_MEGAGLEST_MODEL_VIEWER
BUILD_MEGAGLEST_MAP_EDITOR
BUILD_MEGAGLEST_CONFIGURATOR
BUILD_MEGAGLEST

By default these are all enabled (On). Turn turn off a module run cmake with the option turned off:
-DBUILD_MEGAGLEST_CONFIGURATOR=OFF
 2011-10-17 16:59:22 +00:00
Mark Vejvoda
d86ac7d4a7 bugfix for xerces include path 2011-10-15 18:00:47 +00:00
Mark Vejvoda
4f7559783c support backspace for multi-byte characters in chat mode 2011-10-15 09:27:55 +00:00
Mark Vejvoda
bea263229b - bugfixes for headless mode so player can switch slots but admin cannot start game if we have a net player in an unassigned network slot 2011-10-15 01:39:59 +00:00
Mark Vejvoda
3b8d07fc8d - don't allow game to start and show a message if network player connected and on an unassigned slot 2011-10-15 01:03:24 +00:00
Mark Vejvoda
3ff146e3f3 - bugfixes for changing network players control 2011-10-14 23:51:44 +00:00
Mark Vejvoda
5c9e57dfb9 - updated for macosx and vorbisfile 2011-10-14 21:59:52 +00:00
Mark Vejvoda
828069087b - removed un-necessary sendfile header 
- fixed compile when streflop disabled
 2011-10-13 20:05:39 +00:00
Mark Vejvoda
b1ed59959e - bugfix so player who dies and becomes an observer can hear sounds from other players units 2011-10-12 16:03:55 +00:00
Mark Vejvoda
4f233d3628 - attempt to fix issue where masterserver does not have data item selected by admin client 2011-10-12 06:54:36 +00:00
Mark Vejvoda
3b382c67e9 - added 3rd possible intro song (not active in xml), moved intro models animation speed into menu xml 2011-10-12 05:37:54 +00:00
Mark Vejvoda
50ce6eb1ea - updated intro with better timing and multiple models. Updated menu background model as well and about screen to show megapack units. 2011-10-12 05:24:30 +00:00
Mark Vejvoda
f8da775fe0 - fixed issue raised by Ishmaru when unit is holding position and we run out of ep, re-queue another hold position command (unless the stop skill takes ep as well then it cancels) 2011-10-12 04:40:48 +00:00
Mark Vejvoda
b88d51c3c6 - bugfix to not say teammode when not in game 2011-10-12 03:07:00 +00:00
Mark Vejvoda
e25e925ff0 - bugfix for ep regen being done twice per tick 2011-10-12 02:46:31 +00:00
Mark Vejvoda
df22657b54 - updated regular settings for original intro so timing is correct 2011-10-07 20:53:36 +00:00
Mark Vejvoda
e090df259d - bugfix for font height calc 
- updated intro
 2011-10-07 19:53:07 +00:00
Mark Vejvoda
af2abb57b8 - added experimental new intro for Megaglest. Its easy to revert back to original but i think its time we had some new music and intro pics 2011-10-07 17:21:09 +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
6aa079390d - try to avoid a hang when multiple runtime errors occur at the same time. 
- attempt at small speed boost in pathfinder
 2011-10-05 21:46:41 +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
517222a91a - bugfix for special commands (switch team and pause network game) when initiating players is observer 2011-10-05 15:56:08 +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
e8663b99bc - bugfix for popup menu in legacy font mode 2011-10-05 02:12:53 +00:00
Titus Tscharntke
a011cb3b26 Font LinBiolinum_Re-0.6.4.ttf is default now and some default values are set according to this font. 2011-10-04 23:49:34 +00:00
Mark Vejvoda
e740775735 - bugfix for ini on windows (and added console output in verbose mode 2011-10-04 21:14:33 +00:00
Mark Vejvoda
f718cd25d0 - added the ability to have platform specific main ini files for windows and linux for easier standalone mod packaging 2011-10-04 20:41:33 +00:00
Mark Vejvoda
3ed0f2f25a - added ability to hide UI items (for example mod menu when a mod is standalone) 2011-10-04 20:18:57 +00:00
Mark Vejvoda
a4798e6d72 - added upgrades to ai behavior xml tags 2011-10-04 17:15:08 +00:00
Mark Vejvoda
8729c32b68 - bugfix AI, no longer try to build a farm type unit if the faction does not have a unit that is able to build it yet 
- new optional feature added to tell each faction some basic info regarding which units should take priority when building,producing and morphing
 2011-10-04 06:49:44 +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
be3209e1fc - when we have a runtime error, we now log the error text to error.log which will be located in the path where all log files are written. 2011-10-03 18:39:21 +00:00
Mark Vejvoda
9316c1b4c3 - when we have a runtime error, we now log the error text to error.log which will be located in the path where all log files are written. 2011-10-03 18:34:59 +00:00
Mark Vejvoda
ebc130f526 - added a few new chinese fonts and changed default to a new font 
- fixed location of player title in menus
- added better ftgl error checking
 2011-10-03 04:49:52 +00:00
Mark Vejvoda
7eb68c4023 - added new commandline option to override base font size 2011-10-03 02:45:43 +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
ec2963808a - fixed alignment of UI controls and changed default english font 2011-10-02 02:32:20 +00:00
Mark Vejvoda
5d0eea51e3 - bugfix for rendering labels (now properly lines up with other controls) 2011-10-02 02:14:05 +00:00
Mark Vejvoda
75e73ec85d - headless mode now properly uses selected slot of player 2011-10-01 08:04:30 +00:00
Mark Vejvoda
6c1f0186c6 - bugfix for network session id randomizing 2011-10-01 01:40:00 +00:00
Mark Vejvoda
77a2fa7d48 - getting fanatical about memory cleanup so that valgrind output is more useful 2011-09-30 23:55:07 +00:00
Mark Vejvoda
b57fb0ff39 - validation so admin client connected to headless server cannot change his 'control type' because this would invalidate his connection. 2011-09-28 15:51:13 +00:00
Mark Vejvoda
3bec8d3300 - compile bugfix 2011-09-28 15:34:03 +00:00
Mark Vejvoda
43ed4553ea - more memory cleanup and thread cleanup (found using valgrind) 2011-09-28 15:32:57 +00:00
Mark Vejvoda
aed293bba2 - fixed a bunch of memory leaks that will hopefully mean less overall memory requirements. 2011-09-28 06:57:42 +00:00
Titus Tscharntke
780cb81324 wherever you try to hide yourself, ultra cpu will find you too now after a while :-D ..... 2011-09-27 21:51:29 +00:00
Titus Tscharntke
d6cef888a6 scenario icon does change after install 2011-09-27 21:26:22 +00:00
Mark Vejvoda
fe8e76efd8 - applied some memory leak cleanups 2011-09-27 20:35:45 +00:00
Mark Vejvoda
04b40ab476 - bugfix for endless loop on headless server when pressing control-D 2011-09-27 19:21:06 +00:00
Mark Vejvoda
0cf03a3562 - added option to quit headless server after game has completed: 
./megaglest --headless-server-mode=exit
 2011-09-27 18:44:01 +00:00
Mark Vejvoda
21005cc1e7 - in headless mode skip call to set window icon 2011-09-27 17:15:56 +00:00
Mark Vejvoda
ec554ffffb - do not init SDL's video subsystem in headless mode 2011-09-27 10:25:31 +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
9caff9dac3 - in headless mode avoid init of sdl's video surface so that we stay in console window (no graphics window shown) 2011-09-27 07:01:08 +00:00
Mark Vejvoda
c68aa74fcf - more updates for headless mode (try to avoid using opengl completely), server now runs at around 20 MB RAM at game start. 2011-09-27 05:29:57 +00:00
Mark Vejvoda
fdd04d10c1 - disabled jps for now and fixed ai multiplier for headless mode 2011-09-27 01:11:11 +00:00
Mark Vejvoda
d3eda7d0f2 - bugfix on older gcc compiler 2011-09-27 00:17:15 +00:00
Mark Vejvoda
048f97e698 - initial attempt to add jump point symetry to astar pathfinding (please test) 2011-09-26 23:55:18 +00:00
Mark Vejvoda
5a79cad34b - do not load models or sound files in headless server mode 2011-09-26 05:29:52 +00:00
Mark Vejvoda
f5c7eff49c - more bugfixes for headless server mode, attempt to fix crash when switching info fast and avoid render on battle end on server. 2011-09-26 04:50:13 +00:00
Mark Vejvoda
26d0b71bd5 - turn off mouse and keyboard in headless mode 2011-09-26 04:26:44 +00:00
Mark Vejvoda
9cd6355733 - some bugfixes for headless mode: 
- don't render anything
  - disable sounds in headless mode
(still need to add code to see if we can avoid loading models and graphics to make memory usage much smaller)
 2011-09-25 23:57:42 +00:00
Mark Vejvoda
da8e9d2af0 - changed commandline parameter to: --headless-server-mode 2011-09-25 05:46:51 +00:00
Mark Vejvoda
b6dd5e266b - hardening the masterserver mode: 
1.  missing maps, techs and tilesets should no longer crash the server and server will revert to last valid value for each (server must have the data)
2. clients now get truly unique session id's which fixes client admin mode when connecting to masterserver
 2011-09-25 05:38:35 +00:00
Mark Vejvoda
ebc174be03 - cleanup some compiler warnings 2011-09-25 04:09:54 +00:00
Mark Vejvoda
ece2927350 - attempt to fix command grouping 2011-09-25 04:07:59 +00:00
Mark Vejvoda
9268e3f5a7 - attempt to fix tomreyns segfault bug (mutex protection around cache) 2011-09-24 22:17:48 +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
Titus Tscharntke
5dd3b4ba80 same settings like 3.5.2 so we can better compare performance 2011-09-24 20:30:41 +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
4d31968966 - bugfix for team switching vote calculation 2011-09-23 19:31:47 +00:00
Mark Vejvoda
37fd0d6c71 - disable grouped commands by default until i track the segfault 2011-09-23 19:19:09 +00:00
Mark Vejvoda
42bbbd2e42 - trying to bugfix crashes with grouped commands 2011-09-23 18:54:35 +00:00
Mark Vejvoda
72c12a3459 - another attempt to fix command grouping bug (its now turned on be default again), please test for crashes or out of synch 2011-09-22 20:42:06 +00:00
Mark Vejvoda
7e16873efd - bugfix for team switching validation should be skipped 
- commented printf for tween debugging
 2011-09-22 05:14:20 +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
b4972f6365 - attempt to get international unicode characters working in ingame chat 2011-09-16 17:35:07 +00:00
Mark Vejvoda
2e9ca4c0f5 - bugfix to support \n in scenario and tutorial lng files 2011-09-16 03:17:49 +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
aee6c948a2 - bugfix for scripted scenario function registerCellTriggerEventForUnitToLocation not working properly 2011-09-13 23:25:13 +00:00
Mark Vejvoda
470fac5136 - bugfix for scripted scenario function registerCellTriggerEventForFactionToLocation not working properly 2011-09-13 23:20:26 +00:00
Mark Vejvoda
b8a8e3b519 - bugfix to close empty slots on game start 2011-09-10 01:45:34 +00:00
Titus Tscharntke
7a6e937133 version set to dev again ( v3.5.3-dev) 2011-09-09 20:45:14 +00:00
Mark Vejvoda
c2b2e41935 - disabled grouped commands for now 2011-09-09 20:42:02 +00:00
Mark Vejvoda
15cad68faf - attempt to fix a segfault in grouped units 2011-09-09 20:30:13 +00:00
Titus Tscharntke
713741de37 Preview images are cleared when selecting local only mods 2011-09-09 19:02:08 +00:00
Mark Vejvoda
41dfe298d3 - re-enable grouped commands for better unit moving (was previously causing out of synch but i think it works properly now) 2011-09-09 17:49:10 +00:00
Titus Tscharntke
bdb7e284f1 next fix for mod menu / player names can only be a restrictive ascii subset again . 2011-09-09 00:14:28 +00:00
Titus Tscharntke
26e614e151 bugfix for showing local mods as installed from server after clicking them 2011-09-08 22:44:13 +00:00
Titus Tscharntke
a75d113686 modmenu should work as expected now 2011-09-08 21:08:53 +00:00
Mark Vejvoda
56a384e365 - bugfix when reloading saved settings and item doesn't exist in listbox (thanks tomryen) 2011-09-07 16:55:49 +00:00
Titus Tscharntke
b8010a18af bugfix, so dragons can morph above water 2011-09-06 23:12:05 +00:00
Titus Tscharntke
af03402409 mod menu should work now beside refresh of state icons for scenarios and techs after download/install 2011-09-05 23:12:48 +00:00
Titus Tscharntke
d80837522d maps and scenarios are checked for server conflicts too. ( map crc calculation is still broken, see line 843 in menu_state_mods.cpp ) 2011-09-04 23:25:24 +00:00
Titus Tscharntke
396acdfa15 mod menu shows conflicts with server data for techs and tilesets ( maps and scenarios will follow the next days ) 2011-09-02 23:53:37 +00:00
Mark Vejvoda
0bbe34deee - added some missing translatable strings (thanks again uncle) 
PublishDisabled= (disabling publish)
UnitType=Unit type:
 2011-09-02 16:18:37 +00:00
Mark Vejvoda
1e2e7a5ef7 - bugfix for mode menu CRC checking 2011-09-02 06:05:37 +00:00
Mark Vejvoda
8d8996c0ee bugfix for index value used when switching maps for player in invalid index 2011-09-02 00:20:10 +00:00
Mark Vejvoda
e44170ea00 - bugfixes for lobby UI when map changes and player index is invalid 2011-09-02 00:08:35 +00:00
Mark Vejvoda
0a2c929fea - attempt #1 to support 'keeping' connected clients in the lobby when the map changes and slots would normally disconnect 2011-09-01 21:54:31 +00:00
Mark Vejvoda
4a5a7f010d - final phase of cppcheck verbose fixes (outstanding items should be left alone) 2011-09-01 18:51:43 +00:00
Mark Vejvoda
bb68106912 - phase 3 of cppcheck verbose fixes 2011-09-01 18:08:56 +00:00
Mark Vejvoda
57afc2d715 - phase 2 of cppcheck verbose fixes 2011-09-01 01:11:23 +00:00
Titus Tscharntke
29b610344d just a legend for the button icons 2011-08-31 23:25:34 +00:00