Changesets: spring
develop 4aa08f8c
Timestamp: 2009-05-05 15:18:41 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: introduces CUnitScriptNames class this keeps mapping from COBFN_* constants to strings, and from strings to COBFN_* constants. |
||
add - rts/Sim/Units/COB/UnitScriptNames.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Units/COB/UnitScriptNames.h | [ Diff ] [ File ] | ||
develop eb99c546
Timestamp: 2009-05-05 15:18:11 Author: Tobi Vollebregt [ Details ] [ Diff ] |
typos | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop a24c3b61
Timestamp: 2009-05-05 15:07:54 Author: zerver [ Details ] [ Diff ] |
Merge branch 'master' of git@github.com:spring/spring | ||
mod - AI/Interfaces/Java/JvmLocater_solaris.c | [ Diff ] [ File ] | ||
mod - AI/Skirmish/AAI/AAIBuildTable.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/AttackGroup.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/AttackHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/BuildUp.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/BuildUp.h | [ Diff ] [ File ] | ||
add - AI/Skirmish/KAIK/CommandTracker.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/Containers.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/Containers.h | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/DGunController.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/DGunController.h | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/IncGlobalAI.h | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/MetalMap.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/PathFinder.cpp | [ Diff ] [ File ] | ||
rm - AI/Skirmish/KAIK/SunParser.cpp | [ Diff ] [ File ] | ||
rm - AI/Skirmish/KAIK/SunParser.h | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/ThreatMap.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/Unit.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/UnitHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/UnitTable.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/UnitTable.h | [ Diff ] [ File ] | ||
mod - installer/builddata/springcontent/EngineOptions.lua | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.h | [ Diff ] [ File ] | ||
mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameSetup.h | [ Diff ] [ File ] | ||
mod - rts/Game/SelectMenu.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.h | [ Diff ] [ File ] | ||
add - rts/Sim/Misc/AllyTeam.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Misc/AllyTeam.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/TeamBase.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/TeamBase.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/MoveInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/MoveInfo.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Objects/SolidObject.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Mac/SDLMain.m | [ Diff ] [ File ] | ||
mod - rts/System/Platform/errorhandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/exportdefines.h | [ Diff ] [ File ] | ||
mod - tools/DedicatedServer/CMakeLists.txt | [ Diff ] [ File ] | ||
develop 77386912
Timestamp: 2009-05-05 15:07:25 Author: zerver [ Details ] [ Diff ] |
Update vcproj | ||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
develop 3c2f0750
Timestamp: 2009-05-05 15:07:25 Author: -jk- [ Details ] [ Diff ] |
Revert "line ending" This reverts commit aac4c67de1bcef684e987ae45c281c274be62ef1. |
||
mod - rts/Rendering/Textures/3DOTextureHandler.h | [ Diff ] [ File ] | ||
rm - rts/build/scons/config.pyc | [ Diff ] [ File ] | ||
rm - rts/build/scons/detect.pyc | [ Diff ] [ File ] | ||
rm - rts/build/scons/filelist.pyc | [ Diff ] [ File ] | ||
rm - rts/build/scons/gch.pyc | [ Diff ] [ File ] | ||
rm - 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 ] | ||
rm - rts/lib/streflop/libm/flt-target | [ Diff ] [ File ] | ||
mod - tools/nedmalloc/malloc.c.h | [ Diff ] [ File ] | ||
develop d5cbd0f9
Timestamp: 2009-05-05 15:06:15 Author: zerver [ Details ] [ Diff ] |
Add possible future replacement for dynamic_cast (disabled now) | ||
mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Object.h | [ Diff ] [ File ] | ||
develop 33136cac
Timestamp: 2009-05-05 14:52:37 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: UpdateCallIn can remove callins | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop f6d3e414
Timestamp: 2009-05-05 14:41:16 Author: zerver [ Details ] [ Diff ] |
Fix mantis 0000072 (units attacking ground on non-explicit attack order) | ||
mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GuiHandler.h | [ Diff ] [ File ] | ||
develop 22e9690f
Timestamp: 2009-05-05 14:36:00 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: implemented CreateScript, UpdateCallIn callouts | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/LuaUnitScript.h | [ Diff ] [ File ] | ||
develop d423402c
Timestamp: 2009-05-05 14:06:05 Author: -jk- [ Details ] [ Diff ] |
floating factories: only move the to be build unit on waterlevel, if it is underwater (fixes floating factories that can be build on ground, too) | ||
mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | ||
develop 68cefbf8
Timestamp: 2009-05-05 14:02:44 Author: -jk- [ Details ] [ Diff ] |
delete unused glTextBox | ||
rm - rts/Rendering/GL/glTextBox.cpp | [ Diff ] [ File ] | ||
rm - rts/Rendering/GL/glTextBox.h | [ Diff ] [ File ] | ||
develop f584bf2d
Timestamp: 2009-05-05 14:02:31 Author: -jk- [ Details ] [ Diff ] |
fixed some bugs in LuaUnsyncedCtrl.cpp | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
develop 1d191877
Timestamp: 2009-05-05 14:01:21 Author: -jk- [ Details ] [ Diff ] |
lua interface for the new FontSystem: gl.LoadFont( fontfile , size = 14, outlinewidth = 2, outlineweight = 15) -> lua_font gl.DeleteFont( lua_font ) lua_font userdata object: font:Begin() -> nil font:End() -> nil font:Print( text, x, y, size, options ) -> nil options is a string which can contain a combination of: 'c' := horizontal centered 'r' := right aligned 't' := top .. 'v' := vertical centered 'b' := bottom 'a' := ascender 's' := shadowed 'o'|'O' := outlined font:WrapText( text, maxWidth, [maxHeight, [size]]) -> string wrappedText, number lines font:GetTextWidth( text ) -> norm_width font:GetTextHeight( text ) -> height, descender font:SetTextColor({r,g,b[,a]} || r,g,b[,a]) -> nil font:SetOutlineColor({r,g,b[,a]} || r,g,b[,a]) -> nil font:SetAutoOutlineColor( bool enable ) -> nil By default the renderer auto adjust the outline color to the textColor, but sometimes this is unwanted for inlined colorcodes, so you can turn it off here. font:BindTexture() -> nil read-only properties: font.size font.height || font.lineheight font.descender font.outlinewidth font.outlineweight font.path font.family font.style font.texturewidth font.textureheight |
||
add - rts/Lua/LuaFonts.cpp | [ Diff ] [ File ] | ||
add - rts/Lua/LuaFonts.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
develop 411647d0
Timestamp: 2009-05-05 13:43:51 Author: -jk- [ Details ] [ Diff ] |
export some more CMDDesc to LayoutButtons callin (name,tooltip,onlyTexture) | ||
mod - rts/Game/UI/LuaUI.cpp | [ Diff ] [ File ] | ||
develop 5f25cf56
Timestamp: 2009-05-05 13:42:26 Author: -jk- [ Details ] [ Diff ] |
new FontSystem: bugfixes: * glyphs aren't distorted on widescreens anymore * font doesn't need to get recreated on window resize * textwidth is calculated correctly visuals: * supports kerning * full cp1252 (WinLatin-1) support * all glyphs have a blurred version in the fontatlas used for outline&shadow rendering a more powerfull api: * supports linebreaks * supports alignment (vertical & horizontal) * supports text decoration (outline & shadow) * on font creation variable outlinewidth/-weight * a new ::Wrap() functions that adds linebreaks & ellipsis (and supports inline colorcodes) performance: * in default situations 10x faster (with outlines even more) * reduces state changes via font->Begin() & font->End() * uses vertex arrays * renders glyph outlines as 1 quad |
||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectMenu.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/StartScripts/ScriptHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/CursorIcons.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/EndGameBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GameInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GameSetupDrawer.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/ProfileDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/QuitBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/ResourceBar.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/ShareBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/StartPosSelecter.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/glExtra.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/glExtra.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/glList.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/glList.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/InMapDraw.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/InMapDraw.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/glFont.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
develop 932bdb4b
Timestamp: 2009-05-05 12:22:56 Author: Tobi Vollebregt [ Details ] [ Diff ] |
consistency | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop 83dff003
Timestamp: 2009-05-05 12:19:33 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: stubs for UpdateCallIn and CreateScript | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/LuaUnitScript.h | [ Diff ] [ File ] | ||
develop 0ac9e6be
Timestamp: 2009-05-05 12:13:49 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: set up shared environment table for cfuncs | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop 0f331821
Timestamp: 2009-05-05 11:31:14 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: call PushEntries in LuaSyncedCtrl::PushEntries | ||
mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
develop 51cc262c
Timestamp: 2009-05-05 11:28:50 Author: Tobi Vollebregt [ Details ] [ Diff ] |
LuaUnitScript: PushEntries implementation | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop 429b2672
Timestamp: 2009-05-05 01:59:50 Author: Tobi Vollebregt [ Details ] [ Diff ] |
tiny update | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
develop 5ac7895d
Timestamp: 2009-05-05 01:40:02 Author: Tobi Vollebregt [ Details ] [ Diff ] |
luacob: method stubs | ||
mod - rts/Sim/Units/COB/CobInstance.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/CobInstance.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/LuaUnitScript.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.h | [ Diff ] [ File ] | ||
develop e01ae4c8
Timestamp: 2009-05-05 00:53:21 Author: Tobi Vollebregt [ Details ] [ Diff ] |
fix | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.h | [ Diff ] [ File ] | ||
develop f917bce2
Timestamp: 2009-05-05 00:39:41 Author: Tobi Vollebregt [ Details ] [ Diff ] |
luacob: Added IsIn{Turn,Move,Spin} callouts. | ||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/LuaUnitScript.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.h | [ Diff ] [ File ] | ||
develop 2920adcc
Timestamp: 2009-05-05 00:39:26 Author: -jk- [ Details ] [ Diff ] |
added CBitmap::Blur(iterations,weight) | ||
mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Textures/Bitmap.h | [ Diff ] [ File ] | ||