2025-08-11 06:05 CEST

Changesets: spring

Search ] Browse ] Back to Index ]
develop 553bbc8f
Timestamp: 2009-02-12 21:59:14
Author: hoijui
Details ] Diff ]
build: scons: fix AI Interfaces and Skirmish AI building -> no object files in the source tree anymore; additional fixes for Java Skirmish AIs
mod - AI/SConscript Diff ] File ]
mod - rts/build/scons/filelist.py Diff ] File ]
develop 9c096f6d
Timestamp: 2009-02-12 17:41:23
Author: Karl-Robert Ernst
Details ] Diff ]
sound: fix wrong pitch
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/Sound/SoundSource.cpp Diff ] File ]
develop 562f40a1
Timestamp: 2009-02-12 17:09:21
Author: hoijui
Details ] Diff ]
build: scons: install AI Interfaces and Skirmish AIs in the right place
mod - SConstruct Diff ] File ]
develop ef9c3c73
Timestamp: 2009-02-12 16:51:15
Author: Karl-Robert Ernst
Details ] Diff ]
sound: fix weapons not playing at all
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/Sound/SoundSource.cpp Diff ] File ]
mod - rts/System/Sound/SoundSource.h Diff ] File ]
develop 67373cdd
Timestamp: 2009-02-12 16:40:05
Author: hoijui
Details ] Diff ]
Merge commit 'origin/master' into caiinterface

Conflicts:

rts/Sim/Units/Unit.cpp
mod - installer/make_gamedata_arch.bat Diff ] File ]
mod - installer/make_gamedata_arch.sh Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.h Diff ] File ]
develop d5493b2f
Timestamp: 2009-02-12 14:49:21
Author: hoijui
Details ] Diff ]
build: cmake: fix for compiling with multiple threads
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
develop 43aefe2b
Timestamp: 2009-02-12 13:26:39
Author: hoijui
Details ] Diff ]
build: scons: fix for AI Interfaces that use streflop
mod - SConstruct Diff ] File ]
develop ab5e6118
Timestamp: 2009-02-12 13:11:44
Author: hoijui
Details ] Diff ]
Merge commit 'origin/master' into caiinterface

Conflicts:

AI/CMakeLists.txt
SConstruct
rts/ExternalAI/GlobalAI.cpp
rts/build/scons/config.py
rts/build/vstudio8/rts.vcproj
tools/unitsync/unitsync.cpp
mod - CMakeLists.txt Diff ] File ]
mod - Documentation/cmds.txt Diff ] File ]
mod - SConstruct Diff ] File ]
mod - game/LuaUI/widgets.lua Diff ] File ]
mod - installer/builddata/springcontent/EngineOptions.lua Diff ] File ]
add - installer/builddata/springcontent/gamedata/sounds.lua Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
mod - installer/sections/shortcuts.nsh Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/GroupHandler.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h Diff ] File ]
mod - rts/Game/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameServer.cpp Diff ] File ]
mod - rts/Game/GameServer.h Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
add - rts/Game/OSCStatsSender.cpp Diff ] File ]
add - rts/Game/OSCStatsSender.h Diff ] File ]
mod - rts/Game/Player.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectMenu.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.h Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaMaterial.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaParser.h Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.h Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/s3oParser.cpp Diff ] File ]
rm - rts/Sim/Misc/ModSound.cpp Diff ] File ]
rm - rts/Sim/Misc/ModSound.h Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/PathManager.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FireProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobFile.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/UnitDef.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp Diff ] File ]
mod - rts/Sim/Weapons/BeamLaser.cpp Diff ] File ]
mod - rts/Sim/Weapons/BeamLaser.h Diff ] File ]
mod - rts/Sim/Weapons/Cannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/Cannon.h Diff ] File ]
mod - rts/Sim/Weapons/DGunWeapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/DGunWeapon.h Diff ] File ]
mod - rts/Sim/Weapons/EmgCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/EmgCannon.h Diff ] File ]
mod - rts/Sim/Weapons/FlameThrower.cpp Diff ] File ]
mod - rts/Sim/Weapons/FlameThrower.h Diff ] File ]
mod - rts/Sim/Weapons/LaserCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/LaserCannon.h Diff ] File ]
mod - rts/Sim/Weapons/LightningCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/LightningCannon.h Diff ] File ]
mod - rts/Sim/Weapons/MeleeWeapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/MeleeWeapon.h Diff ] File ]
mod - rts/Sim/Weapons/MissileLauncher.cpp Diff ] File ]
mod - rts/Sim/Weapons/MissileLauncher.h Diff ] File ]
mod - rts/Sim/Weapons/NoWeapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/NoWeapon.h Diff ] File ]
mod - rts/Sim/Weapons/PlasmaRepulser.h Diff ] File ]
mod - rts/Sim/Weapons/Rifle.cpp Diff ] File ]
mod - rts/Sim/Weapons/Rifle.h Diff ] File ]
mod - rts/Sim/Weapons/StarburstLauncher.cpp Diff ] File ]
mod - rts/Sim/Weapons/StarburstLauncher.h Diff ] File ]
mod - rts/Sim/Weapons/TorpedoLauncher.cpp Diff ] File ]
mod - rts/Sim/Weapons/TorpedoLauncher.h Diff ] File ]
mod - rts/Sim/Weapons/Weapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/Weapon.h Diff ] File ]
mod - rts/Sim/Weapons/WeaponDefHandler.cpp Diff ] File ]
mod - rts/Sim/Weapons/bombdropper.cpp Diff ] File ]
mod - rts/Sim/Weapons/bombdropper.h Diff ] File ]
mod - rts/System/DemoRecorder.cpp Diff ] File ]
mod - rts/System/EventClient.cpp Diff ] File ]
mod - rts/System/EventClient.h Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/EventHandler.h Diff ] File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/LogOutput.h Diff ] File ]
mod - rts/System/Net/Socket.cpp Diff ] File ]
mod - rts/System/Net/Socket.h Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]
rm - rts/System/Platform/Linux/OpenALSound.cpp Diff ] File ]
rm - rts/System/Platform/Linux/OpenALSound.h Diff ] File ]
rm - rts/System/Platform/NullSound.h Diff ] File ]
rm - rts/System/Platform/Win/DxSound.cpp Diff ] File ]
rm - rts/System/Platform/Win/DxSound.h Diff ] File ]
rm - rts/System/Platform/Win/OggStream.cpp Diff ] File ]
rm - rts/System/Platform/Win/OggStream.h Diff ] File ]
mod - rts/System/Platform/errorhandler.h Diff ] File ]
rm - rts/System/Sound.cpp Diff ] File ]
rm - rts/System/Sound.h Diff ] File ]
add - rts/System/Sound/ALShared.h Diff ] File ]
add - rts/System/Sound/Sound.cpp Diff ] File ]
add - rts/System/Sound/Sound.h Diff ] File ]
add - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
add - rts/System/Sound/SoundBuffer.h Diff ] File ]
add - rts/System/Sound/SoundItem.cpp Diff ] File ]
add - rts/System/Sound/SoundItem.h Diff ] File ]
add - rts/System/Sound/SoundSource.cpp Diff ] File ]
add - rts/System/Sound/SoundSource.h Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/Sync/SyncDebugger.cpp Diff ] File ]
mod - rts/build/cmake/FindWin32Libs.cmake Diff ] File ]
mod - rts/build/scons/config.py Diff ] File ]
mod - rts/build/scons/filelist.py Diff ] File ]
mod - rts/build/scons/rts.py Diff ] File ]
mod - rts/build/vstudio8/rts.vcproj Diff ] File ]
mod - rts/lib/CMakeLists.txt Diff ] File ]
add - rts/lib/oscpack/LICENSE Diff ] File ]
add - rts/lib/oscpack/OscException.h Diff ] File ]
add - rts/lib/oscpack/OscHostEndianness.h Diff ] File ]
add - rts/lib/oscpack/OscOutboundPacketStream.cpp Diff ] File ]
add - rts/lib/oscpack/OscOutboundPacketStream.h Diff ] File ]
add - rts/lib/oscpack/OscTypes.cpp Diff ] File ]
add - rts/lib/oscpack/OscTypes.h Diff ] File ]
add - rts/lib/oscpack/README Diff ] File ]
add - tools/nedmalloc/License.txt Diff ] File ]
add - tools/nedmalloc/Readme.txt Diff ] File ]
add - tools/nedmalloc/SConscript Diff ] File ]
add - tools/nedmalloc/malloc.c.h Diff ] File ]
add - tools/nedmalloc/nedmalloc.c Diff ] File ]
add - tools/nedmalloc/nedmalloc.h Diff ] File ]
add - tools/nedmalloc/nedmalloc.sln Diff ] File ]
add - tools/nedmalloc/nedmalloc.vcproj Diff ] File ]
add - tools/nedmalloc/test.c Diff ] File ]
add - tools/nedmalloc/testlist.cpp Diff ] File ]
mod - tools/unitsync/CMakeLists.txt Diff ] File ]
mod - tools/unitsync/unitsync.cpp Diff ] File ]
develop d6100fc6
Timestamp: 2009-02-12 10:05:19
Author: hoijui
Details ] Diff ]
gitignore update: do not hide files in the source tree that should only be in the build dir
mod - .gitignore Diff ] File ]
develop 04ccbe82
Timestamp: 2009-02-12 10:05:11
Author: hoijui
Details ] Diff ]
build-sys: cmake: fix Java Skirmish AI archives install location
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
develop 8d6bb532
Timestamp: 2009-02-12 10:01:54
Author: hoijui
Details ] Diff ]
build-sys: cmake: fixes
* java compilation and archiving when cross-compiling
* make PATH_DELIM host, not target OS dependent
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - rts/build/cmake/FindJavaExtended.cmake Diff ] File ]
develop 5d26fa76
Timestamp: 2009-02-12 09:57:24
Author: hoijui
Details ] Diff ]
build-sys: scons: fixes
* builddir resolving if it starts with #
* java compilation and archiving
mod - AI/Interfaces/Java/bin/ant.properties Diff ] File ]
mod - AI/SConscript Diff ] File ]
mod - SConstruct Diff ] File ]
mod - rts/build/scons/filelist.py Diff ] File ]
mod - rts/build/scons/rts.py Diff ] File ]
develop 7ad00dc4
Timestamp: 2009-02-12 00:19:30
Author: Marek Baczynski
Details ] Diff ]
installer: fix base content generation on windows, too
mod - installer/make_gamedata_arch.bat Diff ] File ]
develop 89213007
Timestamp: 2009-02-12 00:15:10
Author: Marek Baczynski
Details ] Diff ]
installer: fix generation of base files (modinfo.tdf -> modinfo.lua)
mod - installer/make_gamedata_arch.sh Diff ] File ]
develop 05572caf
Timestamp: 2009-02-12 00:07:50
Author: Karl-Robert Ernst
Details ] Diff ]
move VorbisCallbacks to their own file
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
add - rts/System/Sound/VorbisShared.cpp Diff ] File ]
add - rts/System/Sound/VorbisShared.h Diff ] File ]
develop f54d51e5
Timestamp: 2009-02-12 00:02:54
Author: Marek Baczynski
Details ] Diff ]
Merge branch 'master' of git@github.com:spring/spring.git
mod - CMakeLists.txt Diff ] File ]
mod - installer/sections/main.nsh Diff ] File ]
mod - installer/sections/shortcuts.nsh Diff ] File ]
mod - rts/ExternalAI/GlobalAI.cpp Diff ] File ]
mod - rts/ExternalAI/GroupHandler.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.h Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/PathManager.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/UnitLoader.cpp Diff ] File ]
mod - rts/Sim/Weapons/Weapon.cpp Diff ] File ]
mod - rts/System/DemoRecorder.cpp Diff ] File ]
mod - rts/System/EventClient.cpp Diff ] File ]
mod - rts/System/EventClient.h Diff ] File ]
mod - rts/System/EventHandler.cpp Diff ] File ]
mod - rts/System/EventHandler.h Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/LogOutput.h Diff ] File ]
add - rts/System/Sound/ALShared.h Diff ] File ]
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/OggStream.h Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.h Diff ] File ]
mod - rts/System/Sound/SoundSource.cpp Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - tools/unitsync/unitsync.cpp Diff ] File ]
develop c6caee95
Timestamp: 2009-02-11 19:51:48
Author: Tobi Vollebregt
Details ] Diff ]
Pass the right team (newteam) to CGlobalAIHandler::UnitTaken
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
develop 98c7b5dc
Timestamp: 2009-02-11 14:45:04
Author: Karl-Robert Ernst
Details ] Diff ]
add ogg/vorbis support for regular SoundItems (simply write file = "something.ogg", can be loaded from VFS)
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.h Diff ] File ]
develop aac4c67d
Timestamp: 2009-02-11 00:13:50
Author: -jk-
Details ] Diff ]
line ending
mod - rts/Rendering/Textures/3DOTextureHandler.h Diff ] File ]
add - rts/build/scons/config.pyc Diff ] File ]
add - rts/build/scons/detect.pyc Diff ] File ]
add - rts/build/scons/filelist.pyc Diff ] File ]
add - rts/build/scons/gch.pyc Diff ] File ]
add - rts/build/scons/rts.pyc Diff ] File ]
mod - rts/lib/oscpack/LICENSE Diff ] File ]
mod - rts/lib/oscpack/OscException.h Diff ] File ]
mod - rts/lib/oscpack/OscHostEndianness.h Diff ] File ]
mod - rts/lib/oscpack/OscOutboundPacketStream.cpp Diff ] File ]
mod - rts/lib/oscpack/OscOutboundPacketStream.h Diff ] File ]
mod - rts/lib/oscpack/OscTypes.cpp Diff ] File ]
mod - rts/lib/oscpack/OscTypes.h Diff ] File ]
mod - rts/lib/oscpack/README Diff ] File ]
add - rts/lib/streflop/libm/flt-target Diff ] File ]
mod - tools/nedmalloc/malloc.c.h Diff ] File ]
develop b57f78f3
Timestamp: 2009-02-10 20:46:36
Author: Karl-Robert Ernst
Details ] Diff ]
sound: forgot to add new file
add - rts/System/Sound/ALShared.h Diff ] File ]
develop 33ba2212
Timestamp: 2009-02-10 20:45:43
Author: Karl-Robert Ernst
Details ] Diff ]
I am not supposed to pass a temporary for a non-const reference parameter
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/LogOutput.h Diff ] File ]
develop aacfadde
Timestamp: 2009-02-10 18:55:58
Author: Karl-Robert Ernst
Details ] Diff ]
sound: enable pitch adjust on default
mod - rts/Game/Game.cpp Diff ] File ]
develop 61fdf979
Timestamp: 2009-02-10 18:55:07
Author: Karl-Robert Ernst
Details ] Diff ]
sound: cleanup
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sound/SoundSource.cpp Diff ] File ]
develop 3f1d18bd
Timestamp: 2009-02-10 18:18:16
Author: Karl-Robert Ernst
Details ] Diff ]
cmake: check for boost >= 1.35
mod - CMakeLists.txt Diff ] File ]
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/OggStream.h Diff ] File ]
develop 1fc7c8f9
Timestamp: 2009-02-10 18:05:12
Author: Karl-Robert Ernst
Details ] Diff ]
sterea-sound can not be played in 3d-space
mod - rts/System/Sound/OggStream.cpp Diff ] File ]
mod - rts/System/Sound/OggStream.h Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
First  Prev  1 2 3 ... 110 ... 220 ... 330 ... 440 ... 550 ... 660 ... 770 ... 777 778 779 780 781 782 783 ... 880 ... 990 ... 1057 1058 1059  Next  Last