17da34c60b
Fixed a bug that caused all upgrades in campaign (such as HEAT cannon shell) not working.
2014-02-15 04:21:36 +00:00
b0b72a73cd
Merge remote-tracking branch 'upstream/master'
2014-02-14 14:15:46 +00:00
df1b02a32a
Merge branch 'bugfixes'
2014-02-10 08:00:10 +01:00
add2e1177c
ini2json: Make filters start with 'filter' to make it clear what they are. Also make them take
...
arrays. Finally, the research effects effects start with lower case letters.
2014-02-08 15:27:35 +01:00
19c16ed0ba
Place newly produced droids correctly when building is rotated.
2014-02-06 16:03:59 +04:00
1f73552892
Hardcoded timer display to fix strftime on some systems
2014-02-04 06:22:51 -05:00
54567cf3e1
Merge pull request #50 from Ginger88895/master
...
Fixed a typo that caused the game to crash on mission end.
2014-02-03 13:09:51 -08:00
7c274b1c21
Fixed a typo that caused the game to crash on mission end.
2014-02-03 08:22:26 -05:00
80d43e08e6
Merge branch 'bugfixes'
2014-01-31 08:00:08 +01:00
1eb4cb09e6
Try again to fix buildbot problem with GLEW 1.9 and glPopDebugGroup()
2014-01-27 22:19:55 +01:00
d0bfea73a9
Try to fix build bot and other hosts that do not have an up to date version of GLEW.
2014-01-27 19:20:51 +01:00
e0dd069d89
Merge branch 'newbugfixes' into bugfixes
2014-01-26 21:58:17 -05:00
144c2e380d
Show all features in debug menu. Patch by vexed. Closes ticket:4166
2014-01-26 22:54:19 +01:00
8c0cb1bb23
Do not hardcode backdrop numbers and filenames. Allow all backdrop types to have
...
random variations, based on filename base. Hardcoded limits removed. Patch by stiv,
modified by me. Closes ticket:4168
2014-01-25 15:07:07 +01:00
9a6fdec2b5
Annotate the OpenGL command stream better. Now using the new KHR_debug extension with
...
debug groups. Some functionality commented out until apitrace fixes a bug upstream.
For this functionality, GLEW version 1.10 or higher is required.
2014-01-25 13:39:07 +01:00
55bf05d085
Merge branch 'newbugfixes'
2014-01-20 08:00:04 +01:00
46e8b97680
Fix error in base/stats/research_cam3.ini. Closes ticket:4173. Patch by Duha.
2014-01-20 00:57:14 +01:00
3af2ff4211
Add -t option to python interpreter to warn about mixing tabs and spaces. Closes ticket:4172 for now.
2014-01-19 15:14:31 +01:00
ad97be5d40
Remove unnecessary comma at end of ini line. Closes ticket:4171. Patch by Duha.
2014-01-19 15:12:30 +01:00
d596439f39
ini2json: Merge bodypropulsionimd.ini into body.json
2014-01-19 15:05:09 +01:00
016b717a43
Fix path concatenation bug in CheckInMap, don't forget to check out the skirmish folder.
2014-01-19 16:05:05 +04:00
134801136b
ini2json: Update with missing stuff. Make sure lists are lists.
2014-01-09 00:22:00 +01:00
a9162e84f0
Fix header descriptions of some of the INI data files.
2014-01-08 23:35:36 +01:00
999928e70b
ini2json: Convert IDs to real names.
2014-01-01 16:23:41 +01:00
9954fdaebf
Add tools to convert ini files to JSON format.
2013-12-31 15:55:10 +01:00
0ad9c4d1fb
When configuring debug builds with gcc, use -ggdb for compatibility with the
...
linux perf tool. Also add -fno-omit-frame-pointer for the optimised debug
builds for the same reason.
2013-12-31 11:39:50 +01:00
73952c9756
Remove multiplayer stats files that are identical in single player.
2013-12-29 13:25:57 +01:00
90f9ef01e8
Updated textures and models by Christian Scholz (cnceo), and tcmasked VTOL pad by Berg.
2013-12-22 15:09:10 +01:00
d289598813
Move random oil drum placement to rules.js
2013-12-22 15:43:17 +04:00
904edbd94e
qtscript: Add terrainType(x, y) to check passability of map tiles
2013-12-22 15:43:06 +04:00
cba585f67b
Remove unused DEPTH_CMP_LEQ_WRT_OFF
2013-12-20 19:27:29 +01:00
fc9a2a4edb
Try to fix link errors on buildbot
2013-12-14 17:47:42 +01:00
7b8cddf092
Version 3.2 requires OpenGL 2.0.
...
Remove unnecessary dependencies between ivis library and main source.
Add link test program to detect and prevent new unnecessary dependencies.
2013-12-14 17:33:32 +01:00
5057823792
Simplify the vision code a bit. Behaviour should be exactly identical.
2013-12-14 15:58:04 +01:00
eb9e6ee9f3
Remove unnecessary glClearColor calls. (They do not make fog any less broken.)
...
Turn deprecated GL_CLAMP into GL_CLAMP_TO_EDGE.
2013-12-14 15:58:04 +01:00
38dd24351e
Merge branch 'newbugfixes'
...
Conflicts:
data/mp/stats/weapons.txt
2013-12-13 23:24:37 -05:00
322cfc38f9
Update changelog for 3.1.1
2013-12-11 20:51:11 -05:00
ffcc03f141
Needle Gun: (RailGun1Mk1) weight 400 -> 1000
2013-12-11 22:27:01 -05:00
b7753a36a2
make -Cpo update-po
2013-12-11 22:26:09 -05:00
5e8c17e4a9
Merge branch 'newbugfixes'
2013-12-08 23:53:38 -05:00
2673956a89
Updated Turkish translation
...
This commit fixes typos and consistency problems. Also double space,
punctuation, capitalization problems.
Patch by wakeup
Closes ticket:4140
2013-12-08 23:52:53 -05:00
468886b3d2
Maybe this will fix buildbot issues.
2013-12-08 10:58:15 +01:00
108bd6ba63
Merge branch 'newbugfixes'
2013-12-08 00:39:33 -05:00
eb143cac5d
When making builds and checking for modifications, we will
...
ignore any and all po files as far as git is concerned, and
after check is done, we reset our index to once again show
if the po/*.po files were modified.
2013-12-08 00:35:51 -05:00
f29d13b4e8
Merge branch 'newbugfixes'
...
Conflicts:
data/mp/stats/weapons.txt
src/Makefile.am
src/ai.h
2013-12-07 21:26:19 -05:00
ad80daadc9
Fix some log spam
2013-12-07 20:11:38 -05:00
7c63763c5c
Check deeper for map-mods
2013-12-07 18:59:45 -05:00
1e503680c3
Update MSVC build refs: e9643818d1
2013-12-07 18:53:40 -05:00
72a73175bb
Buff cannons more: decrease production time 375->250.
2013-12-07 10:55:25 +04:00
5a8493034f
Disable 'View Intro' when videos are not installed.
...
(cherry picked from commit 770b5d45af
2013-12-04 23:09:26 -05:00
Ginger88895
automerge
per
haonoq
Per Inge Mathisen
vexed