j3kstrum / CodeCarnage

26%

develop: 31%

LAST BUILD ON BRANCH scriptparsing

branch: scriptparsing

CHANGE BRANCH

x

Reset

• scriptparsing
• CheckBugFix
• DifficultyFinal
• Parameter-Logic
• ScriptCommandImp
• add-website-base
• additional-game-functionality
• additional-game-functionality-retreat
• aspect-ratio-fix
• attacking
• base-bar-links
• behavior-limit
• collab-jar
• collaborators-page
• command-bug-fixes
• computer-ai
• contact-page
• daveTests
• delete-word-from-script
• demo
• develop
• difficulties-ai
• downloads-information
• early-load-game
• ekstrum
• ekstrum-testing
• ellipsis-bug
• end-screens
• engine-tests
• final-release
• finalize-jar
• fix-filepaths
• game-model-refactor
• game-model-refactor-test-ui
• gui-bug-fixes
• health-bars
• intuitive-scripting
• invisible-execution
• jars
• legal-page
• map-cache
• master
• more-map-garbage
• new-maps
• online-resources
• pass-commands-to-engine
• qol-and-resource-failure
• readme-update
• redirect-web
• resource-failed-alert
• resource-issues
• script-object-initialization
• scripting-bugfix
• scripting-data-pa
• scripting-menu-events
• thread-refactoring-fix-lag
• threading-refactor
• update-ai
• update-knights
• update-readme
• user-input
• v0.2.0
• v0.3.0
• v0.4.0
• v1.0.0
• web-overhaul
• website-base
• website-downloads
• website-final
• windows-rollback

Build # 225

Build Type

push

travis-ci

Committed by islanddove

Commit Message

Merge branch 'develop' into scriptparsing

# Conflicts:
#	src/main/java/engine/core/Engine.java

Run Details

232 of 898 relevant lines covered (25.84%)

0.26 hits per line