eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-01 21:19:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,440 Commits 60 Branches 10 Tags
feature/transform-shape-gui
Commit Graph

1440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sofian Audry
ff17870d25 Fixed small compilation error related to drawControlsVertex() 2018-04-08 17:17:48 -04:00
Sofian Audry
280bb07c19 Updated CONTRIBUTORS.md 2018-04-08 17:09:30 -04:00
Sofian Audry
6842ade204 Updated list of contributors following the sprint at IMRC 2018-04-08 17:06:52 -04:00
ltsAdair
7eebb3bbe2 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-08 16:41:35 -04:00
Sofian
e389f73983 Merge branch 'feature/transform-shape-gui' into develop 2018-04-08 16:30:13 -04:00
Sofian
cc0c50cea6 Do not display scale/rotation icons on internal vertices 2018-04-08 16:29:49 -04:00
Alexandre Quessy
31ce4e721b Update NEWS to prepare 0.6.0 2018-04-08 15:56:04 -04:00
Alexandre Quessy
2765afb9b7 Remove .DS_Store 2018-04-08 15:55:55 -04:00
baydam
174cf23501 Increase de size of transformation icons and minors fix 2018-04-08 19:49:04 +00:00
baydam
8c98ad7e95 Increase de size of transformation icons and minors fix 2018-04-08 19:48:41 +00:00
baydam
04a4483a4d Increase de size of transformation icons and minors fix 2018-04-08 19:42:27 +00:00
jonathan
bcd0e0166a Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-08 15:39:53 -04:00
jonathan
c86e209523 The pause and restart icons were changed 2018-04-08 15:39:48 -04:00
Alexandre Quessy
531dd199f5 Add missing config.pri - fix compilation warning 2018-04-08 15:25:53 -04:00
jonathan
61a26f5898 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-08 14:10:51 -04:00
jonathan
2e1c38ea67 Issue: #410 Rewind button hover text changed to Restart 2018-04-08 14:10:21 -04:00
Bay Dam
d5bf0c676c Update appveyor.yml 2018-04-08 17:48:20 +00:00
ltsAdair
08261e97f2 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-08 13:34:37 -04:00
ltsAdair
18312d0333 Fix application icon (macOS) 2018-04-08 13:31:43 -04:00
baydam
cda087d85d Fix automated build for Windows 2018-04-08 17:20:03 +00:00
Alexandre Quessy
665960cb60 Merge branch 'macOS_ApplicationIcon' into develop 2018-04-08 12:59:11 -04:00
ltsAdair
d8accbd5bc Add macOS Application Icon 2018-04-08 12:27:34 -04:00
Bay Dam
77a0f009b7 Merge pull request #391 from mapmapteam/feature/transform-shape-gui 
Feature - rotate and scale fully implement in the user interface
 2018-04-08 16:04:51 +00:00
Bay Dam
0b9ece0711 Merge branch 'develop' into feature/transform-shape-gui 2018-04-08 16:03:53 +00:00
baydam
e3cb0a8b7b Merge branch 'feature/change-layer-source' into develop 2018-04-08 15:54:31 +00:00
baydam
206bdb5602 Fix #400 2018-04-07 23:48:04 +00:00
Alexandre Quessy
d49133b7f2 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-07 19:05:38 -04:00
Alexandre Quessy
64aafc5bdf Fix video rate bug (Closes #369) 
Cleanup

Add qWarning
 2018-04-07 19:05:28 -04:00
baydam
50f9c8f686 Cosmetic change 2018-04-07 22:19:07 +00:00
baydam
df0ac22de4 Change the default test card 2018-04-07 22:19:06 +00:00
baydam
4ff3476dd3 Add the user choice to show control only on mouse over in preferences 2018-04-07 22:19:06 +00:00
Alexandre Quessy
3b46691753 Run lupdate 2018-04-07 17:57:12 -04:00
Sofian Audry
d0885de599 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2018-04-07 17:52:59 -04:00
Sofian Audry
1e894074b2 Update hard-coded list of languages 2018-04-07 17:51:59 -04:00
Alexandre Quessy
0c09e5e9a6 Update mapmap_zh_TW and zh_CN translations 2018-04-07 17:43:39 -04:00
baydam
c19f97629f By default show controls on output on if it is hovered by mouse 2018-04-07 20:50:46 +00:00
Alexandre Quessy
1563bbf53f Update mapmap_zh_TW translation 2018-04-07 16:42:27 -04:00
Sofian Audry
4bf00091a0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-07 16:15:13 -04:00
Sofian Audry
edda969c74 Renamed "Mesh subdivisions" to "Subdivisions" to shorten name. 2018-04-07 16:14:24 -04:00
Sofian Audry
fb14d0d38d Changed width/height to horizontal/vertical for mesh subdivision naming. 2018-04-07 16:14:07 -04:00
Sofian Audry
a0f9a98dcd Small fix. 2018-04-07 16:13:35 -04:00
baydam
c28ef880a1 Little fix 2018-04-07 20:12:02 +00:00
baydam
18a7a6c6b6 Merge branch 'feature/rename-gui-elements' into develop 2018-04-07 20:02:01 +00:00
baydam
1a5fd794a0 Rename the gui elements based on the discussion 2018-04-07 20:00:38 +00:00
Alexandre Quessy
c8cd949ab4 Use zh translation files. 2018-04-07 13:25:12 -04:00
Alexandre Quessy
de83f40c5b Add zh_TW and zh_CN translation files to translate 2018-04-07 13:17:29 -04:00
Alexandre Quessy
b8b7f9a6b9 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2018-04-07 13:08:06 -04:00
Alexandre Quessy
ce8debf5b1 Update scripts/build.sh script for macOS 2018-04-07 13:07:47 -04:00
ltsAdair
84a98c69fc Bugfix: Cursor no longer displays in fullscreen without controls (closes #387) 2018-04-07 12:55:18 -04:00
baydam
9dd6f855b3 update gitignore 2018-04-07 15:50:58 +00:00