Private
Public Access
1
0
Commit Graph

5157 Commits

Author SHA1 Message Date
Sander Roosendaal
c47b0227b7 Merge branch 'release/v10.65' into develop 2019-12-07 07:52:11 +01:00
Sander Roosendaal
37a6fb38ac not sure 2019-12-07 07:51:27 +01:00
Sander Roosendaal
09881cdeb1 Merge branch 'feature/counterstart' into develop 2019-12-06 17:29:49 +01:00
Sander Roosendaal
824005f315 added play/pause for slider button 2019-12-06 17:27:58 +01:00
Sander Roosendaal
9b9c707efa working on counter 2019-12-04 07:34:10 +01:00
Sander Roosendaal
90c14e634a Merge tag 'v10.64' into develop
improvements on locking sliders
2019-12-02 22:03:15 +01:00
Sander Roosendaal
369401b639 Merge branch 'release/v10.64' 2019-12-02 22:02:38 +01:00
Sander Roosendaal
d8954bf896 Merge branch 'feature/improvedvideo' into develop 2019-12-02 21:47:44 +01:00
Sander Roosendaal
8e9e17e2dd delay correct 2019-12-02 21:45:51 +01:00
Sander Roosendaal
b9fd31d679 goede veranderingen 2019-12-02 21:44:15 +01:00
Sander Roosendaal
05d8218175 slider updated by video only if lock checked 2019-12-02 21:19:03 +01:00
Sander Roosendaal
41a463cdde working on slider update, not on video play when locked 2019-12-02 16:38:19 +01:00
Sander Roosendaal
8a05bc1dbb Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-12-02 08:24:34 +01:00
Sander Roosendaal
76ba591429 Merge branch 'release/videoimprovements' into develop 2019-12-01 10:11:19 +01:00
Sander Roosendaal
8f4ffe3a71 Merge branch 'release/videoimprovements' 2019-12-01 10:11:04 +01:00
Sander Roosendaal
6e33308314 improved video size 2019-12-01 10:10:31 +01:00
Sander Roosendaal
49fe549358 small video improvements and bug fix 2019-12-01 09:58:43 +01:00
Sander Roosendaal
98b6a0e350 Merge branch 'release/v10.63' 2019-11-26 20:43:57 +01:00
Sander Roosendaal
df95b9593a further bug fixes 2019-11-26 20:43:43 +01:00
Sander Roosendaal
5f7d5b11f3 Merge branch 'release/v10.62' 2019-11-26 19:47:08 +01:00
Sander Roosendaal
02360e783d fixed bug in add_efficiency 2019-11-26 19:45:56 +01:00
Sander Roosendaal
83dd41b425 Merge branch 'release/v10.61' 2019-11-26 17:39:32 +01:00
Sander Roosendaal
9fbdcbc8e8 is dit het laatste? 2019-11-26 17:39:12 +01:00
Sander Roosendaal
09fffae62f Merge branch 'release/v10.60' 2019-11-26 17:35:59 +01:00
Sander Roosendaal
196dc2a0dd meer sores 2019-11-26 17:35:15 +01:00
Sander Roosendaal
6dd8da16ca Merge branch 'release/v10.59' 2019-11-26 17:29:28 +01:00
Sander Roosendaal
358f5a8ac8 authorization improvement 2019-11-26 17:27:34 +01:00
Sander Roosendaal
260a4bbfc6 Merge branch 'release/v10.58' 2019-11-26 15:11:17 +01:00
Sander Roosendaal
befec12c27 Merge branch 'feature/embeddedvideo' into develop 2019-11-26 14:51:27 +01:00
Sander Roosendaal
b50ea49f19 Merge branch 'develop' into feature/embeddedvideo 2019-11-26 14:46:15 +01:00
Sander Roosendaal
6ce47ca3cf Merge branch 'release/v10.57' 2019-11-26 13:18:35 +01:00
Sander Roosendaal
daf57063c1 small fixes 2019-11-25 20:39:01 +01:00
Sander Roosendaal
65ccd8b0cb Merge branch 'master' into develop 2019-11-25 18:32:39 +01:00
Sander Roosendaal
bc747ed980 Merge branch 'master' into develop 2019-11-25 13:37:48 +01:00
Sander Roosendaal
8b46d8a1e4 settings 2019-11-25 13:20:31 +01:00
Sander Roosendaal
32035a6efd Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall 2019-11-25 13:16:38 +01:00
Sander Roosendaal
729c2ab370 quick fix 2019-11-25 13:15:51 +01:00
Sander Roosendaal
d84b6ee58e improved anim speed 2019-11-21 22:17:31 +01:00
Sander Roosendaal
75664bbd62 small improvement 2019-11-21 22:11:29 +01:00
Sander Roosendaal
98d0c42738 added boat speed gauge 2019-11-21 22:08:12 +01:00
Sander Roosendaal
03e09b3d5c fixed something 2019-11-21 20:49:45 +01:00
Sander Roosendaal
adc74360cb Merge branch 'hotfix/v10.56' into develop 2019-11-19 20:52:12 +01:00
Sander Roosendaal
447936ba5e Merge branch 'hotfix/v10.56' 2019-11-19 20:52:06 +01:00
Sander Roosendaal
e0b8513e63 hot fix 2019-11-19 20:51:58 +01:00
Sander Roosendaal
2e2437d426 Merge branch 'release/v10.55' 2019-11-19 20:45:40 +01:00
Sander Roosendaal
4c0b19ea96 bug fix 2019-11-19 13:10:46 +01:00
Sander Roosendaal
ff06efd45d Chart refinements 2019-11-19 11:11:32 +01:00
Sander Roosendaal
a5e6c8bc41 working now 2019-11-19 08:46:21 +01:00
Sander Roosendaal
ead7fb6561 not working 2019-11-19 08:41:50 +01:00
Sander Roosendaal
471b95f885 Merge branch 'develop' into feature/embeddedvideo 2019-11-19 08:02:21 +01:00