341c7ce46f
Shake without effecting the real camera pos
...
The camera shake effect does not manipulate the real camera pos anymore,
just the Opengl campos is effected by it. By this all camera pos related caches
don't need to refresh just beause the camera shakes.
2014-02-04 21:14:52 +01:00
50bdd2039e
- changed command speed change to only change speed min every 160 frames or more as required.
2014-02-01 22:33:59 -08:00
98234228d9
shake it baby ( camera shake effects )
...
Camera shake effects can be added via xml skill definitions.
2014-02-01 23:15:44 +01:00
20789087d9
- bugfix for streflop_test on windows
2014-02-01 11:25:01 -08:00
4310ebc6d4
- added missing unti testfile
2014-02-01 10:36:31 -08:00
c7a2040fdc
- added more verbose info when tracking network CRC
2014-02-01 10:27:11 -08:00
78ed6d4601
- attempt to add streflop to win64 build
...
- CRAZY attempt to add x64 (win64) support to streflop via some new asm code!
2014-02-01 01:28:30 -08:00
51f4b6d0db
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-30 17:45:51 -08:00
c5a938e31b
- modify about screen to show copyright for Glest Team till 2010
2014-01-30 17:45:24 -08:00
7dd40cd1be
more git ignores for Windows
2014-01-30 23:43:26 +01:00
b4807ed169
- in team mode always render two set of resources:
...
- First set of resources is the team of selected units
- SEcond set of resources is the team total
2014-01-29 22:47:55 -08:00
ce375073c1
- show team color asterisk in front of resources when displaying resources for an individual team member
2014-01-29 21:13:39 -08:00
4ba68576aa
- bugfix for loading textures for gpl and startup model pics
2014-01-29 20:42:59 -08:00
02fa995ce3
- bugfix when loading last game settings to retain player name
2014-01-29 20:26:25 -08:00
5a48eb0b8a
- bugfix for clang
2014-01-27 20:14:06 -08:00
7cae2b53f1
- bugfix for windows processing var tags in ini files (was crashing on windows when using the new glest-dev.ini)
2014-01-27 20:12:14 -08:00
cce3beb939
- cleanup code from cppcheck report
2014-01-27 19:03:52 -08:00
39696b6a65
- added ability to share resources across same teams
2014-01-27 18:55:08 -08:00
e33024c102
- For team shared unit mode, player does not lose unless all team members have no castle
2014-01-27 14:58:52 -08:00
e63b3d7499
- added support for team unit sharing
2014-01-27 14:15:05 -08:00
338f156a95
- changing version to v3.10.0-dev for new development
2014-01-27 11:21:22 -08:00
d56069488f
Let's see how good Mega-AI plays with real random when trying to find the enemy.
...
( the server must use this version to see an effect )
2014-01-27 19:23:31 +01:00
aa5403d8ef
Merge remote branch 'upstream/master'.
...
Conflicts:
mk/linux/.gitignore
mk/windoze/coverity-scan.bat
2014-01-27 08:23:42 +01:00
33bb424802
- ensure we get a newline after doing a version check when streflop disabled
2014-01-26 19:39:50 -08:00
dfb6c130ca
- additional bugfix when restoring last game settings
2014-01-26 19:22:27 -08:00
d1d6fb2eb1
- added validation for platform for internet games
2014-01-26 18:12:19 -08:00
ef8776efbb
Only platform is displayed in server table
2014-01-26 21:29:35 +01:00
8ec938a940
Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat
2014-01-26 09:46:53 +01:00
d7f5164fd1
- missed a few other refs to xerces in cmake scripts
2014-01-25 18:27:08 -08:00
9cb0ba8833
- xerces included only if forced in cmake since it will be deprecated
2014-01-25 18:12:53 -08:00
952004151c
- removed d3d files which were deprecated long ago
...
- removed freetype-gl (the embedded library from code.google.com)
2014-01-25 17:54:46 -08:00
08af18429d
- stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon.
2014-01-25 17:09:52 -08:00
ea7b088919
Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files.
2014-01-25 21:52:02 +01:00
3b8e350b4b
The documentation's files format will be more friendly for the average Windows OS user.
2014-01-25 20:29:49 +01:00
bbfbc6af0e
- Fix reload game to not replace human players
2014-01-25 10:07:15 -08:00
32f0e2cbea
- attempt to fix reload game to not replace playernames
2014-01-24 23:50:32 -08:00
0d8b3d6c63
- updated so masterserver url does not require trailing / in ini
2014-01-24 18:20:01 -08:00
fe808556bd
- added more fields for dev path support.. onlu ico files for linxu left to fix
2014-01-24 17:51:06 -08:00
581a975209
- added support for dev mode paths and removed linux symlinks for game data
...
- bugfix for segfault on headless when client disconnects
2014-01-24 13:44:21 -08:00
1cacb0df27
- missed some updates
2014-01-24 09:50:17 -08:00
0b86e1c2d5
- fixed paths for editor and model viewer camek install
2014-01-22 10:10:31 -08:00
92daccf963
- cleanup of cmake scripts and proper organizing of files
2014-01-21 23:21:56 -08:00
9170d9c400
- added clang detection in binary version output
2014-01-21 17:06:10 -08:00
85e659219b
- small cppcheck code cleanup
2014-01-18 16:49:31 -08:00
d2284bbd36
- bug fix when changing language and showing hint button on game load
2014-01-18 16:31:01 -08:00
0807d490ad
Merge branch 'master' of https://github.com/MegaGlest/megaglest-source
2014-01-18 17:16:44 -06:00
2ebe218514
Bug fixes and updates for desktop notifications.
2014-01-18 17:15:05 -06:00
4583b8d4bc
- bugfix for windows compile error for new particle feature from titi
2014-01-17 20:10:18 -08:00
4bada8fc5a
- updating game version to 3.9.1 in preparation for release
2014-01-17 19:37:25 -08:00
6d15d66795
newest blender exporter from Yggdrasil (thanks!!) . Works with blender 2.69 and later and fixes a serious bug with normals and too many exported vertices.
2014-01-17 23:14:40 +01:00
27316e8912
- added time to error console output log items
2014-01-17 13:32:42 -08:00
6439d98146
- do NOT pause for lagging clients if game network setting set to false
2014-01-17 11:32:21 -08:00
b0fc9597e3
- fixed some bugs reported by coverity
2014-01-17 09:53:19 -08:00
0de4f33923
- error output now shows system time
2014-01-17 09:46:31 -08:00
e5c4abffa5
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-17 07:56:57 -08:00
728dd3aea7
- added mutex guards in client connected menu to try to fix thread race bugs
2014-01-17 07:56:14 -08:00
d4ef639e9b
Change default MySQL database server to 'localhost' to prevent issues with Unix socket connections
2014-01-17 10:45:22 +01:00
5c484ff9d6
Script properly updates play date, not build date
...
Also fixed comments referring to build date.
2014-01-16 15:30:33 -06:00
a90ded6a00
Improved DOM handling of auto-refresher
...
Table and usage list are now identified by unique IDs, making
future modifications safer.
2014-01-16 15:20:49 -06:00
61c4d6875e
No desktop notification for empty headless servers
...
Also added fixes as suggested by JSHint (consistent indentation,
multi-line statements have the operator at the end of the line,
favouring strict comparisons).
2014-01-16 15:13:03 -06:00
5606c45821
showPlayers.php now with total time played
2014-01-16 01:40:28 +01:00
93d98e3625
first visible playerstats.
...
+ server list shows date of game instead of build date
2014-01-15 01:48:41 +01:00
fc0e479d56
* Move masterserver docs to docs/ subdirectory
...
* Update copyright period to 2014
* Remove Debian specific license hints since: <pabs> that isn't necessary in any file except the Debian copyright file
2014-01-14 16:32:38 +01:00
2c7d464abc
- remove console output for pbo's
2014-01-12 09:59:08 -08:00
3425d4c248
- changed code to cleanup pixbuf allocation earlier to not confuse gDEbugger about an openGL memory leak.
2014-01-11 23:28:33 -08:00
9ea0debc51
CameraMoveSpeed can be modified
2014-01-11 15:53:53 +01:00
41553cc679
dumb bug writing mesh bound particle warnings all the time, even if not needed
2014-01-08 22:24:11 +01:00
0bf6d94d3e
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-08 12:49:25 -08:00
7d8af94a44
- attempt to fix null pointer segfault on masterserver found by tomreyn
2014-01-08 12:48:56 -08:00
aee2417ce1
Additional warning for modders to find problems with mesh bound particles.
2014-01-05 23:57:29 +01:00
2cb45f876f
no click on buttons while preview map is in zoomed state
2014-01-05 23:56:45 +01:00
ba1d03118e
unit particles can be bound to first vertice of meshes ( <meshName value="part1.001" /> )
2014-01-04 18:40:00 +01:00
37494a9c37
- added new LUA method getFactionPlayerType
2014-01-04 09:34:49 -08:00
2badd13fd3
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-03 15:10:59 -08:00
9026ce161d
- bugfixes when user has no internet and published not turned on, do not try to do UPNP.
2014-01-03 15:10:30 -08:00
29f5881ded
Just render zoomed map preview and nothing else.
2014-01-03 19:19:10 +01:00
58faecb5d5
- bugfix for datapath
2014-01-03 10:15:30 -08:00
85319b30fc
- fixup use of --data-path param
2014-01-03 08:01:33 -08:00
2b9326197a
- added verbose debug info for data paths scanning
2014-01-03 07:28:31 -08:00
ecdb229bdf
- attempt to do better lag handling (pause game up to 3 times for lagging clients then disconnect)
2014-01-02 13:56:37 -08:00
5f1e67ec9b
- updated network throttle check to output nothing if we cannot open the reg key (likely because it does not exist and does not apply)
...
- updated libvlc use in windows to use 2.1.2
2014-01-01 14:58:14 -08:00
6f4c3ed033
- added reg file for windows users to manually disable packet throttling
...
- added console warning for windows users that have this setting enabled.
2014-01-01 13:24:24 -08:00
7643c2b591
- changed registry branch to hkey local machine for packet throttle
2014-01-01 11:23:51 -08:00
02cb5c235d
- bugfix to compile in msvc
2014-01-01 11:08:51 -08:00
676a6071fa
- attempt to disable packet throttling on windows
...
- added some network packet debug code
2014-01-01 10:59:55 -08:00
21a12a6c72
- added ability to render map preview full screen when user clicks on the map preview. Click anywhere on the fullscreen map to restore.
2013-12-30 23:32:06 -08:00
b109b26664
- attempt to add crude thread state tracking in thread class and force thread to die if it appears to be stuck (and output to console)
2013-12-30 21:23:49 -08:00
e0aa65402d
- added ability to force the LUA version to compile with (5.1 or 5.2)
2013-12-30 18:30:23 -08:00
8742d36a06
- do not save empty lua tables
2013-12-30 17:12:49 -08:00
5613b0739e
- added more lua debug info
2013-12-30 14:00:04 -08:00
853d531d11
- added two new lua methods basxto:
...
storeSaveGameData(name, value)
string loadSaveGameData(name)
2013-12-30 12:55:59 -08:00
2c788e074a
- fix auto loading scenario from commandline
2013-12-30 12:19:10 -08:00
c7c82b56e1
- a little cleanup of building with lua and CMAKE
...
- added ability to force building without static libs in build script: -d=1
- added --lua-debug commandline option
2013-12-30 11:02:43 -08:00
5c90b9148c
- bugfix for saving / loading booleans in a lua table
2013-12-30 09:28:25 -08:00
97d11a9cfd
- script manager detected errors don't try to translate the error
2013-12-30 08:17:05 -08:00
5b445ad388
- removed stack trace from script manager methods that create known errors to make error message smaller.
2013-12-30 07:57:51 -08:00
329805ac30
Merge branch 'master' of github.com:MegaGlest/megaglest-source
2013-12-30 16:20:03 +01:00
11eeed59a1
new attribute "render-size" in unit-type
2013-12-30 16:19:08 +01:00
fda53f47d1
- bugfix for loading scenarios with their own techs
...
- all scenario errors are now caught and shown in a messagebox and game can continue.
2013-12-30 02:01:47 -08:00
b6cd751250
- bugfixes on windows platform when some folders and files are missing, do not crash hard.
2013-12-27 23:05:20 -08:00
163a5a173a
- bugfix when user has no sound device
2013-12-27 22:32:58 -08:00
c442328b58
- small bugfix for lazy loading textures
2013-12-27 22:08:51 -08:00
62821793c0
- moved core game data asset loading into lazy load methods to try to improve the startup speed of megaglest.
2013-12-27 22:00:29 -08:00
533b1f0bfe
Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source
2013-12-26 18:29:35 +01:00
9c51bfc60c
introduce shared linux shell code / externalize distribution check
2013-12-26 18:28:21 +01:00
220a0130dd
- bugfixes for msvc compile
2013-12-25 11:48:08 -08:00
3bb9da6cdf
- removed directsound related references as it has been deprecated since 3.6.0.1
...
- coverity related fixes
2013-12-25 11:42:00 -08:00
f06d474b60
- cleanup some socket issues and also a possible int overflow
2013-12-24 22:44:46 -08:00
3111b733e2
- bugfix for chrono class calcs causing group camera recall to fail (And numerous other problems)
...
- added better tracking of mutexes by assigning them location info
2013-12-24 22:27:44 -08:00
25326c64b1
- cleanup some warnings from msvc
2013-12-23 10:34:52 -08:00
1ba098d0f0
- clang compiler warning cleanup
2013-12-23 00:05:07 -08:00
e0c2a388d4
- msvc compiler warning cleanup
2013-12-22 23:58:12 -08:00
bcaad53fbe
- cleanup some msvc++ compiler warnings
2013-12-22 23:15:31 -08:00
3a24531ba7
- more code cleanup based on cppcheck results and valgrind
...
- added -h option to build-mg.sh to show parameter usage.
2013-12-22 22:53:26 -08:00
2d3e04f413
- a few more minor code quality fixes
2013-12-22 21:03:40 -08:00
da3c55c00b
- bugfix, now support proper saving and reloading of games where attack boost is applied to units
2013-12-22 16:10:00 -08:00
6cd1d237ab
- a little more code cleanup from coverity issues
2013-12-22 13:18:40 -08:00
f8c497f6dc
- in progress work to try to get attack boosts loading from a saved game (not working yet and commented out)
2013-12-21 21:53:27 -08:00
372442d181
Render order changed to get better render results with units using
...
semi-transparent textures.
2013-12-22 01:36:54 +01:00
343a728911
- cleanup some network related code and try to remove uneeded noise
2013-12-18 23:35:27 -08:00
9249d6370c
looks like glEnable(GL_COLOR_MATERIAL); was still needed to render units properly
2013-12-18 21:35:04 +01:00
39be9372aa
Make showGameStats.php produce HTML which is suitable for embedding into an existing DOM
2013-12-18 20:40:08 +01:00
998cabafac
- a few more coverity reported fixes
2013-12-18 08:26:16 -08:00
606aa392c7
- added coverity linux script
...
- a few updates to fix coverity reported issues
2013-12-17 23:57:45 -08:00
e3996ceb92
- bugfixes for coverity reported issues
...
- new bash parameters for build-mg.sh (in prep for coverity automation)
- updated travis build to use new bash param
2013-12-17 17:35:51 -08:00
d8160c1065
- modified game time to be game duration instead as that is more useful for players who want to see in game clock info
2013-12-17 13:26:58 -08:00
a56eb83c91
- moved map path into config class
...
- proper render performance calc compare
2013-12-16 23:54:33 -08:00
ca12b7912a
- cleanup clang warning
2013-12-16 19:25:07 -08:00
b5243763a2
- added some device cleanup in case its needed
2013-12-16 19:11:17 -08:00
1463dc0fc1
- bugfix for memory leak
2013-12-16 17:48:52 -08:00
d1f9fbc4a7
- cleanup warnings from clang
2013-12-15 09:19:24 -08:00
0b73d3922a
- fixed windows build from coverity updates
2013-12-14 22:59:32 -08:00
f269273f07
- round #2 of coverity bug fixes
2013-12-14 22:37:15 -08:00
b8ab732b85
- cppcheck code cleanup
2013-12-14 18:07:22 -08:00
87f855b419
Very transparent parts of textures were cutted away while rendering. It turned out there is only a need to do this for shadows and selection rendering, not for real rendering.
2013-12-15 00:12:25 +01:00
6e061f459d
- cleanup a few newly introduced compile warnings
2013-12-14 10:49:01 -08:00
22beafe122
- fixed windows build for vc++ 2010
2013-12-14 03:09:12 -08:00
b11932b92d
- cleanup from cppcheck report
2013-12-14 03:03:19 -08:00
d69e19b87b
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
...
Conflicts:
source/shared_lib/include/platform/sdl/factory_repository.h
2013-12-14 02:45:25 -08:00
65e55d3796
- merged changes with windows build fixes
...
- updated svn commands to git for validation params
2013-12-14 02:44:41 -08:00
1d9f1f9432
- forgot to commit changes
2013-12-14 02:33:03 -08:00
ec13e904d3
- fixed windows build (removed gl2 references)
2013-12-14 02:29:32 -08:00
209458adee
- removed deprecated gl2 code as it was not used
2013-12-14 02:22:30 -08:00
b9d6b38e8f
- coverity based bug fixes - round #1
2013-12-13 23:04:12 -08:00
c887b0c357
- attempt to cleanup a few warnings
...
- attempt to get git rev info each compile (not just when running cmake)
2013-12-11 23:16:56 -08:00
c91b92901b
- added ignore folder
2013-12-11 19:18:33 -08:00
a567fe159d
- bugfix for headless mode segfault reported by titi
2013-12-11 19:07:24 -08:00
ad81692331
Merge branch 'master' of https://github.com/williame/megaglest-source
2013-12-09 18:07:42 -08:00
3bc5901a01
From Bugreport: cannot delete characters after clicking on player name in lobby
...
https://forum.megaglest.org/index.php?topic=9302.0
2013-12-10 01:52:08 +01:00
dcada00514
as there are already several changes to originla 3.9.0 we better set a new version number
2013-12-09 23:14:33 +01:00
e718f78931
- corrected compile warnings for unit test
2013-12-08 20:08:44 -08:00
2d6da27807
Merge branch 'master' of github.com:MegaGlest/megaglest-source
2013-12-07 20:41:44 +01:00
02d41bd5f7
fixed windows build
2013-12-06 09:08:47 -08:00
46a0dab916
moved model constructor always behind factory
2013-12-05 21:28:20 +01:00
6afadafa1e
Start to abstract model
2013-12-05 16:17:41 +01:00
6ae1d179bb
- updated for proper build on Mac
2013-12-04 14:54:02 -08:00
03c0197437
merge from upstream
2013-12-04 23:37:04 +01:00
e71e7104dc
Trying to build on OSX
2013-12-04 22:38:06 +01:00
f9e217df94
- bugfix so Mac builds
2013-12-04 13:34:00 -08:00
7e4e98857b
integrate upstream
2013-12-04 08:49:33 +01:00
b868a8468b
- bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver.
2013-11-30 20:33:25 -08:00
4b50560ca9
- added color picking used colors count in debug view
2013-11-30 17:38:32 -08:00
f7bc5e8f92
- bugfix and additional code (for now) to track duplicates and problems in color picking. We now use will's implementation as it supports 64K colors.
2013-11-30 17:20:30 -08:00
a869dd0fee
Tweak to see if we can get the new colour picking code working
2013-12-01 00:43:49 +01:00
b36244fcbd
updated unit test to show max colors supported and when each algorithm fails.
2013-11-30 14:48:11 -08:00
c2929e3d2b
merged
2013-11-30 14:31:05 -08:00
2ff75c54e2
merged updates
2013-11-30 14:29:02 -08:00
0400312810
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2013-11-30 14:23:52 -08:00
d5b3972807
added new color picking tests to repo
2013-11-30 14:07:26 -08:00
125e1c53dc
Got the colour conversion wrong in colour picking
2013-11-30 21:44:53 +01:00
f217db38f1
- changed to git version stamp
2013-11-29 13:13:30 -08:00
1a8673feb3
- bugfix for will's color pick optimization (was not properly doing cell selection)
2013-11-28 22:58:13 -08:00
c6530c2783
merging in all Will's changes
2013-11-29 02:12:34 +01:00
be3d4d300c
- bugfix for headless server mode (null pixmaps) shown by stacktrace on fakir
2013-11-28 16:20:40 -08:00
00b4d9ab4e
resolved conflicts by conversion CRLF to LF
2013-11-28 08:26:39 +01:00
d0836a6573
transfered .tx and tx-cleanup to data, added license/readme, basic configuration
2013-11-28 07:58:09 +01:00
8d040b9f63
- attempt to ensure color picking ALWAYS has unique colors
2013-11-25 07:26:23 +00:00
ceb799a66e
- attempt to ensure color picking ALWAYS has unique colors
...
- better handling of scenario's that are missing techtrees
2013-11-24 04:44:12 +00:00
8414077d7a
- bugfix for headless server's reporting of winning players and team.
...
- masterserver returns proper JSON header now
2013-11-22 21:17:38 +00:00
f6806bd1ea
- added unit tests for arabic handling in fribidi
...
- added default property value for right to left mixed in english.lng
- fixed bug in arabic.lng file
2013-11-20 00:22:39 +00:00
7d5b71b2cf
- bugfix for compilation on windows
2013-11-19 22:47:22 +00:00
ab64b9343f
- updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build.
2013-11-19 21:57:28 +00:00
929cc07895
- code cleanup based on additional gcc warnings
2013-11-19 07:05:45 +00:00
ad7569ded1
- code cleanup based on additional gcc warnings
2013-11-19 07:02:26 +00:00
33d87512b0
- code cleanup based on additional gcc warnings
2013-11-19 06:58:52 +00:00
94684c66a4
- code cleanup based on additional gcc warnings
2013-11-19 06:56:09 +00:00
66761ba760
- code cleanup based on additional gcc warnings
2013-11-19 06:42:32 +00:00
39b41cdfea
- code cleanup based on additional gcc warnings
2013-11-19 06:29:30 +00:00
4a4c7fbfde
- code cleanup based on additional gcc warnings
2013-11-19 06:24:22 +00:00
9268aaf279
- a few minor bug fixes related to code warnings
...
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
2013-11-19 06:14:06 +00:00
642a26bdb5
- bugfix for cmake builds handling of help2man for empty executable paths
2013-11-18 23:10:38 +00:00
e28097e0d7
- bugfix for cmake builds handling of help2man for empty executable paths
2013-11-18 22:37:12 +00:00
fe6886d273
- bugfix for cmake builds handling of help2man for empty executable paths
2013-11-18 22:05:16 +00:00
b74271348c
- bugfix for map editor hanging on some windows installations
2013-11-17 22:42:51 +00:00
145b90d341
- updating version to 3.9.0 for release
...
- increase installer size on linux for more accurate progrerss bar
2013-11-17 18:27:41 +00:00
be7639aca4
- added a few more unit tests for version checks
2013-11-17 18:13:54 +00:00
d2cb21d818
version is set to 3.9-dev until versioning system is discussed
2013-11-17 10:41:09 +00:00
4478b8d1df
- fixed compiler warnings in linux 32 gcc
2013-11-17 09:03:57 +00:00
ff9faf7a4a
- fixed warnings in 32 bit linux gcc
2013-11-17 09:01:32 +00:00
d0ac27353a
- fixed compiler warnings in linux 32 gcc
2013-11-17 08:44:47 +00:00
titiger