Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: d697c42d9cfde492fbcf4bef6a02676a9308b6d0
https://github.com/Warzone2100/warzone2100/commit/d697c42d9cfde492fbcf4bef6a02676a9308b6d0
Author: Cyp <[email protected]>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M src/display3d.cpp
Log Message:
-----------
"Fix" object selection bounding boxes and clicking on terrain, by scaling by
a random factor.
This shouldn't work, but works in the sense that two wrongs make a right, two
bugs make a feature.
Commit: 691df6a1837cec65fe7ac4e924c96868df2b749d
https://github.com/Warzone2100/warzone2100/commit/691df6a1837cec65fe7ac4e924c96868df2b749d
Author: safety0ff <[email protected]>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M src/clparse.cpp
M src/configuration.cpp
M src/frontend.cpp
M src/frontend.h
M src/main.cpp
M src/warzoneconfig.cpp
M src/warzoneconfig.h
Log Message:
-----------
Add shader toggle UI.
Commit: 15c04ab10f87de89ca7dcae2813834bd1a03247b
https://github.com/Warzone2100/warzone2100/commit/15c04ab10f87de89ca7dcae2813834bd1a03247b
Author: Cyp <[email protected]>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/framework/file.h
M lib/framework/frame.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/configuration.cpp
M src/game.cpp
M src/init.cpp
M src/levels.cpp
M src/levels.h
M src/main.cpp
M src/main.h
M src/multiint.cpp
M src/multimenu.cpp
M src/multimenu.h
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
Log Message:
-----------
Handle different maps with identical names, instead of a desynch.
Fixes ticket:3531 and ticket:3180.
Commit: 769fccc22001dc94a0f243c533185c7ab9676640
https://github.com/Warzone2100/warzone2100/commit/769fccc22001dc94a0f243c533185c7ab9676640
Author: Cyp <[email protected]>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: 205609302755ec151d4768da6cdcefe768059fb1
https://github.com/Warzone2100/warzone2100/commit/205609302755ec151d4768da6cdcefe768059fb1
Author: vexed <[email protected]>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M src/init.cpp
Log Message:
-----------
Don't convert to a platform specific string here, it causes bad things to
happen.
"const char * PHYSFS_getRealDir ( const char * filename
)
Figure out where in the search path a file resides.
The file is specified in platform-independent notation. "
Commit: 5c1e204e78bba98585336cc2eae93e1ad3d302ec
https://github.com/Warzone2100/warzone2100/commit/5c1e204e78bba98585336cc2eae93e1ad3d302ec
Author: Cyp <[email protected]>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ChangeLog
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/framework/file.h
M lib/framework/frame.cpp
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/clparse.cpp
M src/configuration.cpp
M src/display3d.cpp
M src/frontend.cpp
M src/frontend.h
M src/game.cpp
M src/init.cpp
M src/levels.cpp
M src/levels.h
M src/main.cpp
M src/main.h
M src/multiint.cpp
M src/multimenu.cpp
M src/multimenu.h
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
M src/warzoneconfig.cpp
M src/warzoneconfig.h
Log Message:
-----------
Merge branches 'screenscalehack' and 'bugfixes' into 3.1
Conflicts with 'bugfixes':
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/clparse.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/02395b3f0258...5c1e204e78bb
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
