Commit Graph

444 Commits

Author SHA1 Message Date
Joey Lawrance 98cd449d40 Merge pull request #105 from Mechtecs/patch-1
Changed server address to IP
2016-03-16 13:22:56 -04:00
Mechtecs 6d27fdfeb8 Changed server address to IP 2016-03-16 18:20:35 +01:00
Joey Lawrance 74aa00ab2f Merge remote-tracking branch 'drew/master' into pull101 2016-03-14 11:39:14 -04:00
Joey Lawrance cb6a01908e Merge remote-tracking branch 'mechtecs/master' into pull95 2016-03-14 11:35:21 -04:00
Joey Lawrance f7e0636446 Fixed broken build. 2016-03-14 11:25:58 -04:00
Drew E. Buckley 6714732b49 Added "source" attribute with value of "2.3.0" to logisim/default.templ.
This attribute is an expected part of the template document. The lack of
this attribute was causing a log warning during loading of this
templete.
2016-02-11 14:33:52 -05:00
Drew E. Buckley 864488fbaa Addressed Issue #26: "Double click to add labels". Added functionality
for double click labelling with a new class and alteration to SelectTool
class.
2016-01-19 12:27:49 -05:00
Mechtecs cf7c2293ff Switched Inputs! :) 2015-12-02 14:54:51 +01:00
Jeremy Fix 77d0ce0d8c Increase wire linewidth
The wires are much too small in my opinion, we don't see the status of them ;
2015-07-03 08:37:41 +02:00
Mechtecs 1f5c789dff Added Pow function to arithmetic gates 2015-06-18 23:03:42 +02:00
Joey Lawrance a3ad582bf3 Merge pull request #94 from Mechtecs/patch-1
Update README.md
2015-06-17 21:13:15 -04:00
Mechtecs 9629eab809 Update README.md
Added Jenkins build server
2015-06-15 18:50:39 +02:00
Joey Lawrance 200a80ba94 Merge pull request #91 from Mechtecs/master
Updated the TODO. Explained the Values
2015-06-13 21:56:10 -04:00
Mechtecs 38a85b9378 Explanation of Icon 2015-05-18 22:01:56 +02:00
Mechtecs 6193aadd5e Updated the TODO. Explained the Values
Its a simple Two Arrow Draw.
2015-05-18 21:49:48 +02:00
Mike Spallino 850b29f8fa Fixed the buildscript to make an executable fat jar. 2015-02-23 13:08:23 -05:00
Mike Spallino 123a8df4a1 Added both System Tray and Top Corner Icons. Just used the actual pngs so that we don't use a new library or write a ton of code just for that. Removed 'org.apache.commons:commons-lang3:3.1' since the only spots it was used were in deprecated ways according to its documentation. 2015-02-11 00:45:19 -05:00
realbinglebob 8ac7689162 Added a new Icon and added it to the build script. 2015-01-26 20:27:13 -05:00
realbinglebob 5b36077220 Made the About Screen display in the center. Added CTRL + Scroll support for zooming. 2015-01-26 19:00:11 -05:00
Mike Spallino f1c18b1e63 Fixed the build script and the gradle wrapper so that we can run sonar with java 1.8. 2015-01-16 22:05:18 -05:00
Spanti Nicola (RyDroid) 569b693831 Adding StringUtil.join 2014-11-27 23:02:52 +01:00
Spanti Nicola (RyDroid) d6b9929d96 Merge branch 'master' of https://github.com/lawrancej/logisim into minor-changes
Conflicts:
	src/main/java/com/cburch/draw/actions/ModelAction.java
	src/main/java/com/cburch/draw/actions/ModelChangeAttributeAction.java
	src/main/java/com/cburch/logisim/tools/PokeTool.java
	src/main/java/com/cburch/logisim/tools/WiringTool.java
	src/main/java/com/cburch/logisim/util/InputEventUtil.java
	src/main/java/com/cburch/logisim/util/LocaleManager.java
	src/main/java/com/cburch/logisim/util/LocaleString.java
2014-11-27 22:36:08 +01:00
Philippe Rochat a87b5bd2f8 Merge remote-tracking branch 'upstream/master' 2014-11-17 22:33:51 +01:00
Joey Lawrance 0b18a33eb3 Got the Mac App Bundler to work only on Macs. 2014-11-17 13:46:41 -05:00
Philippe Rochat 0d44104d18 Modified README
Launch4j could be now installed just in the root of the project, build
process will find it.
And git will ignore it.
2014-11-15 00:26:39 +01:00
Philippe Rochat af077eceac merged original gitignore
Confirmed launch4j in gitignore
2014-11-15 00:15:55 +01:00
Philippe Rochat 6580f83fce Some cleaning
Launch4j shouldn’t be put into distrib as it contains native code
2014-11-15 00:10:36 +01:00
Philippe Rochat 8cddf9b527 Merge branch 'RyDroid-fr'
Merged some translatons
2014-11-15 00:03:07 +01:00
Philippe Rochat 7538b8a754 Merge branch 'fr' of github.com:RyDroid/logisim into RyDroid-fr
Conflicts:
	src/main/resources/logisim/fr/data.properties
	src/main/resources/logisim/fr/hex.properties
	src/main/resources/logisim/fr/proj.properties
	src/main/resources/logisim/fr/util.properties
2014-11-15 00:02:50 +01:00
Philippe Rochat 423e3a6321 Added launchj in .gitignore
It might convenient to add launch4j locally in the project, but since
launch4j includes some native code, it shouldn’t be distributed that way
2014-11-14 23:44:37 +01:00
Joey Lawrance ddac8e8b9b Merge remote-tracking branch 'RyDroid/readme' 2014-11-13 22:47:30 -05:00
Joey Lawrance 7b6ca5e61e Merge branch 'translation' 2014-11-13 22:42:55 -05:00
Philippe Rochat fc6ce4c2f9 Merge branch 'launch4jw' 2014-11-13 23:49:43 +01:00
Philippe Rochat 87d49a5e97 Added Launch4j in the project
Thus the windows exe could be built directly without
launch4j installation …
Not extensively tested !
2014-11-13 23:46:55 +01:00
Philippe Rochat 1dd9fd267b Merge branch 'doc-translation' 2014-11-13 22:55:50 +01:00
Philippe Rochat 1523e53313 Done essential french translation
Remains advanced part in english … let’s assume techies know english
2014-11-13 22:48:43 +01:00
Philippe Rochat 59a3f03860 Partial translation
Stop in JAR doc index
2014-11-13 01:12:14 +01:00
Joey Lawrance b046d0ad8b Merge branch 'dominic' 2014-11-10 14:17:33 -05:00
Joey Lawrance 27e020a1a3 Merge branch 'dominic' 2014-11-10 14:13:47 -05:00
Philippe Rochat 100e4b99ca Translation finished for doc analyze.
Remain from attrlib and further
2014-11-08 00:09:58 +01:00
Philippe Rochat 5ebef1444f Doc translation 1
Partial doc translation -> table.html (not included)
2014-11-07 00:37:55 +01:00
Philippe Rochat 86ba2881ca Ecoding fix 2014-11-06 01:46:10 +01:00
Philippe Rochat edcdd5d155 Encoding
Changed encoding
2014-11-06 01:36:54 +01:00
Philippe Rochat 3a0d3e6e21 All properties translated in french
All the properties translated in french (not fully tested in interface)
2014-11-06 01:26:49 +01:00
Philippe Rochat f0562d5dd4 Complete/Partial traduction
Completed translation for files to log.properties
2014-11-04 23:13:39 +01:00
Philippe Rochat 2866993972 Added French translations (partial) 2014-11-04 00:04:58 +01:00
Philippe Rochat 3f6d59af82 Added MacApp Bundle
The copyIcon task is not finding the source, the icon must be copied
manually from scripts/data/Logisim.app/ to  … ???
2014-11-04 00:02:44 +01:00
Dominic Laudate 823672dc73 -Removed some leftover println statements
Things from last commit I forgot:
-Renamed the _ amd __ methods to more logical names (getFromLocale)
-Removed all unused imports I could find
2014-10-30 19:56:41 -04:00
Dominic Laudate 75c347437a -Committed StringGetter to the flames
-Fixed a missing locale string
-Simplified some code (Entry)
-Changed the CTRL+/- implementation to a much cleaner version (also
works with the numpad now)
-Added Spacebar to cycle the clock
2014-10-30 19:46:09 -04:00
Spanti Nicola (RyDroid) ac8d394d6b Minor changes (clarifications, very small optimizations, better indentation, etc) 2014-10-18 21:32:11 +02:00