SteamWar/BauSystem
Archiviert
13
0
Commit graph

110 Commits

Autor SHA1 Nachricht Datum
2514b54e02 Merge branch 'prepare_open_source'
# Conflicts:
#	BauSystem_15/src/de/steamwar/bausystem/tracer/PlayerTraceCache_15.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/TracerUpdateManager.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/debugcallback/DebugCallbackActionBar.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackRecording.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTFrame.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTTrace.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackCacheUpdate.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackShow.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackPositions.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackTracing.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackUpdatePoints.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTListener.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer12.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer15.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowManager.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowStatus.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTFrame.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTTrace.java
2020-09-03 20:07:39 +02:00
b800c3f197 Merge pull request 'Simplify Tracer' (#91) from simplify-tracer into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-08-30 13:20:39 +02:00
5e539a8756 Untangle spagetti code #3 (might not work in this state) 2020-08-30 12:01:47 +02:00
jojo
4aaf9d0c3e Fix CommandTrace 2020-08-30 10:51:42 +02:00
dda4ad7f99 Untangle spagetti code #2 2020-08-30 08:01:51 +02:00
6831ada70f Untangle spagetti code part 1 2020-08-30 07:45:32 +02:00
1f2b6a0290 Simplify Tracer #1 2020-08-30 07:13:11 +02:00
jojo
a581beee5c Fix Tracer dirty Optimization 2020-08-30 03:10:45 +02:00
jojo
0b13700a3a Fix Tracer maxSize Optimization 2020-08-30 03:06:22 +02:00
jojo
daa6979e5a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2020-08-30 02:47:01 +02:00
jojo
e62f371578 Merge branch 'TNTTracer' 2020-08-30 02:44:52 +02:00
jojo
b13dcc57a1 Update Tracer 2020-08-30 02:23:23 +02:00
143735809c Prepare open source release 2020-08-26 18:48:57 +02:00
e18b2c77d8 Remove unnecessary error message 2020-08-15 17:16:41 +02:00
81182f5b6f Fix 1.12 reduced debug info 2020-07-27 06:53:08 +02:00
6b682e666e Fix ReducedDebugInfo 2020-07-26 23:00:03 +02:00
2858f87e5d Fix DebugInfo 2020-07-26 22:57:07 +02:00
72a2b4821d Fix ReducedDebugInfo 2020-07-26 22:55:39 +02:00
9d56f09624 Fix ReducedDebugInfo false 2020-07-26 22:52:48 +02:00
jojo
8aee883a8e Remove Logger 2020-07-26 16:29:16 +02:00
24f8e22fb4 Merge pull request 'Fix Trace show/hide Bug' (#86) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:57:06 +02:00
jojo
03683fc0b6 Rename hide() -> hideBlockTraces() 2020-07-25 21:55:23 +02:00
jojo
e0b885ad32 Fix Trace show/hide Bug 2020-07-25 21:44:41 +02:00
1465d2540d Merge pull request 'Fix Trace show/hide Bug' (#85) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:38:53 +02:00
jojo
c1ec555838 Fix Trace show/hide Bug 2020-07-25 21:36:42 +02:00
06b6978442 Merge pull request 'TNTTracer' (#84) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:30:20 +02:00
jojo
bb8c6c259e Fix Trace show/hide Bug 2020-07-25 21:16:58 +02:00
8d44e714c7 Merge pull request 'Initial Commit 1.12 Support' (#80) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-20 05:48:58 +02:00
jojo
6c625c51c0 Add dirtyFlag after explode 2020-07-19 20:42:10 +02:00
jojo
4eed29d7d6 Add Initial 1.12 Support 2020-07-19 20:36:33 +02:00
8e1029b860 Merge pull request 'Fix Updating Issue while Tracing' (#79) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 19:56:06 +02:00
jojo
930e8dc7d0 Fix Updating Issue while Tracing 2020-07-19 19:54:58 +02:00
6f3523b1de Merge pull request 'Fix ConcurrentModificationException - 3' (#78) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 19:19:43 +02:00
jojo
8254fb6e5e Fix ConcurrentModificationException - 3 2020-07-19 19:18:28 +02:00
7da1f7acbb Merge pull request 'Fix ConcurrentModificationException - 2' (#77) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 17:51:50 +02:00
jojo
f4378c58c2 Fix ConcurrentModificationException - 2 2020-07-19 17:49:07 +02:00
20ee35ae10 Merge pull request 'Fix ConcurrentModificationException' (#76) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 17:29:19 +02:00
jojo
8d10a702b4 Fix ConcurrentModificationException 2020-07-19 17:21:33 +02:00
fe916438b1 Merge pull request 'Fix ArrayIndexOutOfBoundsException' (#75) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 16:40:23 +02:00
jojo
29c3e954be Fix ArrayIndexOutOfBoundsException 2020-07-19 16:38:47 +02:00
32fbe9ddf3 Merge pull request 'TNTTracer' (#74) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 15:27:33 +02:00
jojo
6f558b6b91 Fix dirty Flaging 2020-07-19 14:54:07 +02:00
jojo
7e5d690c9d Fix synchronization Deadlock 2020-07-19 14:51:40 +02:00
jojo
df72a08f99 Fix NullPointerException in delete() 2020-07-19 14:42:55 +02:00
jojo
d800eb5544 Fix help message 15 2020-07-19 10:14:14 +02:00
7a59ca90b4 Merge pull request 'TNTTracer' (#70) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 08:21:29 +02:00
jojo
29cb90f128 Fix "/trace delete [TRACE-ID]" 2020-07-19 07:39:17 +02:00
jojo
fac6d6986e Fix Spam 2020-07-19 07:33:57 +02:00
jojo
a4cc32d808 Add clickable TNT list 2020-07-19 07:31:04 +02:00
jojo
fa6a5abf67 Add permissionCheck
Remove "/trace gui"
2020-07-19 01:06:29 +02:00