299cc915d3
remove powerOutPut = 0
2013-10-08 02:18:22 +04:00
f7029c2f2f
remove buildPower = 0
2013-10-08 02:18:21 +04:00
79e9fe3228
remove designable = 0
2013-10-08 02:18:20 +04:00
0c75c0a0bb
Merge branch 'bugfixes'
2013-10-07 08:00:05 +02:00
6df26bf157
Fix fireOnMove in weapons.ini, which defaults to 1 and was broken by me in 5bab4fc9
2013-10-06 14:44:38 +04:00
fe1b67388c
Eliminate zero values from sensor.ini (set by default anyway)
2013-10-05 19:12:59 +04:00
85ecd9a393
Add fix for backwards terrain shadows by Berg
2013-10-05 16:54:02 +02:00
7cb30a26a2
Remove some unused code
2013-10-05 16:53:39 +02:00
5bab4fc9e6
Eliminate zero values from weapons.ini (set by default anyway)
2013-10-05 18:36:14 +04:00
e0841f5bdf
Update .gitignore.
2013-10-05 15:25:37 +02:00
2e3d054a8b
Brazilian translation update by Tucalipe.
...
Closes #4081 .
2013-10-05 15:23:35 +02:00
5986ef0f32
Turkish translation update by Ayhan Görgülü.
...
Closes #4080 .
2013-10-05 15:21:46 +02:00
03175f3760
Add compatibility define for OpenGL timer query extension and older versions of GLEW.
2013-10-05 14:36:33 +02:00
87fb6c336a
Do not clear accumulation buffers each frame (we do not use them).
2013-10-05 14:12:21 +02:00
36c835ad0e
Misc display3d cleanups
2013-10-05 13:38:14 +02:00
5ef1eff3ea
Add back alpha test for non-pre-multiplied mode PIE models for now.
...
This closes ticket:4071
2013-10-05 13:38:14 +02:00
5f32c3eafe
Performance measurement hotkey added. Press ctrl+k in debug mode to grab a sample.
...
On level exit, it writes a .csv file with your samples. Also, for each sample it
writes a screenshot with a custom filename, so you can match up the sample with a
picture of what you sampled. For analysing where we have graphics performance problems.
2013-10-05 13:38:14 +02:00
6f1666fde0
Terrain code should not use its own GL error function when we have a better one elsewhere.
2013-10-05 13:38:14 +02:00
737b8a6398
Merge pull request #40 from Cjkjvfnby/ini-rename-baseWidth
...
Ini rename basewidth and basebreadth to width and breadth for consistency
2013-10-04 11:01:18 -07:00
41c8a2ca2f
rename baseBreadth in structures.ini to breadth
2013-10-04 01:19:01 +04:00
8b76e23450
rename baseWidth in structures.ini to width
2013-10-04 01:19:00 +04:00
0f77233064
Merge pull request #39 from Cjkjvfnby/ini-rename-tiledraw
...
rename tiledraw in features.ini to tileDraw
2013-10-03 14:04:28 -07:00
e128b11245
rename tiledraw in features.ini to tileDraw
2013-10-04 01:01:35 +04:00
7745485fbd
Merge pull request #38 from Cjkjvfnby/rename-to-hitpoints
...
Rename to hitpoints
2013-10-02 13:38:40 -07:00
b2049dc269
fix ini parsers
2013-10-03 00:18:45 +04:00
384a3368eb
rename bodyPoints to hitpoints
2013-10-03 00:15:21 +04:00
20b54a39bf
rename body to hitpoints ecm. ini files
2013-10-03 00:12:39 +04:00
d75c862e7e
rename body to hitpoints in weaporns.ini files
2013-10-03 00:12:02 +04:00
f7e8d283ec
Merge pull request #37 from Cjkjvfnby/ini-cleanup
...
remove unused key "power" from ecm
2013-10-02 11:41:27 -07:00
915cb93c39
remove unused key "power" from ecm
2013-10-02 22:25:29 +04:00
2b70a2b069
Merge pull request #36 from Cjkjvfnby/stats-fix-lightWorld
...
fix lightWorld
2013-10-01 14:07:14 -07:00
de03b6d662
fix lightWorld
2013-10-02 00:42:05 +04:00
cdef38de34
Change propulsion speed modifiers to 3.1 values, accidentially changed to campaign values
...
during ini file conversion process. Patch by crab_. Closes ticket:4070
2013-09-30 20:44:51 +02:00
3ccbc6ee91
Fix missing class hints for droids bodies. Closes ticket:4077 reported by crab_
2013-09-30 20:22:08 +02:00
b57d0688d0
Do not use unnecessary memory on atmosphere effects when no atmosphere effects are in use.
...
Based on patch by wolftrak in ticket:4079, closes ticket:4079
2013-09-28 21:19:15 +02:00
feb2ae5af8
Merge branch 'bugfixes'
2013-09-27 08:00:03 +02:00
a5973b75f8
Portuguese translation update by HolyDragoon.
...
Closes #4050 .
2013-09-26 16:22:40 +02:00
a8fb3c93d4
Hungarian translation update by mtomi78.
...
Closes #3909 .
2013-09-26 16:21:15 +02:00
86cbe5ec70
Italian translation update by Alpha93.
...
Closes #4074 .
2013-09-26 16:20:16 +02:00
dd85dadf3f
French translation update by cpasmoi/machintruc.
...
Closes pull request 35.
2013-09-26 16:17:51 +02:00
7ca11b808f
Merge branch 'bugfixes'
2013-09-26 15:47:34 +02:00
ca3ea2024f
qtscript: fix description of getStructureLimit()
2013-09-21 22:35:18 +04:00
4f16a617d5
Merge branch 'bugfixes'
...
* bugfixes:
Simplify build process by getting rid of bison/flex dependencies.
Conflicts:
src/Makefile.am
src/scriptvals_parser.cpp
2013-09-21 00:21:20 +02:00
d13bc0de7d
Simplify build process by getting rid of bison/flex dependencies.
...
Fixes both MSVC and autotools (automake 1.12+).
Revert "Abort autogen.sh when automake 1.12+ is found."
This reverts commit 978ed8f1f9372eff6693372eff6693e397b24d47372eff669320317c2a6f
2013-09-21 00:14:02 +02:00
b13f2fde02
Remove hard-coded UI box colours. Other misc cleanups forward ported from GUI work.
2013-09-14 22:26:42 +02:00
086a0d907f
Remove unused code related to old AI sliders.
2013-09-14 21:48:56 +02:00
dbbc0b6758
Alpha test is no longer used. Removing it.
2013-09-14 21:36:55 +02:00
1ae50316d5
Remove separate draw calls from iV_ShadowBox, instead reuse iV_Box().
2013-09-14 21:16:49 +02:00
f58dd9357e
Remove iV_DrawImageScaled, made unnecessary by more modern iV_DrawImage2()
2013-09-14 21:02:55 +02:00
9549a685ed
Fix assert failure and wrong action type selected when VTOLs finished
...
attacking something and are sent back to rearm, and there are no
rearm structures in existence.
2013-09-14 20:17:06 +02:00
Cjkjvfnby
automerge
haonoq
Subsentient
per
cybersphinx
Per Inge Mathisen
Per Inge Mathisen
vexed