Commit Graph

3027 Commits

Author SHA1 Message Date
Mark Vejvoda 86c083837b - add lua's io package to unsafe list 2012-10-12 14:10:19 +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 a9d5af5261 - updated unit already in cell error with more detail 2012-10-11 14:23:31 +00:00
Mark Vejvoda 6b324cbb4e - added second round of security sandboxing for lua scripts (disable a number of other potentially dangerous functions) 2012-10-11 06:10:21 +00:00
Mark Vejvoda e3e3832070 - added first round of security sandboxing for lua scripts (disable the os library) 2012-10-11 05:17:37 +00:00
Tom Reynolds 8cc9c760e1 no more blank spaces in translation keys 2012-10-11 00:26:00 +00:00
Mark Vejvoda a70320dd9f - property files can start a comment with # also 2012-10-10 23:16:37 +00:00
Mark Vejvoda 5c0090d488 - bug fixes for free cell lua functions 2012-10-10 19:56:52 +00:00
Mark Vejvoda 4a63060b71 - added two new lua functions:
networkSetCameraPositionForFaction(int factionIndex,Vec2i pos)
networkSetCameraPositionForTeam(int teamIndex, Vec2i pos)
2012-10-10 18:28:55 +00:00
Mark Vejvoda 84452f8633 - added new cell trigger lua function to be able to detect when any unit enters or exits a region of cells:
int registerCellAreaTriggerEvent(Vec4i pos)
int getCellTriggeredEventAreaEntryUnitId();
int getCellTriggeredEventAreaExitUnitId();
2012-10-10 05:44:14 +00:00
Mark Vejvoda 0449fbea2b - attempt to bugfix out of synch when players disconnect and we switch to AI 2012-10-10 00:27:34 +00:00
Tom Reynolds b7d3bc6a5a favicon for masterserver 2012-10-09 23:36:36 +00:00
Mark Vejvoda 1d98015d5d - attempt to bugfix out of synch when players disconnect and we switch to AI 2012-10-09 23:18:07 +00:00
Mark Vejvoda 165f281f92 - added a few new lua functions to check if a cell is free 2012-10-09 20:03:09 +00:00
Titus Tscharntke f61666d04c bugfix for loading default games on headless servers 2012-10-07 00:34:45 +00:00
Mark Vejvoda e69f896c21 - increase masterserver response timeout from 10 to 15 seconds 2012-10-06 23:01:14 +00:00
Titus Tscharntke 2fde01b6ed fix for delayed playername correction ( which was rising the alarmsound too ) 2012-10-06 22:56:19 +00:00
Mark Vejvoda a4dab7d1d7 - fix the player network status for closed slots 2012-10-06 22:18:09 +00:00
Titus Tscharntke fc30386e42 last port of ftpdata was displayed wrong after switching 2012-10-06 21:36:48 +00:00
Titus Tscharntke a2cad81210 wrong display of ftp data ports 2012-10-06 20:11:54 +00:00
Titus Tscharntke 5fd233c72b bugfix for buttons in message boxes. Init is init and not reuse ... 2012-10-06 19:01:13 +00:00
Titus Tscharntke 60355fa55d layout cleanup of option menus network section 2012-10-06 18:22:48 +00:00
Mark Vejvoda c5ac0cc8e3 - fix min player for headless game message 2012-10-06 17:50:27 +00:00
Titus Tscharntke a7fe72a46c next bugfix 2012-10-06 16:36:03 +00:00
Titus Tscharntke 905ae06f42 bugfix ... 2012-10-06 16:13:51 +00:00
Titus Tscharntke a39f262065 trying to make selection of control in headless more comfortable 2012-10-06 16:09:49 +00:00
Mark Vejvoda f38f7d593a - fix main menu extra logos 2012-10-06 15:45:22 +00:00
Titus Tscharntke b7e3964782 warning of non default port usage is outdated and by this removed 2012-10-06 14:56:40 +00:00
Titus Tscharntke 9a57dc095f PortExternal is only used when set. Normal case is PortServer now 2012-10-06 13:45:42 +00:00
Titus Tscharntke 685b15c91e renamed ServerPort->PortServer MasterServerExternalPort->PortExternal 2012-10-06 12:56:53 +00:00
Titus Tscharntke b05adbc6d5 make sure humans cannot cheat with multipliers 2012-10-06 10:05:34 +00:00
Mark Vejvoda 2f1ddf7776 - code cleanup based on verbose output from the latest git version of cppcheck 2012-10-06 07:27:32 +00:00
Mark Vejvoda 5e42c6dc03 - loads of code cleanup based on verbose output from the latest git version of cppcheck 2012-10-06 07:06:40 +00:00
Mark Vejvoda 2a80dd7c3c - more cppcheck code cleanup 2012-10-06 03:42:31 +00:00
Mark Vejvoda 97ba1a27e2 - cleaned up some warnings from VC++ compiler 2012-10-06 02:40:24 +00:00
Mark Vejvoda c39da4cd69 - code cleanup from cppcheck 2012-10-06 02:10:23 +00:00
Mark Vejvoda 1a7f3d50ca - bugfix for broadcast override 2012-10-06 00:37:21 +00:00
Mark Vejvoda fd48fe18e4 - added new ini option to allow for custom broadcast port for LAN game discovery:
BroadcastPort=x
where x is the custom port for discovery
2012-10-06 00:34:08 +00:00
Mark Vejvoda 62c82ad9bc - allow the --connecthost commandline to use:
--connecthost=auto-connect
which will auto connect to the first found server on a lan
2012-10-06 00:25:13 +00:00
Mark Vejvoda b4e6205671 - find servers on LAN now discovers customized game ports 2012-10-05 23:53:10 +00:00
Mark Vejvoda 8d16e6247f - do not allow changing of resource multiplier for human players 2012-10-05 23:03:05 +00:00
Mark Vejvoda a8b8dcf464 - humans may now have a custom resource multiplier 2012-10-05 22:43:00 +00:00
Mark Vejvoda 6b15dfbc51 - don't crash on missing data for resource multiplier 2012-10-05 21:01:02 +00:00
Mark Vejvoda 7f271d0b51 - attempt to fix issue where sometimes the screen starts black and does not render 2012-10-05 05:28:16 +00:00
Mark Vejvoda b786387138 - bugfix to hide multiplier when slots are not valid 2012-10-04 23:28:27 +00:00
Mark Vejvoda eecbed5090 - updated game loading info to show # skills loading 2012-10-04 06:01:47 +00:00
Titus Tscharntke 70cda77f74 and again trying to fix the headless server show itself connected 2012-10-03 22:27:59 +00:00
Titus Tscharntke 61f4bcaacd try to fix the headless server show itself connected 2012-10-03 22:16:12 +00:00
Titus Tscharntke afcd787774 fixed ishmarus problem without default .mgg files ( http://glest.org/glest_board/index.php?topic=8629.0 ) 2012-10-03 21:42:11 +00:00
Titus Tscharntke f4a200e949 fix for wciows "free camera" bug ( http://glest.org/glest_board/index.php?topic=8640.0 ) 2012-10-03 20:13:11 +00:00
Mark Vejvoda ae5018c4dc - do not continuously throw errors in game 2012-10-02 06:20:39 +00:00
Mark Vejvoda 949f62209d - prepare for 3.7.0-beta1 2012-09-28 03:56:46 +00:00
Mark Vejvoda 2061581be0 - added macro for older libvlc compiling 2012-09-27 21:22:17 +00:00
Titus Tscharntke b65ff48d29 A technically more simple way to set the camera mode 2012-09-27 21:10:28 +00:00
Mark Vejvoda 5e57921fef - some speed optimizations in areas mentioned by perf tool 2012-09-27 15:04:28 +00:00
Mark Vejvoda 4e195e10af - updated random seed generation to be more random 2012-09-27 06:42:57 +00:00
Mark Vejvoda 732f5260a1 - corrected default progress bar height (since its often chopping off font) 2012-09-27 06:12:53 +00:00
Mark Vejvoda 4bde2882a6 - fixed bug in mod menu where no messages were shown since tit's console class change.
- added new ftp status info and display output from 7z extraction as it happens in game so that the user knows something is happening (and to show errors)
2012-09-27 05:54:37 +00:00
Mark Vejvoda 7e581004d6 - cleanup unused code 2012-09-27 02:49:10 +00:00
Mark Vejvoda 5d72c3f72b - bugfix for looping 2012-09-27 01:18:50 +00:00
Mark Vejvoda c33c1826ae - proper implementation of video repeat (looping) 2012-09-27 01:17:57 +00:00
Titus Tscharntke de3b8355fb attack is possible in FP-view now 2012-09-26 23:21:49 +00:00
Mark Vejvoda a21f2b705d - some video rendering optimizations 2012-09-26 23:16:29 +00:00
Titus Tscharntke 8dd43e2e31 finally I am a bit happy with the "f4" camera view 2012-09-26 22:52:21 +00:00
Titus Tscharntke 784ccb7e56 3rd person camera improved/fixed ( still not done ) 2012-09-26 19:25:35 +00:00
Mark Vejvoda 1db56463fd - try to make video performance a little better 2012-09-26 08:08:52 +00:00
Mark Vejvoda 4e3d27f8c0 - add faction path when using xml tags for battlend end videos:
<?xml version="1.0" standalone="no"?>
<faction battle-end-win-video="x_battle_end_win_video.avi" battle-end-lose-video="x__battle_end_lose_video.avi" >
2012-09-26 07:32:39 +00:00
Mark Vejvoda 2c2ce3a6b3 - add faction path when using xml tags for battlend end videos:
<?xml version="1.0" standalone="no"?>
<faction faction-battle-end-win-video="x_battle_end_win_video.avi" faction-battle-end-lose-video="x__battle_end_lose_video.avi" >
2012-09-26 06:52:39 +00:00
Titus Tscharntke 3db7d017e3 removed camera stuff from unit and the camera following a unit is much more smooth now. ( Not finished, work in progress ) 2012-09-26 00:15:37 +00:00
Mark Vejvoda 2f40e7735a - loop faction preview videos 2012-09-25 22:52:07 +00:00
Mark Vejvoda 74cca86b3f - added new commandline option --connect=x:y format as requested 2012-09-25 21:52:23 +00:00
Mark Vejvoda c7808dc021 - allow custom port #'s to be stored in servers.ini 2012-09-25 16:43:07 +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 75011d84d5 - added support for custom music on battle end screen:
look for music in the following order:
1. check faction xml file for the following attributes (depends on win/lose) on the faction tag:
faction-battle-end-win-music="<path to music>"
faction-battle-end-lose-music="<path to music>"
if not defined 2. check the faction folder for the files:
battle_end_win_music.*
battle_end_lose_music.*
if not found check the data/core/menu/music/ paths for:
battle_end_win.*
battle_end_lose.*
2012-09-25 01:52:09 +00:00
Mark Vejvoda 3ede912b9a - added support for custom video's on battle end screen:
look for videos in the following order:
1. check faction xml file for the following attributes (depends on win/lose) on the faction tag:
faction-battle-end-win-video="<path to video>"
faction-battle-end-lose-video="<path to video>"

if not defined 2. check the faction folder for the files:
battle_end_win_video.*
battle_end_lose_video.*

if not found check the data/core/menu/videos/ paths for:
battle_end_win.*
battle_end_lose.*
2012-09-25 00:23:25 +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
Tom Reynolds bde7b5d94d servers.ini: new IP address for summoner
source/shared_lib/CMakeLists.txt: minor typos
2012-09-22 23:18:26 +00:00
Mark Vejvoda f1ef5e2ecd - removed pathfinder as a configurable item in the UI 2012-09-22 21:44:30 +00:00
Mark Vejvoda 8e88b36723 - removed pathfinder from GAE and all references 2012-09-22 21:39:13 +00:00
Mark Vejvoda 871b6c4a6e - removed deprecated 'fast' pathfinder that wasn't fast enough and is not going to be used 2012-09-22 21:05:06 +00:00
Mark Vejvoda d91e72a825 - windows compile bugfixes 2012-09-22 21:00:31 +00:00
Mark Vejvoda e0bf4df646 - cppcheck round #2 cleanup 2012-09-22 20:37:42 +00:00
Mark Vejvoda 1c211e4ce6 - lots of code cleanup from the cppcheck 2012-09-22 20:13:57 +00:00
Mark Vejvoda b1cc8592fd - deprecated the ini setting: EnableFastPathFinder 2012-09-22 17:51:42 +00:00
Mark Vejvoda fd9c9856cf - add a silent ini setting in case the auto lag code needs to be turned off down the road: AutoClientLagCorrection=true (hard coded, add and set as false in ini if required, this onhly affects game hosts) 2012-09-22 05:37:43 +00:00
Mark Vejvoda c5907717f0 - ensure client that gets kicked knows he should also quit so he doesn't get a timeout message after disconnect 2012-09-22 05:26:58 +00:00
Mark Vejvoda a1caf8c874 - bugfix to allow proper handling of special language characters for input box 2012-09-22 03:16:10 +00:00
Mark Vejvoda c0104858f0 - bugfix to show correct player info on disconnect 2012-09-22 02:17:49 +00:00
Titus Tscharntke 5b6ffbd361 again new morphing feature: better way to handle the blocked places for morphing units 2012-09-21 23:45:59 +00:00
Mark Vejvoda a4ad1f5aea - bugfixes for network player disconnect feature 2012-09-21 15:03:13 +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 684c35e25a - fix text entry so unicode characters work properly 2012-09-21 03:41:10 +00:00
Mark Vejvoda c50469acd7 - limit users to a max of 5 cell markers and use team color when placed 2012-09-21 00:54:22 +00:00
Titus Tscharntke 00c9a4c15c hopefully last bugfix for new reserved morph space feature. 2012-09-21 00:21:23 +00:00
Titus Tscharntke 2c9e0d9e7d lets try if this works ( no need to restore special playernames ) 2012-09-20 22:24:15 +00:00
Mark Vejvoda 9fc64f4878 - limit players to 5 cell markers max at any given time 2012-09-20 22:18:10 +00:00
Titus Tscharntke 64884e14d0 typo in filename corrected 2012-09-20 21:59:09 +00:00
Titus Tscharntke 3017b61254 better ( and dynamically changeable ) default game setups 2012-09-20 21:57:00 +00:00
Mark Vejvoda d4edad893c - changed cell mark / unmark icons 2012-09-20 04:53:58 +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