Commit graph

2948 commits

Author SHA1 Message Date
Magnus Auvinen 85f216d968 Fixed so that the tileborderfix tool isn't needed anymore. Solve the issue by using a 3d texture instead 2014-02-10 18:53:47 +01:00
oy f69d31d5ff Merge pull request #1191 from cinaera/quad_i2fx
Cleanup quad creation: add i2fx to reduce confusion
2014-02-10 18:42:33 +01:00
BeaR 2bfb848414 Cleanup quad creation: add i2fx to reduce confusion 2014-02-10 10:46:45 +01:00
oy 19912be97a Merge pull request #1170 from SushiTee/vs12_fix
fixed compiling using visual studio 2013 by renaming the round function
2014-02-09 19:16:09 +01:00
oy 8e5733ff1c Merge pull request #1190 from cinaera/fix_automapper
Automapper: fix wrong tile orientation and correctly handle border tiles
2014-02-09 18:54:03 +01:00
oy 2c8539754b Merge pull request #1175 from 4a4ik/patch-1
Update license.txt
2014-02-09 18:52:49 +01:00
oy 80ea32de64 Merge pull request #1176 from 4a4ik/patch-2
Update readme.txt
2014-02-09 18:52:31 +01:00
oy 3fcbb40cac removed old sdl framework handling on mac 2014-02-09 18:03:37 +01:00
oy 41b41ec451 fixed some warnings 2014-02-09 17:59:08 +01:00
oy caf21b5f6b Merge pull request #1179 from ignatenkobrain/freetype_fix
ft: correctly include FreeType
2014-02-09 17:01:41 +01:00
oy 143c7b0a35 Merge pull request #1184 from cinaera/fix_vec
Fix typo in vector2_base division operator
2014-02-09 16:59:20 +01:00
oy c598e87ebe fixed a server crash due to faulty offsets. #1173 2014-02-09 16:54:09 +01:00
BeaR 868e212871 Automapper: fix wrong tile orientation and correctly handle border tiles 2014-02-07 20:16:11 +01:00
BeaR be52fc28c6 Fix typo in vector2_base division operator 2014-02-05 19:19:49 +01:00
m!nus 752b8d6b75 Merge pull request #1180 from heinrich5991/pullreq_1180
Fix vector2_base::operator!= from previous commit
2014-01-19 10:26:48 -08:00
heinrich5991 9d3d8cc197 Fix vector2_base::operator!=
Previously it compared the x coordinate of the one vector with the y coordinate
of the other vector.
2014-01-19 19:23:39 +01:00
Igor Gnatenko 174ba36544 ft: correctly include FreeType
We shouldn't include bundled freetype libs if we found freetype-config

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2014-01-19 13:00:41 +04:00
Eugene ff9f6a17e5 Update readme.txt
updated year
2014-01-10 09:06:31 +02:00
Eugene bd2359569e Update license.txt
updated year
2014-01-10 09:05:13 +02:00
SushiTee 13a128ef8c fixed compiling using visual studio 2013 by renaming the round function 2013-12-09 14:00:24 +01:00
oy 22fe75245c Merge pull request #1111 from heinrich5991/pullreq_1111
Fixed two minor issues
2013-11-26 11:44:30 -08:00
josephgbr bdd0663db0 Localize the flag capture's message
This string is presented to the user without translation, but would be nice if it could.

Requires adding the respective original strings in translation files.
2013-11-26 20:31:08 +01:00
oy c9eb180a2e Merge pull request #1104 from TsFreddie/patch-1
Fix a spelling mistake "Spactating"->"Spectating"
2013-11-26 11:23:20 -08:00
oy 2c73819a15 Merge pull request #1121 from east/ipv6_fix
IPV6 fix
2013-11-25 11:27:33 -08:00
oy 1e1befc3ec Merge pull request #1163 from Tolsi/master
Adding 9th mouse button support
2013-11-25 11:25:38 -08:00
oy a5ab154547 Merge pull request #1165 from fisted/fix_netbsd
support NetBSD
2013-11-25 11:24:11 -08:00
oy 23e690392b fixed make_release script on win64 2013-11-25 20:12:03 +01:00
oy d2379124d5 improved chat msg spam protection 2013-11-25 20:06:19 +01:00
oy 08d0af36c2 increased minimum required connect time for clients to 1 second. #1070 2013-11-25 19:57:40 +01:00
PsychoGod 40cdbf6c6a window center position when windowed on Windows :3 2013-11-25 19:51:28 +01:00
oy 4e14dedd80 prevent quick join/quit flood. #1070 2013-11-25 19:27:57 +01:00
fisted 0e2a134c2a support NetBSD 2013-11-17 00:52:31 +01:00
Sergey Tolmachev d26039cc84 9th mouse key and its code was added 2013-10-29 01:52:23 +03:00
Sergey Tolmachev e2727c8e1e Adding support 9th mouse key 2013-10-29 01:50:47 +03:00
Sergey Tolmachev e06a57d437 9th mouse key name was added 2013-10-29 01:49:40 +03:00
Sergey Tolmachev 42de8699c8 Update key generation script to support 9th mouse key 2013-10-29 01:48:26 +03:00
oy 30e6e0877b fixed master server lookup for servers. #1047 2013-09-25 15:03:28 +02:00
east 1bd3d9e584 net_addr_from_str() fix 2013-08-05 09:39:43 +02:00
heinrich5991 ca87b4b84b removed weird if from the pure server/tune check
This fixes #1110 on GitHub.
2013-06-30 11:49:00 +02:00
heinrich5991 3e9fadf908 added operator != to the vec? templates
This fixes #1094 on GitHub.
2013-06-30 11:45:47 +02:00
Freddie Wang b09dacf02f Fix a spelling mistake "Spactating"->"Spectating"
There's spelling mistake in menus_ingame.cpp (line 99)
2013-06-05 17:03:22 +08:00
oy fe49818093 fixed tabs from last commit 2013-06-04 18:54:15 +02:00
oy acaaa9723b added optional context to a localization string to allow multiple translations. Closes #1082 2013-06-04 18:41:32 +02:00
oy 4a88f93683 updated git ignore 2013-06-03 17:35:52 +02:00
oy f7d436b398 made skin selector refresh on save and added delete functionality. Closes #1101 2013-06-02 12:49:27 +02:00
oy 22c14e9347 Made client/server check for correct map version on load. #1100 2013-06-01 15:26:22 +02:00
m!nus 7e971a514c prevent map editor from crashing if loaded map is invalid 2013-06-01 13:18:16 +02:00
oy 2bee327302 Fixed removing tattoo/decoration in the skin creator. Closes #1099 2013-06-01 12:44:11 +02:00
oy 33efa4e512 Fixed a missing check if killer is alive in tdm 2013-04-26 16:52:14 +02:00
oy f52ca525c0 Merge pull request #1084 from cinaera/atomics
Fixing atomics (threading)
2013-04-26 07:42:30 -07:00