Commit Graph
34131 Commits
Author SHA1 Message Date
Colby Klein 6a7da2a362 Merge pull request #277 from kyzentun/WheelItemIsLoaded
WheelItemBase:IsLoaded
2014-08-31 18:16:10 -07:00
Colby Klein d4c7e4e781 Merge pull request #285 from kyzentun/ClearZPref
Added FastNoteRendering preference.
2014-08-31 18:15:25 -07:00
Colby Klein 81065f1fda Merge branch 'master' of https://github.com/stepmania/stepmania 2014-08-31 17:41:32 -07:00
Devin J. PohlyandColby Klein 4ccdf776cb point at the right file in the filesystem 2014-08-31 17:23:42 -07:00
Devin J. PohlyandColby Klein 9a76fdf04e don't set lights for nonexistent lights
duh.
2014-08-31 17:23:41 -07:00
Devin J. PohlyandColby Klein f386a7ae58 add PIUIO_Leds driver
The mappings in this driver are specific to the piuio kernel driver, but
once lights mapping is possible this could be made into a generic leds
class driver.
2014-08-31 17:23:41 -07:00
Colby Klein f461aff46c Merge branch 'master' of https://github.com/stepmania/stepmania 2014-08-31 17:22:13 -07:00
Colby Klein 5b2452d1b0 Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania 2014-08-31 17:19:36 -07:00
Jonathan Payne 1464f12b16 Implement ScreenCaution, fix CDTitle 2014-08-31 16:59:03 -07:00
Colby Klein 29aacfeaf5 Merge pull request #276 from djpohly/piuio-leds
LightsDriver for /sys/class/leds with new PIUIO kernel module
2014-08-31 16:35:02 -07:00
Kyzentun 71ed1df5e6 Added FastNoteRendering preference. 2014-08-31 17:17:48 -06:00
Colby Klein c71245922f Merge pull request #284 from Midiman/changes-beta4
Beta 4 theme updates
2014-08-31 15:18:55 -07:00
Jonathan Payne ce305f969d Update metrics.ini 2014-08-31 15:13:47 -07:00
Kyzentun 9e8b8c3c09 Changed ColorDepth prefs defaults to 32-bit. 2014-08-31 04:32:12 -06:00
Jonathan Payne 7e0adb3383 Fix eval branch. Course mode fix 2014-08-30 20:32:53 -07:00
Jonathan Payne 3d283a41bc Implement ScreenContinue 2014-08-30 20:17:15 -07:00
Jonathan Payne ab394950e0 fix StageDisplay errors, EvalSummary 2014-08-30 16:14:03 -07:00
Kyzentun 5f6e574ffc Changed Actor:scale_or_crop_background back to forcing the actor to the screen center. Changed LogDisplay's IgnoreIdentical to not ignore when hidden. 2014-08-29 23:30:36 -06:00
freem 4cf4e30bb9 Change LifeDifficulty to match StepMania 3.9's again (4=1.0) 2014-08-29 21:37:18 -05:00
Kyzentun 6757ab0c8c Added WheelItemBase:IsLoaded lua function and associated error. 2014-08-29 20:06:50 -06:00
Devin J. Pohly b8122e6e50 point at the right file in the filesystem 2014-08-29 21:53:22 -04:00
Devin J. Pohly 7a4c107e1a don't set lights for nonexistent lights
duh.
2014-08-29 21:53:06 -04:00
freem ef2254a4c4 remove the ssc part from the Name in stepmania.desktop 2014-08-29 20:45:17 -05:00
Devin J. Pohly 2c708d0086 add PIUIO_Leds driver
The mappings in this driver are specific to the piuio kernel driver, but
once lights mapping is possible this could be made into a generic leds
class driver.
2014-08-29 20:36:43 -04:00
Kyzentun bedaf07e51 Reverted some changes that should not have been part of the merge from Midiman. 2014-08-28 05:53:37 -06:00
Jonathan Payneandfreem 04da3fb9c7 include IsCourse(), fix StageDisplay for courses!
(cherry picked from commit 56003157f77be78bd5ab9e608b1f3836cf288e08)
2014-08-28 06:01:17 -05:00
Jonathan Payneandfreem 91581bb5f7 Fix eval summary, summary branches
+ Fixed ScreenGameplay StepsDisplay errors
+ Fixed ScreenSelectCourse CourseContentsList masks
+ Fixed ScreenEvaluationSummary banners -- introduced a scroller.
+ Fixed showing ScreenEvaluationSummary showing after a course

(cherry picked from commit 04f7373238410c481cb79c6441fb27c55c69a447)
2014-08-28 06:01:15 -05:00
Jonathan Payneandfreem c36068faf8 High Scores tweak
(cherry picked from commit fa4e5efb5b0d8dcd73ed3e43d993d7e98b73e347)
2014-08-28 06:01:14 -05:00
Jonathan Payneandfreem 8f0e2246f9 Add a real High Scores screen.
(cherry picked from commit 4c5bfa5e0eb351a0d90c70413a7cd8622007d188)
2014-08-28 06:01:12 -05:00
Jonathan Payne 6453b8b04a Merge branch 'master' of https://github.com/stepmania/stepmania 2014-08-27 16:07:12 -07:00
freem a34f05ee95 revert mapconv.exe back to older version
(even though it doesn't really work well with Visual Studio 2010 and NoteData:AddATIToList/RemoveATIFromList... see issue #262)
2014-08-27 12:33:46 -05:00
Kyzentun cab4f4d5d1 Fixed StatsManageer::GetFinalEvalStageStats to not put them in reverse order and not have a 3 stage limit. Fixed PlayerStageStats::AddStats to not overwrite the last entry of the record with the first entry of the record being added. 2014-08-27 00:04:57 -06:00
AJ Kelly 594e4d2dfb Merge pull request #274 from sigatrev/loop-wrap
revert ActorScroller "loop" behavior and add new "wrap" parameter to wrap scrollers
2014-08-25 23:30:38 -05:00
sigatrev 0bc0cc8a46 revert ActorScroller "loop" behavior and add new "wrap" parameter to wrap scrollers 2014-08-25 22:19:17 -05:00
Kyzentun a41d9c0467 Changed GetAttrPath to not warn on optional paths. 2014-08-25 03:38:22 -06:00
Kyzentun 96433cc3e4 Merge branch 'BitmapText-attribute' of https://github.com/sigatrev/stepmania 2014-08-25 02:37:26 -06:00
Kyzentun 28bdd2ca2a Merge branch 'RadarSubscript' of https://github.com/kyzentun/stepmania 2014-08-25 02:35:16 -06:00
Kyzentun c94758b4ca Merge branch 'BGFit' of https://github.com/kyzentun/stepmania 2014-08-25 02:34:43 -06:00
Kyzentun 95b16a0196 Merge branch 'LifeMeterMessage' of https://github.com/kyzentun/stepmania 2014-08-25 02:33:53 -06:00
Kyzentun 01442d193f Fixed SwitchThemeAndLanguage to run lua scripts when reloading the theme. Removed ForceThemeReload param from GameLoop::ChangeTheme. 2014-08-24 03:21:01 -06:00
kyzentun 1ca6154c1a Merge pull request #264 from sigatrev/SetStyleAndPlayMode
Add SetCurrentPlayMode and SetCurrentStyle methods
2014-08-22 20:12:07 -06:00
Kyzentun 2c49ec7380 Change RadarValues internal implementation to not use a union and use the subscript operator instead of the float* operator for subscripting. 2014-08-22 13:19:17 -06:00
freem 8b062785ea Change Windows installer to use the root drive, instead of a hardcoded C:\
(fixes #271)
2014-08-20 15:28:09 -05:00
Kyzentun 8ae17b4422 Changed LifeMeterTime to not crash when not in course mode. Changed _fallback's life settings back to forcing together. Added ForceImmediateFailForBattery theme metric. Gave up on FailFadeRemovePlayer lua function and removed it. 2014-08-19 23:58:35 -06:00
Kyzentun 493d0f8214 Fixed CreateMethodTable to create a new table even when something of that name exists, so that the previously existing one that might have been modified by a theme is removed when changing themes. 2014-08-18 11:26:05 -06:00
Jonathan Payne c5ddafe73c Merge branch 'master' of https://github.com/stepmania/stepmania 2014-08-18 02:03:50 -07:00
Colby Klein 479f93c807 Merge pull request #269 from sigatrev/ActorFrame_diffuse
fix ActorFrame diffusing and glowing children
2014-08-16 21:12:09 -07:00
sigatrev 02922aa5c0 fix ActorFrame diffusing and glowing children
When an ActorFrame's parent has a diffuse or glow, the ActorFrame uses
the static tempState in Actor::PreDraw(); When the ActorFrame draw's
it's children, those children also use tempState because their parent
has a diffuse( making their internalDiffuse not 1,1,1,1 ). If any child
is diffused it'll will change tempState, which will affect the
internalDiffuse given to the next child, and so on.

By determining the diffuse and glow to be passed to the children before
drawing any of them, any changes to tempState will not affect the
diffuse of subsequent children.
2014-08-16 22:51:34 -05:00
sigatrev d8b86fa3c5 make internal diffuse apply to bmt attributes
diffuse from BitmapText attributes were not receiving internal diffuse
from their parent ActorFrames. This change waits until after the draw
cycle to reset the internal diffuse and glow, so any color applications
separate from generic diffuse can use the internal diffuse when desired.
2014-08-16 16:38:26 -05:00
Colby Klein 79276a635a Merge pull request #267 from sigatrev/Update-and-Draw
Allow Update and Draw functions to be turned off
2014-08-16 09:12:08 -07:00