Commit Graph

570 Commits

Author SHA1 Message Date
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
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
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
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
Mark Vejvoda
8e88b36723 - removed pathfinder from GAE and all references 2012-09-22 21:39:13 +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
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
c0104858f0 - bugfix to show correct player info on disconnect 2012-09-22 02:17:49 +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
c50469acd7 - limit users to a max of 5 cell markers and use team color when placed 2012-09-21 00:54:22 +00:00
Mark Vejvoda
9fc64f4878 - limit players to 5 cell markers max at any given time 2012-09-20 22:18:10 +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
f2585ebaae fallback multiplier for CPUs playing for disconnected player. Should work now, needs testing . 2012-09-18 23:36:51 +00:00
Titus Tscharntke
158195a825 multiplier for CPUs replacing disconnected network player ( not finished yet! , only menu for now ) 2012-09-16 23:42:56 +00:00
Titus Tscharntke
75032c3287 reserve unit place while morphing. (first try) 2012-09-11 21:16:24 +00:00
Titus Tscharntke
c2d43c8b86 Chatmode does not disable autmatically. Lets try if this works . 2012-09-09 18:21:27 +00:00
Titus Tscharntke
a5c2a50d60 only "named" console messages in chat-history, typically chat messages from users
smaller console font ( for test in linux only now )
2012-09-09 14:12:35 +00:00
Titus Tscharntke
b9b6f9ef1a new game hints and german translation . ( hints are in data/lang now ) 2012-09-01 19:31:49 +00:00
Titus Tscharntke
b2e869acc3 scrolling stops when entering chat mode and holding down cursor keys, but scrolling with mouse is still possible. 2012-09-01 19:18:31 +00:00
Mark Vejvoda
648c3e190a - added patch from Taoki for showing time of game day under minimap (thanks) 2012-08-15 14:37:27 +00:00
Mark Vejvoda
3c1651d084 - bugfix when moving camera and entering chat mode 2012-08-13 23:29:59 +00:00
Mark Vejvoda
f8630e086e - fixed faction previews for linked factions 2012-08-10 20:06:41 +00:00
Mark Vejvoda
0b9ad4c457 - added support for throwing known errors and skipping stack traces (For friendlier error messages) 2012-07-20 23:51:10 +00:00
Mark Vejvoda
ed9ae076c5 - attempt to fix pizza's crash
- safer use of random # in unit updater (not backward compatible with other builds)
2012-07-20 23:07:44 +00:00
Titus Tscharntke
ed6961195f Disconnect time of early leavers is shown in end game stats. 2012-07-20 22:24:27 +00:00
Mark Vejvoda
c42d44a53a - attempt to fix pizza's crash 2012-07-20 22:18:34 +00:00
Mark Vejvoda
f3d7c5e5cb - attempt to allow special key (alt) as allowed for quick signal to team, requires user to add this to glestuserkeys.ini:
SetMarker=left alt
(does not work in latest ubuntu as alt key is used for Unity)
2012-07-20 14:38:28 +00:00
Mark Vejvoda
1c52f28185 - change team # in end game stats for team switching 2012-07-19 23:21:55 +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
Mark Vejvoda
9f0546c008 - set correct exit codes (for tomreyn)
- fix loading when too many units on map (do not segfault)
- deprecate ThreadedNetworkClient setting
2012-07-17 23:04:30 +00:00
Titus Tscharntke
25a4b83b83 sonar ping only for teammates 2012-07-17 21:29:39 +00:00
Titus Tscharntke
69f4294950 playing a sound for quick highlight pointer(marker) 2012-07-15 21:01:56 +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
1de23b6f1a - allow for left button click in minimap and move mouse will move the camera 2012-07-13 02:03:15 +00:00
Mark Vejvoda
57a988ae56 - fixed out of synch on player disconnect 2012-07-10 02:12:07 +00:00
Mark Vejvoda
4202989014 - attempt to switch CRC to use unsigned int everywhere 2012-07-07 02:46:57 +00:00
Mark Vejvoda
76606fbdbe - allow loading of scenarios and tutorials when there are none (show an error message) 2012-06-30 19:11:54 +00:00
Mark Vejvoda
b08e04fa70 - flash the remote admin player# in lobby to indicate they are the admin user 2012-06-22 14:30:48 +00:00
Mark Vejvoda
d10493edc0 - fixed the accuracy for cell markers 2012-06-22 05:40:23 +00:00
Mark Vejvoda
acc2a5f9c9 - show light green with alpha silhouette of building when unit is moving to a location to build another unit 2012-06-22 04:58:44 +00:00
Mark Vejvoda
00d99eecd7 - bugfix for loading older saved games (I added a new network player status which may not exist in older saved games). This should fix Pizza's load game issue 2012-06-22 02:18:19 +00:00
Titus Tscharntke
a9049ac887 hints while loading with language support and keycode replacement. 2012-06-19 00:32:39 +00:00
Titus Tscharntke
dc99918cfe first working version of "game hints" displayed while loading. ( still missing language support and techtree specific hint support ) 2012-06-17 22:52:30 +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
c187d4d014 - changed disconnected playername to: *AI* - playername 2012-06-11 23:50:30 +00:00
Mark Vejvoda
b965343496 - added ability to show a user is disconnected from the game 2012-06-09 15:21:18 +00:00
Titus Tscharntke
ca39f8c6b1 new try with changed fighting behaviour of ultra and mega;
fix for "*" in chat
2012-06-04 21:53:20 +00:00
Titus Tscharntke
6b27343145 In system and error messages player names are no longer highlighted in the console with a sound effect as it was very annoying. Just human written chat messages highlight the names. 2012-06-03 17:08:14 +00:00
Mark Vejvoda
660d702e97 - add a fallback url for playing videos in case the user has no internet 2012-05-25 16:33:34 +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
0fac755a5e - video player now displays 'please wait' while loading the video 2012-05-23 19:59:52 +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
0f25276e6f - applied patch from MuwuM 2012-05-21 20:15:37 +00:00
Titus Tscharntke
2fddf85486 Bugfix: HUD is working for network clients too now. 2012-05-06 21:19:31 +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
897346d1f5 - added the beginning work to support translatable techtrees 2012-05-02 20:46:47 +00:00
Mark Vejvoda
5c0db25c86 - added a few new lua methods to register cell 'areas' for unit or for factions for wciwow 2012-05-02 06:07:11 +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
Mark Vejvoda
c8fdc9269f - fix win32 build
- cleanup a lot of win32 compiler warnings
2012-04-16 20:15:57 +00:00
Mark Vejvoda
8c0bf75bf5 - got built in memory leak working. Just edit leak_dumper.h and uncomment:
//#define SL_LEAK_DUMP
- got better / more accurate stack dumps when we detect errors in game.
- Both of these need to be worked on in windows next, win32 may not compile for now until i fix it on that platform.
- BE VERY CAREFUL when working in leak_dumper.* it may cause GCC and your system to crash if you don't know what you are doing!
2012-04-14 21:21:09 +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
9aca26a0f0 - bugfix for unit selection segfault on game exit
- added thread hardening to try to ensure we never try to delete a thread more than once.
2012-04-12 20:43:19 +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
Mark Vejvoda
22f43f4267 - added new lua method for setting the direct position of a unit (can be used for teleporting):
setUnitPosition(int unitId, Vec2i pos)
2012-04-11 05:41:40 +00:00
Mark Vejvoda
2ab041813f - code cleanup based on cppcheck report 2012-04-05 03:53:59 +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
1df365d697 I removed the automatic game pausing when message are shown because I don't like it ( sc does not like it at all so ... ). Still auto-pausing while showing menues ingame in singleplayer. 2012-04-03 00:32:52 +00:00
Mark Vejvoda
5b5d753341 - bugfixes for save / load game bugs reported 2012-04-02 15:02:44 +00:00
Mark Vejvoda
fce4d55dd5 - better error handling, try to display proper error message and restore state as best as possible 2012-04-02 01:45:13 +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
3d386936dc - updated loading games to translate tutorials and scenario paths 2012-03-31 20:58:33 +00:00
Mark Vejvoda
74910ea0b2 - bugfix for loading saved scenario 2012-03-31 20:33:56 +00:00
Mark Vejvoda
152e83399d - added a new lua method isUnitAlive(unitId) 2012-03-31 20:17:19 +00:00
Mark Vejvoda
030582c1ef - added a new EnumParser class to convert enum to string and vice versa
- factions can now customize some more of the AI behavior
2012-03-31 05:54:24 +00:00
Mark Vejvoda
53d0204cb9 - bugfix network messages 2012-03-31 00:52:43 +00:00
Titus Tscharntke
d8ba2443cf new switches "count-unit-death-in-stats", "count-unit-production-in-stats" and "count-unit-kill-in-stats" for unit.xml ( allows better "resource" production for example ) 2012-03-30 23:38:05 +00:00
Mark Vejvoda
fa31fed5bd - updated to add isGameOver 2012-03-30 14:48:54 +00:00
Mark Vejvoda
c02c90427b - added some more lua commands:
vector<int> getUnitsForFaction(factionIndex,commandTypeName, field)
int getUnitCurrentField(unitId)
2012-03-30 07:10:14 +00:00
Mark Vejvoda
45b92f4316 - allow for a scenario based faction to be 'neutral' by specifying a team # of 9
- added some new lua methods:
networkShowMessageForFaction(text,header,int factionIndex)
networkShowMessageForTeam(text,header,teamIndex)
2012-03-30 05:53:33 +00:00
Mark Vejvoda
f7423608ce - bugfix for lua strings 2012-03-30 01:48:41 +00:00
Mark Vejvoda
435e06db20 - attempt to bugfix lua save/load games, added a new section for scenario files called:
<global>
</global>
Where global vars (but more importantly declared functions) should be declared
- updated amazones scenario to move globals into the global section
2012-03-29 22:30:58 +00:00
Mark Vejvoda
c13e0ef788 - better error handling logic on crashes
- translate scenario to correct file on players system
2012-03-29 00:43:03 +00:00
Mark Vejvoda
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
8a2b90895d - auto stop efficient timer event after it is triggered 2012-03-27 19:28:16 +00:00
Mark Vejvoda
d25fc14244 - added some new 'predictable' random number generation for use in lua scripts 2012-03-27 07:05:07 +00:00
Mark Vejvoda
5cc39e7c53 - added a new type of lua script timer for efficient checking of elapsed time 2012-03-27 06:42:55 +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
d356e5f5de - added new headless server status check:
on the SAME box as the headless run:
./megaglest --headless-server-status
2012-03-25 06:55:43 +00:00
Mark Vejvoda
1b8e1af25b - cleanup of console and button placement in load game menu 2012-03-20 15:01:18 +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