Changesets: spring
develop 61d07311
Timestamp: 2012-06-27 14:25:39 Author: rt [ Details ] [ Diff ] |
minor | ||
mod - rts/Rendering/Env/BasicWater.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Env/BasicWater.h | [ Diff ] [ File ] | ||
develop ebb42f55
Timestamp: 2012-06-27 14:07:28 Author: rt [ Details ] [ Diff ] |
Merge branch 'release' into develop | ||
mod - rts/Rendering/Env/BasicWater.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Env/BasicWater.h | [ Diff ] [ File ] | ||
develop 9de822de
Timestamp: 2012-06-27 14:04:21 Author: rt [ Details ] [ Diff ] |
change content-exception in BasicWater to a warning message | ||
mod - rts/Rendering/Env/BasicWater.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Env/BasicWater.h | [ Diff ] [ File ] | ||
develop 2a520970
Timestamp: 2012-06-27 13:32:25 Author: abma [ Details ] [ Diff ] |
Merge remote-tracking branch 'origin/release' into develop | ||
mod - CMakeLists.txt | [ Diff ] [ File ] | ||
mod - buildbot/master/master.cfg | [ Diff ] [ File ] | ||
mod - cont/LuaUI/widgets.lua | [ Diff ] [ File ] | ||
mod - doc/changelog.txt | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/FPSUnitController.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameVersion.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Player.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/KeyAutoBinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/QuitBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/ShareBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaCallInCheck.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/ReadMap.cpp | [ Diff ] [ File ] | ||
mod - rts/Menu/SelectMenu.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Textures/S3OTextureHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/VerticalSync.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/BuildInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/AirCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/BeamLaser.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/Weapon.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/WeaponDef.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Weapons/WeaponLoader.cpp | [ Diff ] [ File ] | ||
mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Misc/RectangleOptimizer.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Misc/RectangleOptimizer.h | [ Diff ] [ File ] | ||
mod - rts/System/Rectangle.h | [ Diff ] [ File ] | ||
mod - rts/System/Sound/AudioChannel.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Sound/Sound.cpp | [ Diff ] [ File ] | ||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
mod - rts/System/TimeProfiler.cpp | [ Diff ] [ File ] | ||
mod - rts/build/cmake/TestCXXFlags.cmake | [ Diff ] [ File ] | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop 8dbbf229
Timestamp: 2012-06-27 13:30:21 Author: abma [ Details ] [ Diff ] |
update buildbot master config (add slave & run tests on win32 slave) | ||
mod - buildbot/master/master.cfg | [ Diff ] [ File ] | ||
develop f9b5e7cc
Timestamp: 2012-06-27 12:57:32 Author: abma [ Details ] [ Diff ] |
try to fix "dll not found" 0000004 | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop ac37ee0a
Timestamp: 2012-06-27 12:49:10 Author: abma [ Details ] [ Diff ] |
try to fix "dll not found" 0000003 | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop dab33748
Timestamp: 2012-06-27 12:31:44 Author: abma [ Details ] [ Diff ] |
try to fix "dll not found" #2 | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop 26c990f5
Timestamp: 2012-06-27 11:54:45 Author: abma [ Details ] [ Diff ] |
try to fix "dll not found" on win32 buildslave | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop 21efdcf3
Timestamp: 2012-06-27 03:27:24 Author: jK [ Details ] [ Diff ] |
Lua: make GetUnitHealth set buildProgress param if ud->hideDamage as the mantis ticket recommends (addition to 97bad98c43) | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
develop 5032e216
Timestamp: 2012-06-27 02:09:23 Author: abma [ Details ] [ Diff ] |
add "make check" -> verbose output for failed tests | ||
mod - buildbot/master/master.cfg | [ Diff ] [ File ] | ||
mod - test/CMakeLists.txt | [ Diff ] [ File ] | ||
develop 6e0072f0
Timestamp: 2012-06-27 01:35:11 Author: abma [ Details ] [ Diff ] |
add "Dedicated" to version string for spring-dedicated | ||
mod - rts/Game/GameVersion.cpp | [ Diff ] [ File ] | ||
develop 97bad98c
Timestamp: 2012-06-27 00:07:12 Author: rt [ Details ] [ Diff ] |
fix 1843 | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
develop 9d2a6d64
Timestamp: 2012-06-26 17:40:03 Author: zerver [ Details ] [ Diff ] |
Fix mantis 0002290 (keys hang after luaui tweakmode) | ||
mod - cont/LuaUI/widgets.lua | [ Diff ] [ File ] | ||
develop 5522bcea
Timestamp: 2012-06-26 16:48:39 Author: rt [ Details ] [ Diff ] |
redundancy--; | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
develop 6abdfa41
Timestamp: 2012-06-26 16:15:25 Author: zerver [ Details ] [ Diff ] |
Macroify all remaining luaContextData accesses | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.h | [ Diff ] [ File ] | ||
develop eb037de6
Timestamp: 2012-06-26 16:10:01 Author: zerver [ Details ] [ Diff ] |
Attempt to fix SetRunning/IsRunning for dual states | ||
mod - rts/Game/UI/KeyAutoBinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop 80ca4c70
Timestamp: 2012-06-26 11:50:57 Author: rt [ Details ] [ Diff ] |
simplify #2: refactor Unit::SetAttackTarget into Unit::Attack{Unit,Ground} | ||
mod - rts/Sim/Units/CommandAI/AirCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | ||
develop f80f3330
Timestamp: 2012-06-25 19:23:56 Author: rt [ Details ] [ Diff ] |
simplify | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
develop 34d607ed
Timestamp: 2012-06-25 18:49:30 Author: rt [ Details ] [ Diff ] |
semi-restore old hovering/circling behavior for construction aircraft (because the new looks stupid) | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.h | [ Diff ] [ File ] | ||
develop 9a0e16f4
Timestamp: 2012-06-25 17:57:36 Author: zerver [ Details ] [ Diff ] |
Fix mantis 0002904 (Keys are still "stuck" on alt tab) | ||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
develop 0f00c342
Timestamp: 2012-06-25 17:36:44 Author: rt [ Details ] [ Diff ] |
fix SEGV in MobileCAI::IdleCheck | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | ||
develop ea002e9c
Timestamp: 2012-06-25 16:57:55 Author: rt [ Details ] [ Diff ] |
fix queued orders (w.t.f.) | ||
mod - rts/Sim/Units/BuildInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | ||
develop ca31456c
Timestamp: 2012-06-25 16:27:38 Author: rt [ Details ] [ Diff ] |
- | ||
mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | ||
develop 3e4de838
Timestamp: 2012-06-25 15:16:41 Author: rt [ Details ] [ Diff ] |
TODO--; | ||
mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | ||