Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,728 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

5753 Commits (master)

Author SHA1 Message Date
Ginger88895 b0b72a73cd Merge remote-tracking branch 'upstream/master' 2014-02-14 14:15:46 +00:00
automerge df1b02a32a Merge branch 'bugfixes' 2014-02-10 08:00:10 +01:00
haonoq 19c16ed0ba Place newly produced droids correctly when building is rotated. 2014-02-06 16:03:59 +04:00
Ginger88895 1f73552892 Hardcoded timer display to fix strftime on some systems 2014-02-04 06:22:51 -05:00
per 144c2e380d Show all features in debug menu. Patch by vexed. Closes ticket:4166 2014-01-26 22:54:19 +01:00
per 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
automerge 55bf05d085 Merge branch 'newbugfixes' 2014-01-20 08:00:04 +01:00
haonoq 016b717a43 Fix path concatenation bug in CheckInMap, don't forget to check out the skirmish folder. 2014-01-19 16:05:05 +04:00
haonoq d289598813 Move random oil drum placement to rules.js 2013-12-22 15:43:17 +04:00
haonoq 904edbd94e qtscript: Add terrainType(x, y) to check passability of map tiles 2013-12-22 15:43:06 +04:00
per 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
per 5057823792 Simplify the vision code a bit. Behaviour should be exactly identical. 2013-12-14 15:58:04 +01:00
per 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
vexed f29d13b4e8 Merge branch 'newbugfixes' 
Conflicts:
	data/mp/stats/weapons.txt
	src/Makefile.am
	src/ai.h
 2013-12-07 21:26:19 -05:00
vexed ad80daadc9 Fix some log spam 2013-12-07 20:11:38 -05:00
vexed 7c63763c5c Check deeper for map-mods 2013-12-07 18:59:45 -05:00
vexed 5a8493034f Disable 'View Intro' when videos are not installed. 
(cherry picked from commit 770b5d45af)
 2013-12-04 23:09:26 -05:00
vexed af746f570c Make sure that a droid's weapon can actually damage the target before getting orders to pursue the target. 
Patch by Kreuvf & vexed

fixes ticket:4134
 2013-12-03 20:58:02 -05:00
vexed cc70e11921 K.I.S.S 
Vastly simplify how we determine what version it is.
We only support git, nothing else is needed/wanted because of upkeep
headaches.
tags are now verified with exact-match, NULL otherwise.
branches are now populated with the symbolic-ref, NULL otherwise.

Fix modification detection.
Vastly simplify how we use version data.
Fix autorevision.cache file to not be deleted on make clean (before, it would be
deleted if you were using a tarball and did make clean)

No build modification changes are nessesary, it is backwards compatiable to
what we had before. (As long as you use git or use the tarball)

closes ticket:4136
 2013-12-03 20:58:01 -05:00
vexed 8cba7f3463 Fix --host & --join=IP to work again. 
fixes ticket:4094
 2013-12-03 20:58:00 -05:00
per 7cf3ff3d29 Fix one last dependency from framework to src/, and fix a possible race condition in error reporting. 2013-12-01 19:10:38 +01:00
per 856bba37ed Remove dependency on src/ from lib/sdl and lib/qtgame, and one dependency from framework 2013-12-01 18:37:25 +01:00
per 3464fc0ddb Don't wait one minute before showing an errror in the console. That is the wrong way to implement throttling... 2013-12-01 18:10:22 +01:00
per e9643818d1 Remove dead code, which means removing two entire files. 2013-12-01 18:10:17 +01:00
per e3be45d636 Move the tiny contents of iV_ShutDown() into screenShutDown() and shut down ivi.h and ivi.cpp 2013-12-01 17:46:24 +01:00
per 3830e1ae77 Clean up interface between framework, ivis_opengl and main, reducing dependencies that go the wrong way. 
Removing unnecessary header file frameint.h
 2013-12-01 17:29:16 +01:00
vexed 81cbe807bd Merge branch 'bugfixes' 2013-11-27 21:18:59 -05:00
vexed 2050161600 When physfs finds issues with maps, throw up a POPUP about the issue, (which makes it a non-fatal error) and then ignore said file. 2013-11-27 21:18:32 -05:00
vexed 24c3ea5a7d Merge branch 'bugfixes' 2013-11-25 20:41:19 -05:00
vexed 3eb4457e01 Make it more clear that the user needs to delete said file, since it unsupported or corrupted. 2013-11-25 20:38:24 -05:00
vexed e37254f59e Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-20 20:42:09 -05:00
vexed fdd2524f1b Differentiate between maps and maps that have mods in them. Map-mods will now be shown in red on the lobby screen, and the map picker screen. It will show a red lamp next to the map if you join a game via IP or, you knowingly join a game that is hosting a map-mod. 2013-11-20 20:21:44 -05:00
vexed 8cff9973b9 Revert "map-mod fun" 
This reverts commit ac9afb2721.
(didn't mean to push this yet)
 2013-11-19 21:47:55 -05:00
vexed ac9afb2721 map-mod fun 2013-11-19 21:15:44 -05:00
vexed 9ace98ba5e Merge branch 'bugfixes' 2013-11-19 20:54:12 -05:00
vexed b4b019aa5a Merge branch 'bugfixes' 
Conflicts:
	src/init.cpp
	src/multiint.cpp
	src/power.cpp
 2013-11-19 22:18:46 -05:00
vexed 53a2ec6ad5 Deja 'vu, Fix picky compile issue reported by buildbot. :P 2013-11-19 20:46:26 -05:00
vexed bd83349fbf Fix lobby to correctly show when no games are available because of version mismatch. 2013-11-19 20:31:22 -05:00
vexed a2b721183d Fix message for Challenges. 2013-11-19 02:28:06 -05:00
vexed 7827f6bcd4 Fix the explosion effect for the Super Transporter 
refs: e3279f6d03
 2013-11-19 02:19:58 -05:00
vexed 9bb57850c6 Fix Transporter types to take the same multiplier of damage as VTOLs 
when on ground.

refs: e3279f6d03
 2013-11-19 02:18:21 -05:00
vexed b9a136ac7a Revert: 
Fix the SuperTransport body type to be SUPER HEAVY, not HEAVY.
    Try harder not to have them be on top of each other (only in MultiPlayer games).
    Fix explosion type.
    Fix damage calculations when they are on the ground.
    Try to better balance the Super Transport, hitpoints now at 500, Armor types changed to 35 & 20 and make weapon MG1-VTOL instead of MG3-VTOL.

This reverts commit e3279f6d03.

Conflicts:
	src/droid.cpp
 2013-11-19 01:50:11 -05:00
vexed 0805e57c9a Revert "If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them." 
This reverts commit 75ede1da1d.
 2013-11-19 01:28:14 -05:00
Cyp 35745a79a3 Fix build with C++11 and/or Qt. 
"blah"PRIu64 was interpreted as a string literal, and wzDelay was missing.
 2013-11-17 20:06:02 +01:00
per 143c5dafff Reinitialize AI data and player names each time frontend is reloaded. This closes ticket:3994. 2013-11-17 16:02:07 +01:00
per f0bb142e45 Add workaround for null pointer reference bug on recycling in factory. Closes ticket:4035. 2013-11-17 15:18:46 +01:00
cybersphinx 4f5a7c3d2e Merge branch 'bugfixes' 
* bugfixes:
  Hungarian translation update by mtomi78.
  If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them.
 2013-11-16 03:57:25 +01:00
vexed 75ede1da1d If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them. 2013-11-15 20:34:43 -05:00
vexed fdc3b7d4cb Fix capacity clobber. 
refs:4458c8b2edece39175bda25ecf8ac84c2633feca
 2013-11-14 22:26:19 -05:00
vexed c142724c2a Merge branch 'bugfixes' 
Conflicts:
	src/template.cpp
 2013-11-14 21:14:26 -05:00