Will
|
2d6da27807
|
Merge branch 'master' of github.com:MegaGlest/megaglest-source
|
2013-12-07 20:41:44 +01:00 |
|
SoftCoder
|
02d41bd5f7
|
fixed windows build
|
2013-12-06 09:08:47 -08:00 |
|
Will
|
46a0dab916
|
moved model constructor always behind factory
|
2013-12-05 21:28:20 +01:00 |
|
Will
|
6afadafa1e
|
Start to abstract model
|
2013-12-05 16:17:41 +01:00 |
|
SoftCoder
|
6ae1d179bb
|
- updated for proper build on Mac
|
2013-12-04 14:54:02 -08:00 |
|
Will
|
03c0197437
|
merge from upstream
|
2013-12-04 23:37:04 +01:00 |
|
William Edwards
|
e71e7104dc
|
Trying to build on OSX
|
2013-12-04 22:38:06 +01:00 |
|
SoftCoder
|
f9e217df94
|
- bugfix so Mac builds
|
2013-12-04 13:34:00 -08:00 |
|
Will
|
7e4e98857b
|
integrate upstream
|
2013-12-04 08:49:33 +01:00 |
|
SoftCoder
|
4b50560ca9
|
- added color picking used colors count in debug view
|
2013-11-30 17:38:32 -08:00 |
|
SoftCoder
|
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 |
|
Will
|
a869dd0fee
|
Tweak to see if we can get the new colour picking code working
|
2013-12-01 00:43:49 +01:00 |
|
SoftCoder
|
c2929e3d2b
|
merged
|
2013-11-30 14:31:05 -08:00 |
|
SoftCoder
|
2ff75c54e2
|
merged updates
|
2013-11-30 14:29:02 -08:00 |
|
williame
|
125e1c53dc
|
Got the colour conversion wrong in colour picking
|
2013-11-30 21:44:53 +01:00 |
|
SoftCoder
|
f217db38f1
|
- changed to git version stamp
|
2013-11-29 13:13:30 -08:00 |
|
SoftCoder
|
1a8673feb3
|
- bugfix for will's color pick optimization (was not properly doing cell selection)
|
2013-11-28 22:58:13 -08:00 |
|
Will
|
c6530c2783
|
merging in all Will's changes
|
2013-11-29 02:12:34 +01:00 |
|
filux
|
00b4d9ab4e
|
resolved conflicts by conversion CRLF to LF
|
2013-11-28 08:26:39 +01:00 |
|
filux
|
d0836a6573
|
transfered .tx and tx-cleanup to data, added license/readme, basic configuration
|
2013-11-28 07:58:09 +01:00 |
|
Mark Vejvoda
|
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 |
|
Mark Vejvoda
|
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 |
|
Mark Vejvoda
|
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 |
|
Mark Vejvoda
|
66761ba760
|
- code cleanup based on additional gcc warnings
|
2013-11-19 06:42:32 +00:00 |
|
Mark Vejvoda
|
39b41cdfea
|
- code cleanup based on additional gcc warnings
|
2013-11-19 06:29:30 +00:00 |
|
Mark Vejvoda
|
4a4c7fbfde
|
- code cleanup based on additional gcc warnings
|
2013-11-19 06:24:22 +00:00 |
|
Mark Vejvoda
|
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 |
|
Mark Vejvoda
|
e89210cf6c
|
- updating version # to v3.9 in preparation for release
|
2013-11-16 21:50:54 +00:00 |
|
Mark Vejvoda
|
b2f3748168
|
- updates related to debian package standards
|
2013-11-16 20:27:51 +00:00 |
|
Mark Vejvoda
|
35714002e9
|
bugfix for vc++ compile
|
2013-11-15 15:58:23 +00:00 |
|
Mark Vejvoda
|
445e39ab2d
|
updated compressor to skip non mode game data by default unless additional parameter specified
|
2013-11-14 23:18:28 +00:00 |
|
Mark Vejvoda
|
e3245eb7f4
|
disable rescursive ftp file download for techtrees and tilesets
|
2013-11-14 22:57:56 +00:00 |
|
Mark Vejvoda
|
429db5ff66
|
fixed rtl mixed support mode so that words are properly placed in the sentence
|
2013-11-14 22:19:40 +00:00 |
|
Mark Vejvoda
|
f0737ac682
|
fixed rtl mixed support mode so that words are properly placed in the sentence
|
2013-11-14 22:17:30 +00:00 |
|
Mark Vejvoda
|
9350b16c4a
|
cleanup from cppcheck 1.62
|
2013-11-14 16:42:22 +00:00 |
|
Mark Vejvoda
|
b3a9ad5411
|
fixed some vc++ compiler warnings
|
2013-11-14 13:56:05 +00:00 |
|
Mark Vejvoda
|
a300621415
|
- added a new commandline command to create data archives for network xfer for techtrees and tilesets:
megaglest --create-data-archives=all
|
2013-11-14 06:59:29 +00:00 |
|
Mark Vejvoda
|
85799eddc2
|
more user friendly handling of loading corrupt saved game files
|
2013-11-14 03:33:15 +00:00 |
|
Mark Vejvoda
|
ccd6e19683
|
bug fix for font handling of newlines and added unit test
|
2013-11-14 00:23:01 +00:00 |
|
Mark Vejvoda
|
5249ecc45d
|
some code cleanup for xml parsing and loading saved games
|
2013-11-13 22:28:05 +00:00 |
|
Mark Vejvoda
|
b7267c9176
|
some memory leak cleanup
|
2013-11-13 21:26:08 +00:00 |
|
Mark Vejvoda
|
4e1c9be664
|
some memory leak cleanup
|
2013-11-13 21:22:56 +00:00 |
|
Mark Vejvoda
|
0a0e3f408a
|
- added experimental Right To Left 'mixed mode' support to attempt to make RTL languages with lines having mixed RTL and LTR words display properly (this is a manual hack). To enable, add this to the languages lng file: FONT_RIGHTTOLEFT_MIXED_SUPPORT=true
|
2013-11-13 07:56:19 +00:00 |
|
Mark Vejvoda
|
0557a1195e
|
- added console output for socket errors (lets see if we get this on windows when they slow down)
- fixed missing reload ui items in menu
|
2013-11-12 15:01:37 +00:00 |
|
Mark Vejvoda
|
7f5d35ef0f
|
- do not validate null fire particle
|
2013-11-12 01:00:03 +00:00 |
|
Mark Vejvoda
|
f1abe148ea
|
- bugfix for background crc thread shutdown
- more performance monitoring and better output of only warnings
|
2013-11-11 04:46:49 +00:00 |
|
Mark Vejvoda
|
d32de80491
|
bugfix for precache crc thread unpause on game end
|
2013-11-10 21:55:22 +00:00 |
|
Mark Vejvoda
|
8ea6235495
|
ensure pre cache crc thread does not interfere with running game
|
2013-11-10 19:47:04 +00:00 |
|
Mark Vejvoda
|
b9e3f57894
|
- attempt to rollback change that causes game differences on different platforms
|
2013-11-10 04:26:57 +00:00 |
|
Mark Vejvoda
|
ba3e5a6030
|
added ip address for socket write errors
|
2013-11-09 19:32:13 +00:00 |
|