Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: spring/spring
...
head fork: spring/spring
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Oct 15, 2010
@hoijui hoijui post release version bump dc33c4c
@hoijui hoijui update change-log [minor] 4fedbe6
@hoijui hoijui fix dedicated binary name (thanks bibim) [CMake] [fix] 20d7ecc
Commits on Oct 25, 2010
@hoijui hoijui also give S3O model name in error message when a texture is missing […
…mantis#2178]
c77b00a
@tvo tvo buildbot: stacktrace translator: 3 fixes
- regex to capture module address matched `(symbolName+offset)' too
- regex to find files with debugging data didn't match any of the spring-*.exe
- work around a bug in Spring 0.82.6 and 0.82.6.1 that subtracts 0x400000 from
  all addresses (it should only subtract from DLL addresses)
7b4de9f
@hoijui hoijui addr2line needs the absolute address for `*.exe`, but the relative on…
…e for `*.dll` [fix]
3cec7e7
@abma abma print name of loaded widget before it loads to infolog.txt
 * this allows easier identifying broken widgets (for example. area-mex hangs on map pornstar and doesn't output anything)
f075040
@hoijui hoijui adjust log message [minor] 53c6ed4
@zerver zerver Attempt to fix mantis #2181 [crash due to invalid lastAttacker] b31898b
@hoijui hoijui AAI: add version independent config file (by azaremoth) for _The Curs…
…ed_ game [AI]

Made for _The Cursed beta 0.22_, may need adjusting in the future.
3605ff0
kloot fix units-stuck-behind-terrain (#2188) 607c44d
kloot make waypointDir a GMT member c8924f2
@hoijui hoijui Revert "Revert "KAIK: enable threatmap visualisation (original commit…
… by Kloot) [AI]""

This reverts commit e226a77.
06644fc
kloot KAIK: fix infinite loop 524cd31
@hoijui hoijui KAIK: compile fix for 64bit [fix] 1202f66
@hoijui hoijui * remove unused GroundMoveType functions
Conflicts:

	rts/Sim/MoveTypes/GroundMoveType.cpp
	rts/Sim/Path/Default/PathConstants.h
	rts/Sim/Path/Default/PathManager.cpp
	rts/Sim/Path/Default/PathManager.h
	rts/Sim/Path/IPathManager.h
237c377
kloot fix Godde-III 8b60da2
Commits on Oct 26, 2010
kloot do not assign extra waypoints to aircraft 2c5ebb9
kloot decrease ETA-failure response time c26d040
Commits on Oct 27, 2010
kloot keep speed above UnitDef::turnInPlaceSpeedLimit when turning (if turn…
…InPlace==0)
872d999
Commits on Oct 29, 2010
kloot fix units slowing down on negative slopes 131766b
kloot set a more reasonable default turnInPlaceSpeedLimit 071d382
Commits on Nov 02, 2010
kloot KAIK: clamp costs to 1.0, not to 0.0 036dda7
@hoijui hoijui don't bind a UDP socket for local games (allows multiple local instan…
…ces again sans hassle)

Conflicts:

	rts/Game/GameServer.cpp
5ee697c
@hoijui hoijui implement Lua's GameFrame event via the EventHandler
Conflicts:

	rts/Game/Game.cpp
	rts/Lua/LuaHandle.h
	rts/System/EventClient.cpp
	rts/System/EventClient.h
	rts/System/EventHandler.cpp
	rts/System/EventHandler.h
27ac6a5
-jk- fix global enviroment pollution in luaui.lua eec3516
-jk- Lua: allow Spring.AssignMouseCursor & Spring.ReplaceMouseCursor from …
…LuaRules, too
1aa1d3b
-jk- fix argument name in CSmfMapFile (mapname -> mapFileName) 3be0661
@FLOZi FLOZi * Allow loading from subfolders for weapondef files (tdf and lua)
-- as already implemented for unitdefs and featuredefs
5ef6c17
Commits on Nov 07, 2010
@hoijui hoijui make CBitmap::ReverseYAxis() more efficient 4b2a544
@hoijui hoijui prevent memory-leak in LoadGrayscale() if there already was pixel-dat…
…a [fix]
808c0bb
@hoijui hoijui prevent empty content_error messages
Conflicts:

	rts/Game/Game.cpp
	rts/Rendering/Env/AdvSky.cpp
574d32a
@hoijui hoijui correct `AllowResourceTransfer` params in default gadget handler (cre…
…dits to quantum) [mantis#2210] [fix]
cdec804
Commits on Nov 10, 2010
@abma abma fix [2215](http://springrts.com/mantis/view.php?id=2215) 3325583
Commits on Nov 11, 2010
@hoijui hoijui add missing include [fix] 1baeb7a
Commits on Nov 12, 2010
@hoijui hoijui fix some memory-leaks [fix]
Conflicts:

	rts/Game/Game.cpp
8fa0a4e
kloot KAIK: fix memory corruption (one-character-typo...) fc3048f
@hoijui hoijui spring-headless: crash fix and remove of "jump depending on uninitial…
…ized value" [fix]

Conflicts:

	rts/Rendering/Textures/Bitmap.h
213fcac
@hoijui hoijui LegacyCpp-AIWrapper: fix some memory leaks [fix] [AI]
Conflicts:

	AI/Wrappers/LegacyCpp/AIAICallback.cpp
	AI/Wrappers/LegacyCpp/AIAICallback.h
7ec1187
@hoijui hoijui KAIK: do not access invalidated pointer [fix] [AI] e41da63
@hoijui hoijui KAIK: init value before use [fix] [AI] 55a19d8
@hoijui hoijui KAIK: add a range check & minor change [AI] 5da721c
@hoijui hoijui PFS: remove circular constraint from run-time searches
Conflicts:

	rts/Sim/Path/Default/PathFinderDef.cpp
	rts/Sim/Path/PathFinder.cpp
c8e2203
@hoijui hoijui KAIK: prevent accessing of array at position -1 [fix] [AI] d719ced
@hoijui hoijui Revert "PFS: remove circular constraint from run-time searches"
This reverts commit c8e2203.
79c95f5
Commits on Nov 16, 2010
@hoijui hoijui fix BeamLaser damage after 87a01b2; remove excess elements from Basic…
…MapDamage::craterTable

Conflicts:

	rts/Map/BasicMapDamage.cpp
	rts/Sim/Weapons/BeamLaser.cpp
e11917b
kloot s/0.0/0.001 b447b23
Commits on Nov 22, 2010
@hoijui hoijui require GLEW 1.5.1+ [CMake] [fix]
because 1.5.0 does not have `glMapBufferRange`
473c70e
@hoijui hoijui Do not check for .Net when installing Zero-K
The installed Zero-K.exe (setup) will check for the required .Net version its self.
ff5a5c7
@hoijui hoijui catch model content_error exceptions ASAP (#2208)
Conflicts:

	rts/Rendering/Models/3DModel.cpp
	rts/Rendering/Models/IModelParser.cpp
79f3bd2
kloot fix SetUnitRotation (#2222) f165b69
kloot unify stdout/infolog output (#2205) 7c4aa51
@hoijui hoijui builds other then dedicated-server may be controlled through the AH i…
…nterface as well (for example headless)

Conflicts:

	rts/Game/GameServer.cpp
de0b4ee
Ryan Hileman added parameter includeSky to TraceScreenRay
includeSky is a boolean
when enabled it returns coordinates even if they're super far in the distance, with the type "sky"
4a0acad
@hoijui hoijui make AH command `paused` use a parameter (0|1)
If no parameter is given, it still acts like it did until now. -> toggling
fda5397
@hoijui hoijui prevent equal unsynced random seeds [mantis#2225]
Do not initialize CGlobalUnsynced::usRandSeed based on SDL_GetTicks() only.
cca93cb
@hoijui hoijui fix compile error introduced during cherry-pick d341cfa
Commits on Nov 23, 2010
kloot backport master/Path/Default to 0.82-branch/Path/ (for 4fa5a62 et all) 967a893
kloot backport master/87a01b2 and master/33c1c35 to 0.82-branch e927b5a
kloot fix #2194 (dangling CUnit*) 6febaa7
Commits on Nov 24, 2010
kloot KAIK: convert assertion to log-warning 2da74a8
@hoijui hoijui change-log update (for 0.82.7) a0472a4
Commits on Dec 06, 2010
kloot backport master/b038be60 and master/f192e149 4f7129a
Commits on Dec 07, 2010
@zerver zerver Don't crash on shader compilation error 96700c3
@abma abma (installer) delete all files we installed c0bcf5a
kloot fix cannon visuals (#2145) f68d0a1
@abma abma (installer) don't check for an running Zero-K.exe when running silent 800ce33
-jk- 'using namespace xyz;' should always be AFTER the #includes's 70933fa
-jk- fix crash in 3DO Parser
always set shared pointer to NULL after free'ing to prevent deleting memory twice
a1d2777
@hoijui hoijui cleanup myMath.h (add .inl) and 3 new functions
std::pair<float,float> GetMapBoundaryIntersectionPoints(const float3& start, const float3& dir);
bool ClampLineInMap(float3& start, float3& end);
bool ClampRayInMap(const float3& start, float3& end);

Conflicts:

	rts/System/myMath.h
689d29e
@hoijui hoijui fix bug in CGround::TrajectoryGroundCol with outside map coordinations
clamping a line/ray is NOT the same as clamping the x&z coords of a point on it!
b4a9aec
@hoijui hoijui Enemy units respond to (construction) bugger off [mantis#2242] [fix] e7ae8b1
@hoijui hoijui enhance error messages (requested by FLOZi) 731ae55
@hoijui hoijui remove SIGSEGV in demotool [fix] 3954620
@hoijui hoijui adjustments in demotool [minor] 0ab22cd
Commits on Dec 08, 2010
@abma abma (minor) rename mod to game in default menu 64592db
@hoijui hoijui Fix zombie builder after being attacked just at start of construction…
…, before getting into build stance

Conflicts:

	rts/Sim/Units/UnitTypes/Builder.cpp
c8ac522
@hoijui hoijui Tweak previous commit
Conflicts:

	rts/Sim/Units/CommandAI/BuilderCAI.cpp
2abcd08
kloot fix infinite recursion (#2239) caused by e1ec8a1
you CANNOT call a CommandAI SlowUpdate member from any random place in the code!
8c5ea82
@hoijui hoijui update the changelog [minor] f81067b
Commits on Dec 21, 2010
@abma abma add "games" to scanDirs (partly fix #2248) b8e2b8b
@hoijui hoijui implement #2255 (host-definable IP's)
Conflicts:

	rts/Game/GameServer.cpp
22ab6f3
kloot swap dd9dcf2
kloot fix build-order drawing for OBJ models 135d429
@hoijui hoijui archive-scanner better message on missing archive cache & white-space…
… fix
3eaf271
@abma abma don't save/restore minimized windows state in win32 (fix #1537) a3d0c0c
kloot set a more reasonable turnInPlaceSpeedLimit (again) bb58a83
kloot restore license referral that got lost 3c3d934
@hoijui hoijui update THANKS [minor] a021378
@abma abma (installer) create+rdmir $INSTDIR\games instead of \mods 1a3e0d9
@hoijui hoijui (installer) re-added deprecated directories, slightly adjust descript…
…ions

Conflicts:

	installer/sections/main.nsh
58f05cb
kloot fix #2196 (crash when invalid CEG is loaded) 79f934c
Commits on Dec 28, 2010
kloot convert two more non-fatal CEG errors to warnings 8ed322c
@hoijui hoijui slightly improve warning-message for missing 3DO textures
Conflicts:

	rts/Rendering/Models/3DOParser.cpp
	rts/Rendering/Textures/3DOTextureHandler.cpp
ea3596e
kloot properly ignore non-blocking objects during collisions ef74dda
@hoijui hoijui KAIK: mid-game init fix [AI] [fix] 631be0a
@hoijui hoijui typo (thanks to slogic) [fix] 9e615bc
@abma abma (content) replace 63x63 images with 64x64 images in cont/LuaUI/Icons/ 2c71c12
@abma abma (content) fix last commit: made icons in cont/LuaUI/Icons/ transparen…
…t again
052699c
kloot fix occasionally strange wake SFX bf64fe2
FLOZi * New parameter for LuaSyncedCtrl::SetUnitArmored
-- Allows setting of the armor multiple
* Corresponding new return value for LuaSyncedRead::GetUnitArmored
* Make SetUnitArmored update unit->curArmorMultiple
-- I believe without this the function was not infact working correctly,
compare with CUnitScript::SetUnitVal (~line 1485)
28b40e9
kloot s/sxfType/sfxType (thanks abma) 8971416
@hoijui hoijui do not use `AUX_SOURCE_DIRECTORY(...)` in streflop build script [CMake] 496595f
@hoijui hoijui add NSIS 7zip plugin & NSIS plugin README [installer] e14ae93
@hoijui hoijui add Tobis rapid client [installer]
* adds about 6.5MB to installer size
* installs to installDir/rapid/
* creates a Start-menu short-cut to rapid-gui.exe

Conflicts:
	installer/sections/sectiondesc.nsh
4ebb01b
@hoijui hoijui correct shortcut location (credits to abma) [installer] [fix] 1dc8dbd
@slogic slogic RAI: Made compatible with MSVC 1bf771c
@slogic slogic RAI: Adjusted due to GetMapName() no more returns file extension 66d4133
@hoijui hoijui RAI: Fixed AI considering water as harmful; adjusted due to GetMapNam…
…e() returns no more extension; fixed improper added hash part in archive filename (when AI is looking for .smd file to get extra map info)

Conflicts:

	AI/Skirmish/RAI/GTerrainMap.cpp
836d068
@slogic slogic RAI: Removed old MSVC project file; added actual one 76bd52f
@slogic slogic LegacyCpp-AIWrapper: Fixed warning & possible linker errors under MSVC 4174382
@hoijui hoijui change minimum for UnitDef.buildDistance from 128 to 16 [mantis#2151]
This reverts commit 7fc8a2b.
b521a44
@hoijui hoijui adjust buildDistance minimum and default values (thanks to experiment…
…al findings by bobthedinosaur and FLOZi)
f1e30e3
@hoijui hoijui RAI: Fixed building non suitable buildings on certain maps (e.g. Vehi…
…cle Plant on water map Blue Comet v2)

Conflicts:

	AI/Skirmish/RAI/UnitDefHandler.cpp
fefc2ca
@hoijui hoijui cleaner initialization for float3 internal map size (thanks slogic)
This also checks against other binaries, like (Legacy C++) AIs,
using these functions, when the required values are still uninitialized.

Conflicts:

	rts/System/float3.cpp
4cad507
@hoijui hoijui E323AI: bump to latest version (3.25.0) - lots of changes! [AI] c1e5cb1
@hoijui hoijui RAI: prevent crashes at end of game [AI] [fix] 9253ef4
@hoijui hoijui update change-log [minor] f7c950c
@hoijui hoijui dedicated-server compile error [fix] 172334e
Commits on Dec 29, 2010
@hoijui hoijui add utility method to Socket `bool IsLoopbackAddress(addr)` 93cb2fe
@hoijui hoijui encapsulate `ip::address::from_string(str)` + restore-FPU into `WrapI…
…P(str)`
bc485d8
@hoijui hoijui encapsulate `resolver.resolve(query)` + restore-FPU into `WrapResolve…
…(...)`
f84ba96
@hoijui hoijui re-fracture `UDPListener::TryBindSocket(...)` for better support of s…
…pecial cases

Which include:
* IP v6 requested, but not supported by the system
* loopback/localhost address specified (127.0.0.1 or ::)
* invalid IP address specified
* more error handling and logging
809f33d
@hoijui hoijui Revert "fix infinite recursion (#2239) caused by e1ec8a1"
This reverts commit 8c5ea82.
c03f3b8
@hoijui hoijui Revert "Tweak previous commit"
This reverts commit 2abcd08.
72ca7b0
@hoijui hoijui Revert "Fix zombie builder after being attacked just at start of cons…
…truction, before getting into build stance"

This reverts commit c8ac522.
fca9010
@hoijui hoijui update change-log [minor] e96e98c
Commits on Jan 01, 2011
@BrainDamage BrainDamage broadcast team died events to all players, so it's stored in demo file
Conflicts:

	rts/Game/GameServer.cpp
	rts/Game/NetCommands.cpp
2cb4836
@BrainDamage BrainDamage removed register/unregister netmsg 34df269
@BrainDamage BrainDamage typo fix b87107e
@hoijui hoijui update change-log [minor] 2e9c098
Commits on Jan 02, 2011
@renemilk renemilk unitsync: adds a third (bool) paramter to Init to allow disabling of …
…logging subsystem

default value is true, ensuring same behaviour as before for clients unaware of this change
a2afdcd
@renemilk renemilk logging: allow disabling of all subsystem by setting SPRING_LOG_SUBSY…
…STEMS=none
a218780
@hoijui hoijui inform the user about how to disable log sub-systems [minor] a6a6d08
@hoijui hoijui bump version to 0.82.7 0339939