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

12728 Commits (master)

Author SHA1 Message Date
vexed 8423d90a72 Tell autohell to ignore our lone autorevision.cache file on make distcheck 
results:

======================================================
warzone2100-bugfixes archives ready for distribution:
warzone2100-bugfixes.tar.xz
======================================================
 2013-12-04 00:27:17 -05:00
vexed 564a8e9225 Remove odd characters at the begining. 
Odd, since it was a straight copy.

Complaint by BuildBot.

refs ticket:4130
 2013-12-03 22:55:32 -05:00
vexed 4868883811 Update Hungarian translation by mtomi78 
closes ticket:4130

Note: please use the actual po name of hu.po, not hungarian.po
 2013-12-03 20:58:04 -05:00
vexed 4f37b25b91 Update Spanish Translation by Saberuneko 
closes ticket:4137
 2013-12-03 20:58:03 -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
automerge b513f163aa Merge branch 'bugfixes' 2013-12-02 08:00:32 +01:00
per 32318037d9 Do not use WZ_DECL_THREAD on MacOSX. This makes WZ_DECL_THREAD not worth in general for now. 2013-12-01 23:52:46 +01:00
per 87e5e9074c Add unit test to prevent new dependencies from lib/framework to src/ from being added undetected. 2013-12-01 23:52:46 +01:00
per 1f5432d81c Updated textures by Christian Scholz (cnceo) 2013-12-01 20:30:42 +01:00
dak180 6c90f4a38e Remove deleted files from the mac build. 2013-12-01 09:43:36 -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
cybersphinx 59592bc4df Update translations. 2013-11-29 18:40:55 +01:00
cybersphinx 82d77b700c Italian translation update by Alpha93. 
Closes #4121.
 2013-11-29 18:40:21 +01:00
cybersphinx 7e866083c1 Hungarian translation update by mtomi78. 
Closes #4120.
 2013-11-29 18:39:50 +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
haoNoQ e49031843d Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 
Conflicts:
	data/mp/stats/research/multiplayer/prresearch.txt
 2013-11-25 21:50:00 +04:00
vexed 932c0da57f Update changelog for 3.1.1 RC3 2013-11-23 20:04:30 -05:00
haoNoQ 109ee4d7b9 Change laser pre-requisites: Flashlight now requires sensor upgrade Mk2, while Pulse Laser still requires sensor upgrade Mk3. 2013-11-23 22:25:16 +04: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
cybersphinx 38b65aa26a Update translations. 2013-11-20 19:05:17 +01:00
cybersphinx a31930ed1d French translation update by machintruc. 
Closes #4113.
 2013-11-20 19:04:37 +01:00
cybersphinx a2d4952dda Hungarian translation update by mtomi78. 
Closes #4117.
 2013-11-20 19:02:15 +01: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 65114c6dd9 Update Changelog 
(resync from RC2)

(cherry picked from commit 64e8f0e1461be2c41d6020ebbeaacf3ee191d71f)

Conflicts:
	ChangeLog
 2013-11-19 21:36:56 -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 d5ac23a267 Try to better balance Super Transport Hitpoints now at 500, 
Armor types changed to 35 & 20 and make weapon MG1-VTOL instead of MG3-VTOL

refs: e3279f6d03
 2013-11-19 02:13:46 -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
vexed 6e5e8bdd09 Fix false positive in the Coverity static analysis tool. 
The array will never be MAX_PLAYERS (11) and overrun it, since the loop goes
up to indexLen which is < MAX_PLAYERS.

This fixes a rash of asserts of 'Found no player position for player X' where
X is missing because of the false positive above, which cut the array short.

refs: cea585162d
 2013-11-18 21:56:28 -05:00
vexed fb1f90dd27 Keep a copy of our log filename that we use to work around an obscure bug(?) 
in compiler flags (windows (mingw) only).

Should now correctly show the log filename on crashes in the dialog.
 2013-11-18 21:54:48 -05:00
Cyp aafca35a73 Remove unused file multiplay/maps/4c-rush/templ.bjo. 2013-11-18 21:31:11 +01:00
dak180 a3468b1a00 Make sure tar does not make `._` files. 2013-11-17 15:09:29 -05:00